From: Wen Yang <wen.yang@linux.dev>
To: Gabriele Monaco <gmonaco@redhat.com>,
linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org,
Steven Rostedt <rostedt@goodmis.org>,
Masami Hiramatsu <mhiramat@kernel.org>
Cc: Nam Cao <namcao@linutronix.de>,
Thomas Weissschuh <thomas.weissschuh@linutronix.de>,
Tomas Glozar <tglozar@redhat.com>, John Kacur <jkacur@redhat.com>
Subject: Re: [PATCH v3 11/17] rv: Prevent unintentional tracepoints during KUnit tests
Date: Mon, 29 Jun 2026 01:17:02 +0800 [thread overview]
Message-ID: <b2e841ee-cfcd-41d1-96af-7ba89bfb86a2@linux.dev> (raw)
In-Reply-To: <20260625121440.116317-12-gmonaco@redhat.com>
On 6/25/26 20:14, Gabriele Monaco wrote:
> Monitor initialisation also called during KUnit tests may register some
> tracepoints, this can lead to issues since we don't expect real monitor
> events running during KUnit tests.
>
> Prevent tracepoint registration if an RV KUnit test is running.
>
> Reviewed-by: Nam Cao <namcao@linutronix.de>
> Signed-off-by: Gabriele Monaco <gmonaco@redhat.com>
> ---
> include/rv/instrumentation.h | 5 +++++
> include/rv/kunit.h | 2 ++
> kernel/trace/rv/rv.c | 11 +++++++++++
> 3 files changed, 18 insertions(+)
>
> diff --git a/include/rv/instrumentation.h b/include/rv/instrumentation.h
> index d4e7a02ede..761f8f147d 100644
> --- a/include/rv/instrumentation.h
> +++ b/include/rv/instrumentation.h
> @@ -9,12 +9,15 @@
> */
>
> #include <linux/ftrace.h>
> +#include <rv/kunit.h>
>
> /*
> * rv_attach_trace_probe - check and attach a handler function to a tracepoint
> */
> #define rv_attach_trace_probe(monitor, tp, rv_handler) \
> do { \
> + if (rv_mon_test_is_running()) \
> + break; \
> check_trace_callback_type_##tp(rv_handler); \
> WARN_ONCE(register_trace_##tp(rv_handler, NULL), \
> "fail attaching " #monitor " " #tp "handler"); \
> @@ -25,5 +28,7 @@
> */
> #define rv_detach_trace_probe(monitor, tp, rv_handler) \
> do { \
> + if (rv_mon_test_is_running()) \
> + break; \
> unregister_trace_##tp(rv_handler, NULL); \
> } while (0)
> diff --git a/include/rv/kunit.h b/include/rv/kunit.h
> index 5e8c604cf7..0c4c4bc933 100644
> --- a/include/rv/kunit.h
> +++ b/include/rv/kunit.h
> @@ -19,6 +19,7 @@
>
> int rv_set_testing(struct kunit_suite *suite);
> void rv_clear_testing(struct kunit_suite *suite);
> +bool rv_mon_test_is_running(void);
> struct task_struct *rv_get_current(void);
>
> struct rv_kunit_ctx {
> @@ -59,6 +60,7 @@ void teardown_test(void *arg);
> #else /* !CONFIG_RV_MONITORS_KUNIT_TEST */
>
> #define rv_get_current() current
> +#define rv_mon_test_is_running() false
>
> #endif /* CONFIG_RV_MONITORS_KUNIT_TEST */
> #endif /* _RV_KUNIT_H */
> diff --git a/kernel/trace/rv/rv.c b/kernel/trace/rv/rv.c
> index 61d4f13960..86ef5dee7f 100644
> --- a/kernel/trace/rv/rv.c
> +++ b/kernel/trace/rv/rv.c
> @@ -864,6 +864,14 @@ int __init rv_init_interface(void)
> #include <rv/kunit.h>
> #include <kunit/visibility.h>
>
> +static bool rv_mon_test_running;
> +
> +bool rv_mon_test_is_running(void)
> +{
> + return rv_mon_test_running;
> +}
> +EXPORT_SYMBOL_GPL(rv_mon_test_is_running);
> +
The flag rv_mon_test_running is a plain bool with no ordering
guarantees, and the tracepoint handlers that call
rv_mon_test_is_running() may execute on
arbitrary CPUs. A store to rv_mon_test_running on the test CPU may not
be visible to another CPU's tracepoint handler.
What abbout READ_ONCE/WRITE_ONCE?
--
Best wishes,
Wen
> /*
> * rv_set_testing - ensure mutual exclusion between KUnit tests and real monitors
> *
> @@ -886,6 +894,8 @@ int rv_set_testing(struct kunit_suite *suite)
> }
> }
>
> + rv_mon_test_running = true;
> +
> return 0;
> }
> EXPORT_SYMBOL_IF_KUNIT(rv_set_testing);
> @@ -895,6 +905,7 @@ EXPORT_SYMBOL_IF_KUNIT(rv_set_testing);
> */
> void rv_clear_testing(struct kunit_suite *suite)
> {
> + rv_mon_test_running = false;
> mutex_unlock(&rv_interface_lock);
> }
> EXPORT_SYMBOL_IF_KUNIT(rv_clear_testing);
next prev parent reply other threads:[~2026-06-28 17:17 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-25 12:14 [PATCH v3 00/17] rv: Add selftests to tools and KUnit tests Gabriele Monaco
2026-06-25 12:14 ` [PATCH v3 01/17] rv: Use generic rv_this for the rv_monitor variable in LTL Gabriele Monaco
2026-06-25 12:14 ` [PATCH v3 02/17] tools/rv: Fix exit status when monitor execution fails Gabriele Monaco
2026-06-25 12:14 ` [PATCH v3 03/17] verification/rvgen: Improve rv_dir discovery in RVGenerator Gabriele Monaco
2026-06-25 12:14 ` [PATCH v3 04/17] tools/rv: Add selftests Gabriele Monaco
2026-06-28 17:10 ` Wen Yang
2026-06-25 12:14 ` [PATCH v3 05/17] verification/rvgen: Add golden and spec folders for tests Gabriele Monaco
2026-06-25 12:14 ` [PATCH v3 06/17] verification/rvgen: Add selftests Gabriele Monaco
2026-06-25 12:14 ` [PATCH v3 07/17] rv: Add KUnit stub to rv_react() and rv_*_task_monitor_slot() Gabriele Monaco
2026-06-25 12:14 ` [PATCH v3 08/17] rv: Export task monitor slot and react symbols Gabriele Monaco
2026-06-25 12:14 ` [PATCH v3 09/17] rv: Add KUnit tests for some DA/HA monitors Gabriele Monaco
2026-06-25 12:14 ` [PATCH v3 10/17] rv: Add KUnit stub for current Gabriele Monaco
2026-06-25 12:14 ` [PATCH v3 11/17] rv: Prevent unintentional tracepoints during KUnit tests Gabriele Monaco
2026-06-28 17:17 ` Wen Yang [this message]
2026-06-25 12:14 ` [PATCH v3 12/17] rv: Add KUnit tests for some LTL monitors Gabriele Monaco
2026-06-25 12:14 ` [PATCH v3 13/17] verification/rvgen: Add the rvgen kunit subcommand Gabriele Monaco
2026-06-25 12:14 ` [PATCH v3 14/17] verification/rvgen: Add selftests for rvgen kunit Gabriele Monaco
2026-06-28 17:06 ` Wen Yang
2026-06-25 12:14 ` [PATCH v3 15/17] selftests/verification: Fix wrong errexit assumption Gabriele Monaco
2026-06-25 12:14 ` [PATCH v3 16/17] selftests/verification: Rearrange the wwnr_printk test Gabriele Monaco
2026-06-25 12:14 ` [PATCH v3 17/17] selftests/verification: Add selftests for deadline and stall monitors Gabriele Monaco
2026-06-28 16:58 ` Wen Yang
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=b2e841ee-cfcd-41d1-96af-7ba89bfb86a2@linux.dev \
--to=wen.yang@linux.dev \
--cc=gmonaco@redhat.com \
--cc=jkacur@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=namcao@linutronix.de \
--cc=rostedt@goodmis.org \
--cc=tglozar@redhat.com \
--cc=thomas.weissschuh@linutronix.de \
/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