call_rcu() and call_srcu() are now safe to invoke from NMI context, but rcutorture never calls them from there, leaving the deferral path untested. Add an ->nmi_capable flag to rcu_torture_ops and, for flavors that set it, arm a per-CPU hardware perf counter whose overflow handler submits a callback via ->call(). The overflow arrives as a real NMI on x86 and a pseudo-NMI on arm64 (irqchip.gicv3_pseudo_nmi=1); the handler acts only when in_nmi(), so it exercises the deferral path only for a genuine NMI. One preallocated callback is kept in flight (guarded by an atomic) to avoid allocating in NMI. Report both the count issued from NMI ("nmi-calls:") and the count invoked ("nmi-cbs:"). rcu_torture_cleanup() disables the perf counters and then calls cb_barrier(), which drains every deferred callback, so at that point the two counts must be equal; a mismatch means a callback was lost and fails the test. This leans on srcu_barrier()/rcu_barrier() flushing the deferred callbacks, as added earlier in this series. Set ->nmi_capable on the NMI-safe flavors: rcu, srcu, srcud, and tasks-tracing (call_srcu() under the hood). Tasks and Tasks Rude are left alone, as call_rcu_tasks_generic() is not yet NMI-safe. Testing is on by default; the nmi_calls parameter disables it, which helps rule NMI handling in or out when triaging a failure. Requires CONFIG_PERF_EVENTS and a hardware PMU; otherwise silently skipped. Signed-off-by: Puranjay Mohan --- kernel/rcu/rcutorture.c | 115 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c index 39426a8718fe9..7be6cabf5898c 100644 --- a/kernel/rcu/rcutorture.c +++ b/kernel/rcu/rcutorture.c @@ -48,6 +48,7 @@ #include #include #include +#include #include "rcu.h" @@ -115,6 +116,7 @@ torture_param(int, leakpointer, 0, "Leak pointer dereferences from readers"); torture_param(int, n_barrier_cbs, 0, "# of callbacks/kthreads for barrier testing"); torture_param(int, n_up_down, 32, "# of concurrent up/down hrtimer-based RCU readers"); torture_param(int, nfakewriters, 4, "Number of RCU fake writer threads"); +torture_param(bool, nmi_calls, true, "Exercise ->call() from NMI on nmi_capable flavors"); torture_param(int, nreaders, -1, "Number of RCU reader threads"); torture_param(bool, nwriters, 1, "Number of RCU writer threads (0 or 1)"); torture_param(int, object_debug, 0, "Enable debug-object double call_rcu() testing"); @@ -216,6 +218,8 @@ static long n_rcu_torture_boost_failure; static long n_rcu_torture_boosts; static atomic_long_t n_rcu_torture_timers; static atomic_long_t n_rcu_torture_irqs; +static atomic_long_t n_rcu_torture_nmi_call; +static atomic_long_t n_rcu_torture_nmi_cb; static long n_barrier_attempts; static long n_barrier_successes; /* did rcu_barrier test succeed? */ static unsigned long n_read_exits; @@ -433,6 +437,7 @@ struct rcu_torture_ops { bool (*is_task_rcu_boosted)(void); long cbflood_max; int irq_capable; + int nmi_capable; int can_boost; int extendables; int slow_gps; @@ -648,6 +653,7 @@ static struct rcu_torture_ops rcu_ops = { .extendables = RCUTORTURE_MAX_EXTEND, .debug_objects = 1, .start_poll_irqsoff = 1, + .nmi_capable = 1, .name = "rcu" }; @@ -942,6 +948,7 @@ static struct rcu_torture_ops srcu_ops = { .debug_objects = 1, .have_up_down = IS_ENABLED(CONFIG_TINY_SRCU) ? 0 : SRCU_READ_FLAVOR_NORMAL | SRCU_READ_FLAVOR_FAST_UPDOWN, + .nmi_capable = 1, .name = "srcu" }; @@ -1005,6 +1012,7 @@ static struct rcu_torture_ops srcud_ops = { .debug_objects = 1, .have_up_down = IS_ENABLED(CONFIG_TINY_SRCU) ? 0 : SRCU_READ_FLAVOR_NORMAL | SRCU_READ_FLAVOR_FAST_UPDOWN, + .nmi_capable = 1, .name = "srcud" }; @@ -1269,6 +1277,7 @@ static struct rcu_torture_ops tasks_tracing_ops = { .cbflood_max = 50000, .irq_capable = 1, .slow_gps = 1, + .nmi_capable = 1, .name = "tasks-tracing" }; @@ -2659,12 +2668,97 @@ static bool rcu_torture_one_read(struct torture_random_state *trsp, long myid) static DEFINE_TORTURE_RANDOM_PERCPU(rcu_torture_timer_rand); +/* + * Exercise ->call() from NMI context for flavors that advertise ->nmi_capable. + * A per-CPU hardware perf counter overflows into an NMI -- a real NMI on x86, + * or a pseudo-NMI on arm64 booted with irqchip.gicv3_pseudo_nmi=1 -- and its + * handler submits one preallocated callback via ->call(). Only one callback is + * in flight at a time (guarded by an atomic), which avoids allocating in NMI + * and is enough to exercise the deferral. This mirrors how BPF programs reach + * ->call() from NMI. Requires a hardware PMU; when the overflow is not an NMI + * the handler does nothing. + */ +#ifdef CONFIG_PERF_EVENTS +static struct perf_event_attr rcu_torture_nmi_attr = { + .type = PERF_TYPE_HARDWARE, + .config = PERF_COUNT_HW_CPU_CYCLES, + .size = sizeof(struct perf_event_attr), + .pinned = 1, + .disabled = 1, + .freq = 1, + .sample_freq = 1000, +}; + +static struct perf_event **rcu_torture_nmi_events; +static struct rcu_head rcu_torture_nmi_rh; +static atomic_t rcu_torture_nmi_rh_inuse; + +static void rcu_torture_nmi_cb(struct rcu_head *rhp) +{ + atomic_long_inc(&n_rcu_torture_nmi_cb); + atomic_set(&rcu_torture_nmi_rh_inuse, 0); +} + +static void rcu_torture_nmi_overflow(struct perf_event *event, + struct perf_sample_data *data, + struct pt_regs *regs) +{ + if (!in_nmi()) + return; + if (cur_ops->call && !atomic_xchg(&rcu_torture_nmi_rh_inuse, 1)) { + cur_ops->call(&rcu_torture_nmi_rh, rcu_torture_nmi_cb); + atomic_long_inc(&n_rcu_torture_nmi_call); + } +} + +static void rcu_torture_nmi_init(void) +{ + struct perf_event *event; + int cpu; + + if (!nmi_calls || !cur_ops->nmi_capable || !cur_ops->call) + return; + rcu_torture_nmi_events = kcalloc(nr_cpu_ids, sizeof(*rcu_torture_nmi_events), + GFP_KERNEL); + if (!rcu_torture_nmi_events) + return; + for_each_online_cpu(cpu) { + event = perf_event_create_kernel_counter(&rcu_torture_nmi_attr, cpu, + NULL, rcu_torture_nmi_overflow, NULL); + if (IS_ERR(event)) + continue; + rcu_torture_nmi_events[cpu] = event; + perf_event_enable(event); + } +} + +static void rcu_torture_nmi_cleanup(void) +{ + int cpu; + + if (!rcu_torture_nmi_events) + return; + for_each_possible_cpu(cpu) { + if (!rcu_torture_nmi_events[cpu]) + continue; + perf_event_disable(rcu_torture_nmi_events[cpu]); + perf_event_release_kernel(rcu_torture_nmi_events[cpu]); + } + kfree(rcu_torture_nmi_events); + rcu_torture_nmi_events = NULL; +} +#else /* #ifdef CONFIG_PERF_EVENTS */ +static void rcu_torture_nmi_init(void) { } +static void rcu_torture_nmi_cleanup(void) { } +#endif /* #else #ifdef CONFIG_PERF_EVENTS */ + /* * RCU torture reader from timer handler. Dereferences rcu_torture_current, * incrementing the corresponding element of the pipeline array. The * counter in the element should never be greater than 1, otherwise, the * RCU implementation is broken. */ + static void rcu_torture_timer(struct timer_list *unused) { WARN_ON_ONCE(!in_serving_softirq()); @@ -3047,6 +3141,9 @@ rcu_torture_stats_print(void) data_race(n_barrier_attempts), data_race(n_rcu_torture_barrier_error)); pr_cont("read-exits: %ld ", data_race(n_read_exits)); // Statistic. + pr_cont("nmi-calls: %ld nmi-cbs: %ld ", + atomic_long_read(&n_rcu_torture_nmi_call), + atomic_long_read(&n_rcu_torture_nmi_cb)); pr_cont("nocb-toggles: %ld:%ld ", atomic_long_read(&n_nocb_offload), atomic_long_read(&n_nocb_deoffload)); pr_cont("gpwraps: %ld\n", n_gpwraps); @@ -4325,6 +4422,8 @@ rcu_torture_cleanup(void) kfree(reader_tasks); reader_tasks = NULL; } + /* Disable the perf counters (and thus the NMI ->call() firing) now. */ + rcu_torture_nmi_cleanup(); kfree(rcu_torture_reader_mbchk); rcu_torture_reader_mbchk = NULL; @@ -4354,6 +4453,20 @@ rcu_torture_cleanup(void) pr_info("%s: Invoking %pS().\n", __func__, cur_ops->cb_barrier); cur_ops->cb_barrier(); } + + /* + * cb_barrier() above drained every deferred NMI ->call() callback, so the + * count issued from NMI must equal the count invoked; a mismatch means a + * callback was lost. + */ + if (atomic_long_read(&n_rcu_torture_nmi_call) != + atomic_long_read(&n_rcu_torture_nmi_cb)) { + pr_alert("%s: NMI ->call() lost a callback: issued %ld invoked %ld\n", + __func__, atomic_long_read(&n_rcu_torture_nmi_call), + atomic_long_read(&n_rcu_torture_nmi_cb)); + atomic_inc(&n_rcu_torture_error); + } + if (cur_ops->cleanup != NULL) cur_ops->cleanup(); @@ -4786,6 +4899,8 @@ rcu_torture_init(void) firsterr = -ENOMEM; goto unwind; } + /* Arm the per-CPU perf counters that drive ->call() from NMI. */ + rcu_torture_nmi_init(); for (i = 0; i < nrealreaders; i++) { rcu_torture_reader_mbchk[i].rtc_chkrdr = -1; firsterr = torture_create_kthread(rcu_torture_reader, (void *)i, -- 2.53.0-Meta