From: David Gow <davidgow@google.com>
To: "Mickaël Salaün" <mic@digikod.net>
Cc: Brendan Higgins <brendanhiggins@google.com>,
Kees Cook <keescook@chromium.org>, Rae Moar <rmoar@google.com>,
Shuah Khan <skhan@linuxfoundation.org>,
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>,
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: Re: [PATCH v2 4/7] kunit: Handle test faults
Date: Tue, 12 Mar 2024 13:05:37 +0800 [thread overview]
Message-ID: <CABVgOSnzaO7EUdSW_xTZd22oc-q_yT9uVoSwTm2jn5pw5pP8Eg@mail.gmail.com> (raw)
In-Reply-To: <20240301194037.532117-5-mic@digikod.net>
[-- Attachment #1: Type: text/plain, Size: 5730 bytes --]
On Sat, 2 Mar 2024 at 03:40, Mickaël Salaün <mic@digikod.net> wrote:
>
> Previously, when a kernel test thread crashed (e.g. NULL pointer
> dereference, general protection fault), the KUnit test hanged for 30
> seconds and exited with a timeout error.
>
> Fix this issue by waiting on task_struct->vfork_done instead of the
> custom kunit_try_catch.try_completion, and track the execution state by
> initially setting try_result with -EFAULT and only setting it to 0 if
> the test passed.
>
> Fix kunit_generic_run_threadfn_adapter() signature by returning 0
> instead of calling kthread_complete_and_exit(). Because thread's exit
> code is never checked, always set it to 0 to make it clear.
>
> Fix the -EINTR error message, which couldn't be reached until now.
>
> This is tested with a following patch.
>
> Cc: Brendan Higgins <brendanhiggins@google.com>
> Cc: David Gow <davidgow@google.com>
> Cc: Rae Moar <rmoar@google.com>
> Cc: Shuah Khan <skhan@linuxfoundation.org>
> Reviewed-by: Kees Cook <keescook@chromium.org>
> Signed-off-by: Mickaël Salaün <mic@digikod.net>
> Link: https://lore.kernel.org/r/20240301194037.532117-5-mic@digikod.net
> ---
This works fine here, and looks good.
The use of task_struct->vfork_done is a bit confusing, as there's no
documentation (that I could find) about what vfork_done means for
kthreads. From the code, it looks to just be a copy of
kthread->exited, which is much more obvious a name.
Would it make sense to either (a) replace this with a call to
to_kthread(), and kthread->exited, or (b) add a comment explaining
what vfork_done means here. kthread_stop() itself is using
to_kthread() and kthread->exited -- even though task_struct is also
there -- so I'd feel a bit more comfortable with that option.
Otherwise,
Reviewed-by: David Gow <davidgow@google.com>
Cheers,
-- David
>
> Changes since v1:
> * Added Kees's Reviewed-by.
> ---
> include/kunit/try-catch.h | 3 ---
> lib/kunit/try-catch.c | 14 +++++++-------
> 2 files changed, 7 insertions(+), 10 deletions(-)
>
> diff --git a/include/kunit/try-catch.h b/include/kunit/try-catch.h
> index c507dd43119d..7c966a1adbd3 100644
> --- a/include/kunit/try-catch.h
> +++ b/include/kunit/try-catch.h
> @@ -14,13 +14,11 @@
>
> typedef void (*kunit_try_catch_func_t)(void *);
>
> -struct completion;
> struct kunit;
>
> /**
> * struct kunit_try_catch - provides a generic way to run code which might fail.
> * @test: The test case that is currently being executed.
> - * @try_completion: Completion that the control thread waits on while test runs.
> * @try_result: Contains any errno obtained while running test case.
> * @try: The function, the test case, to attempt to run.
> * @catch: The function called if @try bails out.
> @@ -46,7 +44,6 @@ struct kunit;
> struct kunit_try_catch {
> /* private: internal use only. */
> struct kunit *test;
> - struct completion *try_completion;
> int try_result;
> kunit_try_catch_func_t try;
> kunit_try_catch_func_t catch;
> diff --git a/lib/kunit/try-catch.c b/lib/kunit/try-catch.c
> index cab8b24b5d5a..c6ee4db0b3bd 100644
> --- a/lib/kunit/try-catch.c
> +++ b/lib/kunit/try-catch.c
> @@ -18,7 +18,7 @@
> void __noreturn kunit_try_catch_throw(struct kunit_try_catch *try_catch)
> {
> try_catch->try_result = -EFAULT;
> - kthread_complete_and_exit(try_catch->try_completion, -EFAULT);
> + kthread_exit(0);
> }
> EXPORT_SYMBOL_GPL(kunit_try_catch_throw);
>
> @@ -26,9 +26,12 @@ static int kunit_generic_run_threadfn_adapter(void *data)
> {
> struct kunit_try_catch *try_catch = data;
>
> + try_catch->try_result = -EINTR;
> try_catch->try(try_catch->context);
> + if (try_catch->try_result == -EINTR)
> + try_catch->try_result = 0;
>
> - kthread_complete_and_exit(try_catch->try_completion, 0);
> + return 0;
> }
>
> static unsigned long kunit_test_timeout(void)
> @@ -58,13 +61,11 @@ static unsigned long kunit_test_timeout(void)
>
> void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context)
> {
> - DECLARE_COMPLETION_ONSTACK(try_completion);
> struct kunit *test = try_catch->test;
> struct task_struct *task_struct;
> int exit_code, time_remaining;
>
> try_catch->context = context;
> - try_catch->try_completion = &try_completion;
> try_catch->try_result = 0;
> task_struct = kthread_create(kunit_generic_run_threadfn_adapter,
> try_catch, "kunit_try_catch_thread");
> @@ -75,8 +76,7 @@ void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context)
> }
> get_task_struct(task_struct);
> wake_up_process(task_struct);
> -
> - time_remaining = wait_for_completion_timeout(&try_completion,
> + time_remaining = wait_for_completion_timeout(task_struct->vfork_done,
> kunit_test_timeout());
> if (time_remaining == 0) {
> try_catch->try_result = -ETIMEDOUT;
> @@ -92,7 +92,7 @@ void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context)
> if (exit_code == -EFAULT)
> try_catch->try_result = 0;
> else if (exit_code == -EINTR)
> - kunit_err(test, "wake_up_process() was never called\n");
> + kunit_err(test, "try faulted\n");
> else if (exit_code == -ETIMEDOUT)
> kunit_err(test, "try timed out\n");
> else if (exit_code)
> --
> 2.44.0
>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4014 bytes --]
next prev parent reply other threads:[~2024-03-12 5:05 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-01 19:40 [PATCH v2 0/7] Handle faults in KUnit tests Mickaël Salaün
2024-03-01 19:40 ` [PATCH v2 1/7] kunit: Handle thread creation error Mickaël Salaün
2024-03-05 20:57 ` Rae Moar
2024-03-12 4:53 ` David Gow
2024-03-01 19:40 ` [PATCH v2 2/7] kunit: Fix kthread reference Mickaël Salaün
2024-03-05 20:57 ` Rae Moar
2024-03-12 4:53 ` David Gow
2024-03-01 19:40 ` [PATCH v2 3/7] kunit: Fix timeout message Mickaël Salaün
2024-03-05 20:58 ` Rae Moar
2024-03-12 4:53 ` David Gow
2024-03-01 19:40 ` [PATCH v2 4/7] kunit: Handle test faults Mickaël Salaün
2024-03-11 21:21 ` Rae Moar
2024-03-12 12:15 ` Mickaël Salaün
2024-03-12 5:05 ` David Gow [this message]
2024-03-12 12:15 ` Mickaël Salaün
2024-03-01 19:40 ` [PATCH v2 5/7] kunit: Fix KUNIT_SUCCESS() calls in iov_iter tests Mickaël Salaün
2024-03-12 4:54 ` David Gow
2024-03-01 19:40 ` [PATCH v2 6/7] kunit: Print last test location on fault Mickaël Salaün
2024-03-12 4:54 ` David Gow
2024-03-12 12:15 ` Mickaël Salaün
2024-03-01 19:40 ` [PATCH v2 7/7] kunit: Add tests for fault Mickaël Salaün
2024-03-12 4:54 ` 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=CABVgOSnzaO7EUdSW_xTZd22oc-q_yT9uVoSwTm2jn5pw5pP8Eg@mail.gmail.com \
--to=davidgow@google.com \
--cc=alan.maguire@oracle.com \
--cc=bp@alien8.de \
--cc=brendanhiggins@google.com \
--cc=dave.hansen@linux.intel.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=mic@digikod.net \
--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 read-only IMAP folder(s) and NNTP newsgroup(s).