diff options
| author | Boqun Feng <boqun.feng@gmail.com> | 2026-01-04 18:53:06 +0800 |
|---|---|---|
| committer | Boqun Feng <boqun.feng@gmail.com> | 2026-01-04 18:53:06 +0800 |
| commit | acb0b2f5d6472b26db1d68f6d7b982d30b8bd8fe (patch) | |
| tree | 55909aae341a41bcc159240751a800c764ddef3f /kernel | |
| parent | 60908279164a1dc651b7f4685cfbfe5161a4a797 (diff) | |
| parent | cf587c6ff2d09866eb53a4620bc1aa561fb0c000 (diff) | |
Merge branch 'rcu-torture.20260104a' into rcu-next
* rcu-torture.20260104a:
rcutorture: Add --kill-previous option to terminate previous kvm.sh runs
rcutorture: Prevent concurrent kvm.sh runs on same source tree
torture: Include commit discription in testid.txt
torture: Make config2csv.sh properly handle comments in .boot files
torture: Make kvm-series.sh give run numbers and totals
torture: Make kvm-series.sh give build numbers and totals
torture: Parallelize kvm-series.sh guest-OS execution
rcutorture: Add context checks to rcu_torture_timer()
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/rcu/rcutorture.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c index d00b043823ae..63053031ade2 100644 --- a/kernel/rcu/rcutorture.c +++ b/kernel/rcu/rcutorture.c @@ -2454,6 +2454,9 @@ static DEFINE_TORTURE_RANDOM_PERCPU(rcu_torture_timer_rand); */ static void rcu_torture_timer(struct timer_list *unused) { + WARN_ON_ONCE(!in_serving_softirq()); + WARN_ON_ONCE(in_hardirq()); + WARN_ON_ONCE(in_nmi()); atomic_long_inc(&n_rcu_torture_timers); (void)rcu_torture_one_read(this_cpu_ptr(&rcu_torture_timer_rand), -1); |