From nobody Thu Apr 9 15:24:29 2026 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (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 55A5F37EFFF for ; Sat, 7 Mar 2026 22:08:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772921310; cv=none; b=lXGzio9UlNAlAsR7jOl0GH5UZNtZjzRooej3eSNrlTQWXjQOCeseAj6b55JNJYlg5RZTJKRwj8PmsVSUbJaC4jcoeaoi8n5rpg+C7LsAiiW6P11ALBWCASgTxUm8FAwGPtinLeYoVnkOU/3GOthEfGhP1IzuPFthWQUON95pEWU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772921310; c=relaxed/simple; bh=O7UZb0JaYX9pHO/9CEZx9SNewv8GCjvZd6okVCtK89o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AMzQVlxD3XqpgsZdtqErZ3elDzTA42pQJ44ohRCPpT+l+01s3mj3SUJgzUkBWqbQ4f4CfMpSPGn13eTDayuJlrMykbdb5NdUnIKj+I6vHZUJQPIGPPB2T4ILjFykofjGNYxT+VUBn62W0CHPL9Wibyfvz2KuB98s7yCzM3JrCgk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=GzlCtnz2; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="GzlCtnz2" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-483487335c2so86856195e9.2 for ; Sat, 07 Mar 2026 14:08:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1772921308; x=1773526108; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=0W1YazmkzbcKgnrz8935QMHEm0xmUFNwhDaZDz9q/PU=; b=GzlCtnz2Swvaes9wjBsYZM8XynBP+/FIdhvuoFkPhOvmAq2Oj1IhC4qZfprD7pvJkB 3mub1j9EaWeZbYbBwBLoxoiscjTpIjxwFhhgX3gvfCtcayYjERlHy3KhT69oMWeGCNwg wooKCEtSjSp8GIbOPkaTN9wnxBBQ2SrWmU3EZFNo/gyynuG8ORDKm6v2tq6vW9HhkQc3 Cbm6LBQgonycvavnIcJfDiOuDEiakVB836PjNvmw+dApnr6gm/NFzjMYKBMHrAab+F8d lVy9MS/e2H1tF09iTY2WIm53ynlnyOisN9jijH4hcGsi9Ntpf99vMtptF9szoi6Zs7P3 Id/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772921308; x=1773526108; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=0W1YazmkzbcKgnrz8935QMHEm0xmUFNwhDaZDz9q/PU=; b=eLherbJsOwMi6Ci7EGZfsSqyyikd/zVhFV/kEYLviU8Y6jnUhXvhBy/6JA4y4XKeNz 0+bp1ueS0Tr4Iulw91Zl4rElcdJP6gFlek7ES9PwVh3GvTcoRe0ofMTe2P+9w9iwp7Cb lskGYjxArLqQPDHFzOJzr4VwuJdEiGIf4gv4mPrvxy40p0S8/hRzJs9frsrY3GUaLl0w H7ZgsHev59oVbN11T1eJIC8eW8qoSlAx0BL4vHnlKZSRioQlhnsTPuDjiaU5+yLf5dX+ 06ftDmnOw2v8Ea7UgxEvG9NZzTQszg+xKD5OR0avp0ou6xk5iel3GLDFzIele6PuIurv HGug== X-Forwarded-Encrypted: i=1; AJvYcCWNwWPka/0f0dANVJc4NPUhUy86VZY8OlyVM4ZJefGUECja42u5zglCJQ6cp9qJlcktMkAbNyZV9y6ISII=@vger.kernel.org X-Gm-Message-State: AOJu0YzDG6XhWOE2/7M9CtgnfWa2CPHLF5Jdm6Yj0K5C0/WaPSzMXDoO RciekrYLSJrSEr8gFhtyBmdEuZFfzoWHWMEd5+e2WuQJvBfRQiDwY8caOp4ePjidvOg= X-Gm-Gg: ATEYQzw8c71jM5sAXbIFyjlV60AG4x8A5kBGf9g6RSYuRZvN0dr/XLfHDuQcRSTokBQ /d86ja2xzFzEJ8kpKcHVGkInqMHwXTazR27caZu56454AhS4OtWGmVC9jwqnbV6gD8Z1JKv4baE c2dx+ZxvrVffTmaEawV00wUPU96ctSeWmmWsucFqHa7+BwZTtnaG0KglusZcicHRdjwrPtqMJU3 gmiEJ6/OtCFCdzKc94L2ljt51tDN+wDkQFBhlStWEqmZ/GamqWqoUXQd0v1NSPs/eP/9LhJK5l5 V7cajFUWRw+aq7J/lELyYq3ITAVOfYO8lHhF0roQtVOBPBmdS8t0WGiAbOqc4JayH31/4pWnKLf X5DtKrCwcr6w5jdxlGkXqKHc6CEIE+GRcLHUa86uq0HsmUS2/hXZNTf33X0O8rBh3vYZ4fDzdCw KR2DLiYVgs0A== X-Received: by 2002:a05:600c:6085:b0:479:2f95:5179 with SMTP id 5b1f17b1804b1-4852692fec0mr110444915e9.15.1772921307706; Sat, 07 Mar 2026 14:08:27 -0800 (PST) Received: from localhost ([189.99.238.164]) by smtp.gmail.com with ESMTPSA id 71dfb90a1353d-56b09b6ac44sm6060451e0c.19.2026.03.07.14.08.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Mar 2026 14:08:26 -0800 (PST) From: =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re?= Date: Sat, 07 Mar 2026 19:08:02 -0300 Subject: [PATCH 7/9] ktest: Add PRE_KTEST_DIE for PRE_KTEST failures Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260307-ktest-fixes-v1-7-565d412f4925@suse.com> References: <20260307-ktest-fixes-v1-0-565d412f4925@suse.com> In-Reply-To: <20260307-ktest-fixes-v1-0-565d412f4925@suse.com> To: Steven Rostedt , John Hawley Cc: Andrea Righi , Marcos Paulo de Souza , Matthieu Baerts , Fernando Fernandez Mancera , Pedro Falcato , linux-kernel@vger.kernel.org, Steven Rostedt , =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re?= X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openssh-sha256; t=1772921280; l=2252; i=rbm@suse.com; h=from:subject:message-id; bh=O7UZb0JaYX9pHO/9CEZx9SNewv8GCjvZd6okVCtK89o=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgguRCc5X8/UX9M40lkMnr//aFGOhce x5ezt8MFNUFlqYAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QChO3z3adKhoaTfO5/5EZ0uy+hwTyinaxuv3Y/Rk7E+M88GiGpZzR9lk1e6Vk2rWhOCaWA/b0Xf WX0h/SqK1pwk= X-Developer-Key: i=rbm@suse.com; a=openssh; fpr=SHA256:pzhe0fJpYLz+3cZ33FFPhIfaUElk9CXPFFXmalIH+1g PRE_KTEST runs before the first test, but its return status is currently ignored. A failing setup hook can leave the rest of the run executing in a partially initialized environment. Add PRE_KTEST_DIE so PRE_KTEST can fail the run in the same way PRE_BUILD_DIE and PRE_TEST_DIE already can. Keep the default behavior unchanged when the new option is not set. Signed-off-by: Ricardo B. Marli=C3=A8re --- tools/testing/ktest/ktest.pl | 8 +++++++- tools/testing/ktest/sample.conf | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index bd2e2311884c..b018b937e028 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl @@ -101,6 +101,7 @@ my $build_type; my $build_options; my $final_post_ktest; my $pre_ktest; +my $pre_ktest_die; my $post_ktest; my $pre_test; my $pre_test_die; @@ -283,6 +284,7 @@ my %option_map =3D ( "BUILD_DIR" =3D> \$builddir, "TEST_TYPE" =3D> \$test_type, "PRE_KTEST" =3D> \$pre_ktest, + "PRE_KTEST_DIE" =3D> \$pre_ktest_die, "POST_KTEST" =3D> \$post_ktest, "PRE_TEST" =3D> \$pre_test, "PRE_TEST_DIE" =3D> \$pre_test_die, @@ -4506,7 +4508,11 @@ for (my $i =3D 1; $i <=3D $opt{"NUM_TESTS"}; $i++) { if ($i =3D=3D 1) { if (defined($pre_ktest)) { doprint "\n"; - run_command $pre_ktest; + my $ret =3D run_command $pre_ktest; + if (!$ret && defined($pre_ktest_die) && + $pre_ktest_die) { + dodie "failed to pre_ktest\n"; + } } if ($email_when_started) { my $name =3D get_test_name; diff --git a/tools/testing/ktest/sample.conf b/tools/testing/ktest/sample.c= onf index 9c4c449a8f3e..b6e439ef511b 100644 --- a/tools/testing/ktest/sample.conf +++ b/tools/testing/ktest/sample.conf @@ -494,6 +494,12 @@ # # default (undefined) #PRE_KTEST =3D ${SSH} ~/set_up_test +# +# To specify if the test should fail if PRE_KTEST fails, +# PRE_KTEST_DIE needs to be set to 1. Otherwise the PRE_KTEST +# result is ignored. +# (default 0) +#PRE_KTEST_DIE =3D 1 =20 # If you want to execute some command after all the tests have # completed, you can set this option. Note, it can be set as a --=20 2.53.0