From: "Mickaël Salaün" <mic@digikod.net>
To: Brendan Higgins <brendanhiggins@google.com>,
David Gow <davidgow@google.com>, Rae Moar <rmoar@google.com>,
Shuah Khan <skhan@linuxfoundation.org>
Cc: "Mickaël Salaün" <mic@digikod.net>,
"Alan Maguire" <alan.maguire@oracle.com>,
"Borislav Petkov" <bp@alien8.de>,
"Dave Hansen" <dave.hansen@linux.intel.com>,
"H . Peter Anvin" <hpa@zytor.com>,
"Ingo Molnar" <mingo@redhat.com>,
"James Morris" <jamorris@linux.microsoft.com>,
"Kees Cook" <keescook@chromium.org>,
"Luis Chamberlain" <mcgrof@kernel.org>,
"Madhavan T . Venkataraman" <madvenka@linux.microsoft.com>,
"Marco Pagani" <marpagan@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Sean Christopherson" <seanjc@google.com>,
"Stephen Boyd" <sboyd@kernel.org>,
"Thara Gopinath" <tgopinath@microsoft.com>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Vitaly Kuznetsov" <vkuznets@redhat.com>,
"Wanpeng Li" <wanpengli@tencent.com>,
"Zahra Tarkhani" <ztarkhani@microsoft.com>,
kvm@vger.kernel.org, linux-hardening@vger.kernel.org,
linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-security-module@vger.kernel.org,
linux-um@lists.infradead.org, x86@kernel.org
Subject: [PATCH v3 3/7] kunit: Fix timeout message
Date: Tue, 19 Mar 2024 11:48:53 +0100 [thread overview]
Message-ID: <20240319104857.70783-4-mic@digikod.net> (raw)
In-Reply-To: <20240319104857.70783-1-mic@digikod.net>
The exit code is always checked, so let's properly handle the -ETIMEDOUT
error code.
Cc: Brendan Higgins <brendanhiggins@google.com>
Cc: Shuah Khan <skhan@linuxfoundation.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: David Gow <davidgow@google.com>
Reviewed-by: Rae Moar <rmoar@google.com>
Signed-off-by: Mickaël Salaün <mic@digikod.net>
Link: https://lore.kernel.org/r/20240319104857.70783-4-mic@digikod.net
---
Changes since v2:
* Add Rae's and David's Reviewed-by.
Changes since v1:
* Add Kees's Reviewed-by.
---
lib/kunit/try-catch.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/kunit/try-catch.c b/lib/kunit/try-catch.c
index 73f5007f20ea..cab8b24b5d5a 100644
--- a/lib/kunit/try-catch.c
+++ b/lib/kunit/try-catch.c
@@ -79,7 +79,6 @@ void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context)
time_remaining = wait_for_completion_timeout(&try_completion,
kunit_test_timeout());
if (time_remaining == 0) {
- kunit_err(test, "try timed out\n");
try_catch->try_result = -ETIMEDOUT;
kthread_stop(task_struct);
}
@@ -94,6 +93,8 @@ void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context)
try_catch->try_result = 0;
else if (exit_code == -EINTR)
kunit_err(test, "wake_up_process() was never called\n");
+ else if (exit_code == -ETIMEDOUT)
+ kunit_err(test, "try timed out\n");
else if (exit_code)
kunit_err(test, "Unknown error: %d\n", exit_code);
--
2.44.0
next prev parent reply other threads:[~2024-03-19 10:55 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-19 10:48 [PATCH v3 0/7] Handle faults in KUnit tests Mickaël Salaün
2024-03-19 10:48 ` [PATCH v3 1/7] kunit: Handle thread creation error Mickaël Salaün
2024-03-19 10:48 ` [PATCH v3 2/7] kunit: Fix kthread reference Mickaël Salaün
2024-03-19 10:48 ` Mickaël Salaün [this message]
2024-03-19 10:48 ` [PATCH v3 4/7] kunit: Handle test faults Mickaël Salaün
2024-03-23 7:37 ` David Gow
2024-03-26 9:02 ` Mickaël Salaün
2024-03-19 10:48 ` [PATCH v3 5/7] kunit: Fix KUNIT_SUCCESS() calls in iov_iter tests Mickaël Salaün
2024-03-19 10:48 ` [PATCH v3 6/7] kunit: Print last test location on fault Mickaël Salaün
2024-03-19 10:48 ` [PATCH v3 7/7] kunit: Add tests for fault Mickaël Salaün
2024-04-19 22:33 ` Guenter Roeck
2024-04-19 23:38 ` Guenter Roeck
2024-04-22 13:08 ` Mickaël Salaün
2024-04-22 13:35 ` Guenter Roeck
2024-04-23 9:22 ` David Gow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240319104857.70783-4-mic@digikod.net \
--to=mic@digikod.net \
--cc=alan.maguire@oracle.com \
--cc=bp@alien8.de \
--cc=brendanhiggins@google.com \
--cc=dave.hansen@linux.intel.com \
--cc=davidgow@google.com \
--cc=hpa@zytor.com \
--cc=jamorris@linux.microsoft.com \
--cc=keescook@chromium.org \
--cc=kvm@vger.kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=madvenka@linux.microsoft.com \
--cc=marpagan@redhat.com \
--cc=mcgrof@kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=rmoar@google.com \
--cc=sboyd@kernel.org \
--cc=seanjc@google.com \
--cc=skhan@linuxfoundation.org \
--cc=tglx@linutronix.de \
--cc=tgopinath@microsoft.com \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
--cc=x86@kernel.org \
--cc=ztarkhani@microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).