From patchwork Thu Oct 24 18:08:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kacur X-Patchwork-Id: 839292 Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 85B281FE0E7 for ; Thu, 24 Oct 2024 18:08:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729793321; cv=none; b=i7lJGrPjQo9MCiclDc5L5Hfs4OJr7uhc7/MVOuHl58iDN4O7ic1pSjCzGAgqNRiiGV6Lg5jdzV1RN7kQCrrTJau+N2IV0e4LIRLHWTOJCN6etH3P8uXRrCPS3Xe8AItEKJOtP5BdTpIq3ZcV3tUBeBWGFDRdjxI1wWa/Kh4hXuU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729793321; c=relaxed/simple; bh=KjjalHJTTSkj/E9JY06RccfpVPVUrsNRcaMYrHn4wpE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=HVOkLOk69xFHrJKlCOUPkJKCC9Wm2D7JSP2IJ5/M+2soKN5Vx9bUcDygmD0m4HrtZ8F7VQH+Kml+gVOU6dNjHEpZrlqB/T10cxD/Vlk/jmIYBkODbpgO7gAtw1HyCjrnDwPPOTVh2au/Ny64NTKfqeBtfK3/WYN4EZKN8LbF9yI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=TrRvBMh4; arc=none smtp.client-ip=209.85.160.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TrRvBMh4" Received: by mail-qt1-f177.google.com with SMTP id d75a77b69052e-460a23ad00eso20555811cf.0 for ; Thu, 24 Oct 2024 11:08:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729793317; x=1730398117; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=/zx2ovMB0SQIThMRzoVOdiaiVNdGuTQyue3h+6eSPaU=; b=TrRvBMh4FfIA8CAb9XvfXrNRoOEoYKBiO+HkszTpW059jo1OvaGl3+ehdbaiIlKNeO HPTBzmZXapUA4G8U7da56Zr9uI2ouFz0WYsumUWTDq/1CO1PRv1Oc79JoLbtKZC3d+R/ K5pDWlX8NkZ2IqOjc6GiUk2OcIbPwh+S+ARtldqOvMym7pAy17GtFD9OgZudjp4R/Soj urnhzq1WzQ0S42hiIbkHFA43pY+rU92hPGykCaQBfIGzG54yaDiPWkE/7xB0NNcisUjp H93RKZ6rgsXkRnBQsNaDtkuNcZPrbTYCEbee4HGEeYDeCar5f6mblAvzTBjE6Vvz0+fA aiuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729793317; x=1730398117; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=/zx2ovMB0SQIThMRzoVOdiaiVNdGuTQyue3h+6eSPaU=; b=BVnEp/UX2cO3g5vrQrP7Tne+L2oSj95IWMXVpgJA/E8XEhj/cJWC79vhf+wSBqvWda otvMCYKDGmno0ZqyfztjHxALfcv/NY4K7pK04PwTV9VqsjHh7AbYMnxxYjqMM7GHt+hw iMlqJFrt1GaWxWJ1Ea5+tqCvut2XhG9TLK67sbVwj/MDqH5IlfVqReNKyPtKhwkZMcfV 32nUMzPzLhErCALgkGdjCa0X3wLPMQWp6uIaGxMcc8KlegYSfFtjVdMa4BJ0SSVbpJ0f ZNQWmnKSzGOKLPqDN+qqgxxqSnmbkP2V/7xNGFuIQXdTCB71tQfwsr3C4SeFCrNbDj25 ybAg== X-Gm-Message-State: AOJu0YwEomEQE3Z6uC52+Mgeee1iJi0JUFjGtAJzSvoKrvtV7uc/yQlI S0zWsNEjKz9t0jVkPqxjTN+NuJRnoqB/Bo7ZA33D4rftSMM5bQoVi9RhpQ== X-Google-Smtp-Source: AGHT+IEmRqOG8TQMwC3vX898XX8eWqHSWW7NtfKGm18Ztpe9ZytqkrzNuSiRXa1VdK/EwwCktPrJpQ== X-Received: by 2002:ac8:7f55:0:b0:461:1593:9234 with SMTP id d75a77b69052e-46125251ce9mr46963921cf.1.1729793317148; Thu, 24 Oct 2024 11:08:37 -0700 (PDT) Received: from fionn.home ([142.189.102.234]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-460d3dab83fsm54121801cf.88.2024.10.24.11.08.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 11:08:36 -0700 (PDT) Sender: John Kacur From: John Kacur To: RT Cc: Clark Williams , John Kacur Subject: [PATCH 1/2] rteval: Change constant name to uppercase Date: Thu, 24 Oct 2024 14:08:12 -0400 Message-ID: <20241024180813.48368-1-jkacur@redhat.com> X-Mailer: git-send-email 2.46.2 Precedence: bulk X-Mailing-List: linux-rt-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Change constant name earlystop to EARLYSTOP add "from err" when re-raising RuntimeError Signed-off-by: John Kacur --- rteval/__init__.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rteval/__init__.py b/rteval/__init__.py index 8ded374d287e..7c13e84e03bf 100644 --- a/rteval/__init__.py +++ b/rteval/__init__.py @@ -28,7 +28,7 @@ from rteval import version RTEVAL_VERSION = version.RTEVAL_VERSION -earlystop = False +EARLYSTOP = False stopsig = threading.Event() def sig_handler(signum, frame): @@ -106,7 +106,7 @@ class RtEval(rtevalReport): if not onlyload or self.__rtevcfg.logging: self.__reportdir = self._make_report_dir(self.__rtevcfg.workdir, "summary.xml") except Exception as err: - raise RuntimeError(f"Cannot create report directory (NFS with rootsquash on?) [{err}]]") + raise RuntimeError(f"Cannot create report directory (NFS with rootsquash on?) [{err}]]") from err params = {'workdir':self.__rtevcfg.workdir, 'reportdir':self.__reportdir and self.__reportdir or "", @@ -131,7 +131,7 @@ class RtEval(rtevalReport): def __RunMeasurement(self): - global earlystop + global EARLYSTOP measure_start = None try: @@ -186,7 +186,7 @@ class RtEval(rtevalReport): stopsig.wait(min(stoptime - currtime, 60.0)) if not self._measuremods.isAlive(): stoptime = currtime - earlystop = True + EARLYSTOP = True self.__logger.log(Log.WARN, "Measurement threads did not use the full time slot. Doing a controlled stop.") @@ -214,7 +214,7 @@ class RtEval(rtevalReport): except RuntimeError as err: if not stopsig.is_set(): - raise RuntimeError(f"appeared during measurement: {err}") + raise RuntimeError(f"appeared during measurement: {err}") from err finally: # stop measurement threads @@ -234,7 +234,7 @@ class RtEval(rtevalReport): def Measure(self): """ Run the full measurement suite with reports """ - global earlystop + global EARLYSTOP rtevalres = 0 measure_start = self.__RunMeasurement() @@ -242,7 +242,7 @@ class RtEval(rtevalReport): if self.__rtevcfg.sysreport: self._sysinfo.run_sysreport(self.__reportdir) - if earlystop: + if EARLYSTOP: rtevalres = 1 self._sysinfo.copy_dmesg(self.__reportdir) self._tar_results() From patchwork Thu Oct 24 18:08:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kacur X-Patchwork-Id: 838281 Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 304D01FF7D1 for ; Thu, 24 Oct 2024 18:08:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729793322; cv=none; b=sYXyqv9dOmcXFgO7CuoDc+rKRtPW4DUEH9/CnMHznHr3gEv0VNireYm+GFNyVQVUSkUoltJ/thcF+HJO5+yZEgAdbMeZ9iqxgTVBjaI24qC5PD7KkHwy/NUARPDXOdCq0aI84RUsRIObKw8AS1UlshJaHoN2VLchIH2JAzXyUPA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729793322; c=relaxed/simple; bh=PF72ECj5PBo75wsfGeMdHuyAtNi96WFOR1K/jC01TUA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jDRoYDLBqADO1pH8XulTxY95yKDUnjU3nIaGQ9iwFK7WCG/2cRR5RBkAb95MHmWoIXjOPau7L0TyyWJdHqks4DAb9hTglV1DZA8ZOeJYEvOB8umQi1/Lr3XRwo2NMnQJRFTBmjHFXDx3Vb9pymOfOUo09VAHAtzWjjFbLBE0KR4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FUGn62nN; arc=none smtp.client-ip=209.85.160.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FUGn62nN" Received: by mail-qt1-f173.google.com with SMTP id d75a77b69052e-460a23ad00eso20555951cf.0 for ; Thu, 24 Oct 2024 11:08:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729793318; x=1730398118; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=FsMse6RhkmQoDdzdi7pQFoBD7eBUzg4xqvJjR9HedzA=; b=FUGn62nNh10nY/bTnFx7KxH69qaXpVHpZRPmdWVSopNzkNLQWtfAK/Mv1Xx6xM9moL O9An49zqTwaimdfhA5OuBVxoaUluufICwoJi2g9nceV78h24i6OpsHCSIGiItITxVevt 1tX7lDK7HgxLktBPRwoPhrBPkVja2LjS4ePe3rwsTXq+YJN+Kl9KY9GArEriONKK7bWp lEFVD5q715f6nr5zIBHKc4FjoLB1wZLRfwheo0dZC3es2M5spb6ZXGxDyjaXMG6JEfVV 4vk8UfE8WJ2PSzqB+zyCBGkdUlIZVv913N7RNU9iqS7WC5l2O29Q6dmn1lfjW2ltPVnh G8yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729793318; x=1730398118; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=FsMse6RhkmQoDdzdi7pQFoBD7eBUzg4xqvJjR9HedzA=; b=UBriUyrceWiv0hGKhgB/m18LF1z/3BYhnFqimUmSoJIb60h13yI4eKuuyAkrEO4Bub do8TXi9ZXuFmtu9/+6cIOez0TEwYrcy8p6NHhRqXJmIxxIhL9eEwZgqMHzBfhxtIAstC 04pO1iUpPk5Oq67ONKDeOCyuTkAzSevZajYdMah+YbBnOGSPGSXZh4oyjxSatNqkJfor odw088SAHLnV+VogZJlXI3N2UaBEhZmAr4r0oOhhgndrS5lbdmFPTC30KchmFzz2OO3U troTC2E4eD17iHBH1VGucLnzKECc+Z0VzRXwKcMzgx5JaEwHsNeGt5u8rLwZNnalt6/Z wYXA== X-Gm-Message-State: AOJu0YxZXEltvOofjwjOoE7k+OK8dAnxHwjc4fcqj+Di+KZO5Lc0+JL7 iQ61mCmU2o9wX0WlFOqgRAGmwwuOWel9og+6Na4O0i7WrZiIOo6rIZuLQg== X-Google-Smtp-Source: AGHT+IENbhJQ4xzoladGbbS1O4f+wpuMz8LBihrD2Uo8g5bLy7oWiiTrZ8z3MVA2rvTgKNA+aXZC+w== X-Received: by 2002:a05:622a:19a5:b0:460:3764:2844 with SMTP id d75a77b69052e-4612526d419mr49230201cf.10.1729793318000; Thu, 24 Oct 2024 11:08:38 -0700 (PDT) Received: from fionn.home ([142.189.102.234]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-460d3dab83fsm54121801cf.88.2024.10.24.11.08.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 11:08:37 -0700 (PDT) Sender: John Kacur From: John Kacur To: RT Cc: Clark Williams , John Kacur Subject: [PATCH 2/2] rteval: Update the kcompile kernel to linux-6.12-rc4 Date: Thu, 24 Oct 2024 14:08:13 -0400 Message-ID: <20241024180813.48368-2-jkacur@redhat.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241024180813.48368-1-jkacur@redhat.com> References: <20241024180813.48368-1-jkacur@redhat.com> Precedence: bulk X-Mailing-List: linux-rt-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Update the kernel that rteval compiles as a load in the load module kcompile This kernel contains patches to address the fact that ENGINE API has been deprecated since OpenSSL version 3.0. This is important because some distros have been dropping the headers for the deprecated api and this has been causing kcompile to fail, unless you supply a special kernel with the patches to address this. With this change the upstream kernel as is will work again. Signed-off-by: John Kacur --- Dockerfile | 2 +- Makefile | 2 +- rteval/modules/loads/kcompile.py | 4 ++-- rteval/rteval.conf | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index f3ee516b57d5..b8f602b11703 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Use CentOS Stream 9 as base image FROM centos:stream9 -ARG KERNEL_VERSION=linux-6.10.5.tar.xz +ARG KERNEL_VERSION=linux-6.12-rc4.tar.gz # Copy current directory to /opt/rteval/ diff --git a/Makefile b/Makefile index e1a2bbba0373..a250b18611b4 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ PREFIX := /usr DATADIR := $(DESTDIR)/$(PREFIX)/share LOADDIR := loadsource -KLOAD := $(LOADDIR)/linux-6.10.5.tar.xz +KLOAD := $(LOADDIR)/linux-6.12-rc4.tar.gz BLOAD := $(LOADDIR)/dbench-4.0.tar.gz LOADS := $(KLOAD) $(BLOAD) diff --git a/rteval/modules/loads/kcompile.py b/rteval/modules/loads/kcompile.py index 58c542201a1b..8a3a0e93fa14 100644 --- a/rteval/modules/loads/kcompile.py +++ b/rteval/modules/loads/kcompile.py @@ -21,7 +21,7 @@ expand_cpulist = cpulist_utils.expand_cpulist compress_cpulist = cpulist_utils.compress_cpulist nonisolated_cpulist = cpulist_utils.nonisolated_cpulist -DEFAULT_KERNEL_PREFIX = "linux-6.10.5" +DEFAULT_KERNEL_PREFIX = "linux-6.12-rc4" class KBuildJob: '''Class to manage a build job bound to a particular node''' @@ -342,7 +342,7 @@ class Kcompile(CommandLineLoad): def ModuleParameters(): return {"source": {"descr": "Source tar ball", - "default": "linux-6.10.5.tar.xz", + "default": "linux-6.12-rc4.tar.gz", "metavar": "TARBALL"}, "jobspercore": {"descr": "Number of working threads per core", "default": 2, diff --git a/rteval/rteval.conf b/rteval/rteval.conf index 0611c031c2a0..5a49040d980f 100644 --- a/rteval/rteval.conf +++ b/rteval/rteval.conf @@ -18,7 +18,7 @@ dbench: external stressng: module [kcompile] -source: linux-6.10.5.xz +source: linux-6.12-rc4.tar.gz jobspercore: 2 [hackbench]