From: Gabriele Monaco <gmonaco@redhat.com>
To: wen.yang@linux.dev
Cc: Nam Cao <namcao@linutronix.de>,
linux-trace-kernel@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v8 03/14] rv: Add a KUnit test for the HA timer underflow
Date: Thu, 19 Nov 2026 16:07:26 +0100 [thread overview]
Message-ID: <9e5ef6b35fe5788ddb425a3e64bb55c64dfb5ab1.camel@redhat.com> (raw)
In-Reply-To: <4ae656adc2e23939c3bf2138e1d6a9ee496fe4da.1793900349.git.wen.yang@linux.dev>
On Fri, 2026-11-06 at 01:49 +0800, wen.yang@linux.dev wrote:
> From: Wen Yang <wen.yang@linux.dev>
>
> Add rv_ha_kunit.c as a standalone test suite with rvtest, a minimal
> per-object HA monitor, to test both underflows fixed by the previous
> patch: an invariant checked while the uptime is below the budget holds,
> and a timer armed after the budget elapsed expires now. Without that fix
> both expectations fail.
>
> Building the HA test in its own compilation unit keeps ha_monitor.h
> isolated from non-monitor test runners and avoids macro conflicts. The
> suite is guarded by IS_ENABLED(CONFIG_RV_HA_MONITOR) so kernels without
> HA monitors build cleanly.
>
> Suggested-by: Gabriele Monaco <gmonaco@redhat.com>
> Signed-off-by: Wen Yang <wen.yang@linux.dev>
> ---
> kernel/trace/rv/Makefile | 1 +
> kernel/trace/rv/rv_ha_kunit.c | 152 ++++++++++++++++++++++++++++++++++
> 2 files changed, 153 insertions(+)
> create mode 100644 kernel/trace/rv/rv_ha_kunit.c
>
> diff --git a/kernel/trace/rv/Makefile b/kernel/trace/rv/Makefile
> index cdbf68c84f5a..4b84b83b942b 100644
> --- a/kernel/trace/rv/Makefile
> +++ b/kernel/trace/rv/Makefile
> @@ -26,3 +26,4 @@ obj-$(CONFIG_RV_REACTORS) += rv_reactors.o
> obj-$(CONFIG_RV_REACT_PRINTK) += reactor_printk.o
> obj-$(CONFIG_RV_REACT_PANIC) += reactor_panic.o
> obj-$(CONFIG_RV_MONITORS_KUNIT_TEST) += rv_monitors_test.o
> +obj-$(CONFIG_RV_MONITORS_KUNIT_TEST) += rv_ha_kunit.o
I think it's alright to reuse CONFIG_RV_MONITORS_KUNIT_TEST, but you aren't
doing it right in here.
CONFIG_RV_MONITORS_KUNIT_TEST depends (now) on RV_REACTORS, rv_ha_kunit does not
however. Also using IS_ENABLED(CONFIG_RV_HA_MONITOR) generates an empty module.
I would either change the "depends on RV_REACTORS" in
CONFIG_RV_MONITORS_KUNIT_TEST to "depends on RV_REACTORS || RV_HA_MONITOR" and build
conditionally the two modules based on their requirements only (in Makefile):
ifdef CONFIG_RV_REACTORS
obj-$(CONFIG_RV_MONITORS_KUNIT_TEST) += rv_monitors_test.o
endif
ifdef CONFIG_RV_HA_MONITOR
obj-$(CONFIG_RV_MONITORS_KUNIT_TEST) += rv_ha_kunit.o
endif
Or just create a new CONFIG_ symbol.
I didn't test either, but in any case you shouldn't prevent compilation
of an entire C file from the C file itself, use Makefiles for that.
> diff --git a/kernel/trace/rv/rv_ha_kunit.c b/kernel/trace/rv/rv_ha_kunit.c
> new file mode 100644
> index 000000000000..e8aaee110fae
> --- /dev/null
> +++ b/kernel/trace/rv/rv_ha_kunit.c
> @@ -0,0 +1,152 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * KUnit tests for RV hybrid automata (HA) framework
> + */
> +#include <kunit/test.h>
> +#include <linux/rv.h>
> +
> +#if IS_ENABLED(CONFIG_RV_HA_MONITOR)
> +
> +#include <rv_trace.h>
> +
> +/* rvtest: a minimal per-object HA monitor driven directly by the tests. */
> +#define MONITOR_NAME rvtest
> +#define RV_MON_TYPE RV_MON_PER_OBJ
> +#define HA_TIMER_TYPE HA_TIMER_HRTIMER
> +typedef void *monitor_target;
> +
> +#define rv_monitoring_on() true
> +#define trace_rv_retries_error(...) do { } while (0)
> +#define trace_event_rvtest(...) do { } while (0)
> +#define trace_error_rvtest(...) do { } while (0)
> +#define trace_error_env_rvtest(...) do { } while (0)
> +
> +enum states_rvtest {
> + idle_rvtest,
> + armed_rvtest,
> + state_max_rvtest,
> +};
> +
> +#define INVALID_STATE state_max_rvtest
> +
> +enum events_rvtest {
> + start_rvtest,
> + event_max_rvtest,
> +};
> +
> +enum envs_rvtest {
> + clk_rvtest,
> + env_max_rvtest,
> + env_max_stored_rvtest = env_max_rvtest,
> +};
> +
> +#define HA_CLK_NS
> +
> +struct automaton_rvtest {
> + char *state_names[state_max_rvtest];
> + char *event_names[event_max_rvtest];
> + char *env_names[env_max_rvtest];
> + unsigned char function[state_max_rvtest][event_max_rvtest];
> + unsigned char initial_state;
> + bool final_states[state_max_rvtest];
> +};
> +
> +static const struct automaton_rvtest automaton_rvtest = {
> + .state_names = { "idle", "armed" },
> + .event_names = { "start" },
> + .env_names = { "clk" },
> + .function = {
> + { armed_rvtest }, /* idle */
> + { INVALID_STATE }, /* armed */
> + },
> + .initial_state = idle_rvtest,
> + .final_states = { 1, 0 },
> +};
> +
> +#include <rv/ha_monitor.h>
> +
> +#define RVTEST_BUDGET_NS (300ULL * NSEC_PER_MSEC)
> +
> +static u64 ha_get_env(struct ha_monitor *ha_mon, enum envs_rvtest env,
> + u64 time_ns)
> +{
> + return ha_get_clk_ns(ha_mon, env, time_ns);
> +}
> +
> +static void ha_reset_env(struct ha_monitor *ha_mon, enum envs_rvtest env,
> + u64 time_ns)
> +{
> + ha_reset_clk_ns(ha_mon, env, time_ns);
> +}
> +
> +static bool ha_verify_constraint(struct ha_monitor *ha_mon,
> + enum states curr_state, enum events event,
> + enum states next_state, u64 time_ns)
> +{
> + return true;
> +}
> +
> +static const struct rv_kunit_mon rvtest_mon __maybe_unused =
> RV_MON_OPS_INIT();
> +
> +/*
> + * rv_test_rvtest_underflow - the HA clock math must not underflow as u64
> + *
> + * An invariant checked while the uptime is below the budget holds, and a
> + * timer armed after the budget elapsed expires now.
> + */
> +static void rv_test_rvtest_underflow(struct kunit *test)
> +{
> + struct ha_monitor *ha_mon;
> + struct da_monitor *da_mon;
> + const int id = 4242;
> +
A failed ASSERT quits the test and doesn't run any cleanup, either use a monitor
type that doesn't require cleanup or arm the cleanup here da_monitor_destroy()
and enabled = 0 should be enough).
The way we arm teardown_test() in rv_monitors_test.c should do.
> + da_monitor_init();
> + rv_this.enabled = 1;
> +
> + da_handle_start_run_event(id, NULL, start_rvtest);
> +
> + scoped_guard(rcu)
> + da_mon = da_get_monitor(id, NULL);
> + KUNIT_ASSERT_NOT_NULL(test, da_mon);
> + ha_mon = to_ha_monitor(da_mon);
> +
> + /* Uptime below the budget: time_ns - expire_ns would underflow. */
This comment isn't quite meaningful as again it describe how the code was /once/
broken.
Be assertive like "Expect no underflow even if uptime is below budget (0)"
> + ha_reset_clk_ns(ha_mon, clk_rvtest, 0);
> + KUNIT_EXPECT_TRUE(test, ha_check_invariant_ns(ha_mon, clk_rvtest, 0,
> + RVTEST_BUDGET_NS));
> +
> + /*
> + * Budget already elapsed: expire - passed would underflow and queue
> + * the timer at KTIME_SEC_MAX. Reset first so the expiry does not
> + * report.
> + */
So here what you're trying to simulate is:
* reset with now = 0
* start the timer when now = BUDGET + 1s
* validate the expires didn't overflow (timer expires in past)
The NSEC_PER_SEC is just a magic number to avoid off-by-ones right?
In both cases we aren't really waiting for 1s, but maybe just use
1ns (+ 1) to avoid confusion. Wouldn't that work?
The comment looks a bit misleading to me.
Again I would say something like "Expect no underflow if timer is
armed when already elapsed".
I wonder if the reset (timer cancel) is really required here.
> + da_monitor_reset(&ha_mon->da_mon);
> + ha_reset_clk_ns(ha_mon, clk_rvtest, 0);
> + ha_start_timer_ns(ha_mon, clk_rvtest, RVTEST_BUDGET_NS,
> + RVTEST_BUDGET_NS + NSEC_PER_SEC);
> + KUNIT_EXPECT_TRUE(test,
> + ktime_before(hrtimer_get_expires(&ha_mon->hrtimer),
> + ktime_get() + NSEC_PER_SEC));
> +
> + ha_cancel_timer_sync(ha_mon);
> + da_destroy_storage(id);
> + da_monitor_destroy();
> + rv_this.enabled = 0;
This is the part I would /only/ put in a teardown helper triggered by
KUnit, and only the last 2 statements, the others are implied in the
destroy() aren't they?
Thanks,
Gabriele
> +}
> +
> +static struct kunit_case rv_ha_kunit_cases[] = {
> + KUNIT_CASE(rv_test_rvtest_underflow),
> + {}
> +};
> +
> +static struct kunit_suite rv_ha_kunit_suite = {
> + .name = "rv_ha",
> + .test_cases = rv_ha_kunit_cases,
> +};
> +
> +kunit_test_suite(rv_ha_kunit_suite);
> +
> +#endif /* CONFIG_RV_HA_MONITOR */
> +
> +MODULE_LICENSE("GPL");
> +MODULE_DESCRIPTION("KUnit tests for RV hybrid automata (HA) framework");
next prev parent reply other threads:[~2026-11-19 15:07 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-05 17:49 [PATCH v8 00/14] rv: Add task latency over budget RV monitor wen.yang
2026-11-05 17:49 ` [PATCH v8 01/14] rv: Force environment reset action on HA monitor start wen.yang
2026-11-05 17:49 ` [PATCH v8 02/14] rv: Fix ha_monitor timer and invariant underflow wen.yang
2026-11-19 14:34 ` Gabriele Monaco
2026-11-05 17:49 ` [PATCH v8 03/14] rv: Add a KUnit test for the HA timer underflow wen.yang
2026-11-19 15:07 ` Gabriele Monaco [this message]
2026-11-05 17:49 ` [PATCH v8 04/14] rv: Disarm HA timers on the storage free path wen.yang
2026-11-05 17:49 ` [PATCH v8 05/14] rv: Add a KUnit test for " wen.yang
2026-11-05 17:49 ` [PATCH v8 06/14] rv: Make da_monitor_reset_hook, sync_hook and EVENT_NONE_LBL overridable wen.yang
2026-11-05 17:49 ` [PATCH v8 07/14] rv: Introduce DA_MON_ALLOCATION_STRATEGY wen.yang
2026-11-05 17:49 ` [PATCH v8 08/14] rv: Support embedded target types in per-object DA storage wen.yang
2026-11-05 17:49 ` [PATCH v8 09/14] rv: Add generic uprobe infrastructure for RV monitors wen.yang
2026-11-05 17:49 ` [PATCH v8 10/14] rv: Add tlob model DOT file wen.yang
2026-11-05 17:49 ` [PATCH v8 11/14] rv: Add tlob hybrid automaton monitor wen.yang
2026-11-05 17:49 ` [PATCH v8 12/14] rv: Add KUnit tests for the tlob monitor wen.yang
2026-11-05 17:49 ` [PATCH v8 13/14] selftests/verification: Add tlob selftests wen.yang
2026-11-05 17:49 ` [PATCH v8 14/14] selftests/ftrace: Walk up parent dirs to find test.d/functions 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=9e5ef6b35fe5788ddb425a3e64bb55c64dfb5ab1.camel@redhat.com \
--to=gmonaco@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=namcao@linutronix.de \
--cc=wen.yang@linux.dev \
/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
all inboxes | Powered by JetHome®