From: "Paul E. McKenney" <paulmck@kernel.org>
To: rcu@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com,
rostedt@goodmis.org, "Paul E. McKenney" <paulmck@kernel.org>
Subject: [PATCH 06/19] rcutorture: Add support for testing synchronize_srcu_atomic()
Date: Fri, 18 Sep 2026 17:35:08 -0700 [thread overview]
Message-ID: <20260919003521.3134552-6-paulmck@kernel.org> (raw)
In-Reply-To: <13d6be93-8d9d-47a2-beb0-99c8a90938d4@paulmck-laptop>
This commit adds support for the value 0x10 for reader_flavor, which
specifies SRCU_READ_FLAVOR_ATOMIC, that is, srcu_read_lock_atomic(),
srcu_read_unlock_atomic(), and synchronize_srcu_atomic().
[ paulmck: Apply Kunwu Chan feedback. ]
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
---
kernel/rcu/rcutorture.c | 46 +++++++++++++++++++++++++++++++++++------
1 file changed, 40 insertions(+), 6 deletions(-)
diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
index 4d1be2a49f01..182d47975efd 100644
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@ -710,10 +710,21 @@ static struct rcu_torture_ops rcu_busted_ops = {
DEFINE_STATIC_SRCU(srcu_ctl);
DEFINE_STATIC_SRCU_FAST(srcu_ctlf);
DEFINE_STATIC_SRCU_FAST_UPDOWN(srcu_ctlfud);
+DEFINE_STATIC_SRCU_ATOMIC(srcu_ctla);
static struct srcu_struct srcu_ctld;
static struct srcu_struct *srcu_ctlp = &srcu_ctl;
static struct rcu_torture_ops srcud_ops;
+// Restrict APIs permitted for atomic SRCU.
+static void srcu_torture_init_forbidden_apis(void)
+{
+ cur_ops->call = NULL;
+ cur_ops->cb_barrier = NULL;
+ cur_ops->deferred_free = NULL;
+ cur_ops->exp_current = NULL;
+ cur_ops->start_gp_poll = NULL;
+}
+
static void srcu_torture_init(void)
{
rcu_sync_torture_init();
@@ -729,6 +740,11 @@ static void srcu_torture_init(void)
srcu_ctlp = &srcu_ctlfud;
VERBOSE_TOROUT_STRING("srcu_torture_init fast-up/down SRCU");
}
+ if (reader_flavor & SRCU_READ_FLAVOR_ATOMIC) {
+ srcu_ctlp = &srcu_ctla;
+ VERBOSE_TOROUT_STRING("srcu_torture_init atomic SRCU");
+ srcu_torture_init_forbidden_apis();
+ }
}
static void srcu_get_gp_data(int *flags, unsigned long *gp_seq)
@@ -766,6 +782,11 @@ static int srcu_torture_read_lock(void)
WARN_ON_ONCE(idx & ~0x1);
ret += idx << 3;
}
+ if (reader_flavor & SRCU_READ_FLAVOR_ATOMIC) {
+ idx = srcu_read_lock_atomic(srcu_ctlp);
+ WARN_ON_ONCE(idx & ~0x1);
+ ret += idx << 4;
+ }
return ret;
}
@@ -785,7 +806,8 @@ srcu_read_delay(struct torture_random_state *rrsp, struct rt_read_seg *rtrsp)
delay = torture_random(rrsp) %
(nrealreaders * 2 * longdelay * uspertick);
- if (!delay && !in_atomic() && !rcu_preempt_depth() && !irqs_disabled()) {
+ if (!delay && !in_atomic() && !rcu_preempt_depth() && !irqs_disabled() &&
+ !(reader_flavor & SRCU_READ_FLAVOR_ATOMIC)) {
schedule_timeout_interruptible(longdelay);
rtrsp->rt_delay_jiffies = longdelay;
} else {
@@ -796,6 +818,8 @@ srcu_read_delay(struct torture_random_state *rrsp, struct rt_read_seg *rtrsp)
static void srcu_torture_read_unlock(int idx)
{
WARN_ON_ONCE((reader_flavor && (idx & ~reader_flavor)) || (!reader_flavor && (idx & ~0x1)));
+ if (reader_flavor & SRCU_READ_FLAVOR_ATOMIC)
+ srcu_read_unlock_atomic(srcu_ctlp, (idx & 0x10) >> 4);
if (reader_flavor & SRCU_READ_FLAVOR_FAST_UPDOWN)
srcu_read_unlock_fast_updown(srcu_ctlp,
__srcu_ctr_to_ptr(srcu_ctlp, (idx & 0x8) >> 3));
@@ -875,7 +899,10 @@ static void srcu_torture_deferred_free(struct rcu_torture *rp)
static void srcu_torture_synchronize(void)
{
- synchronize_srcu(srcu_ctlp);
+ if (reader_flavor & SRCU_READ_FLAVOR_ATOMIC)
+ synchronize_srcu_atomic(srcu_ctlp);
+ else
+ synchronize_srcu(srcu_ctlp);
}
static unsigned long srcu_torture_get_gp_state(void)
@@ -911,7 +938,10 @@ static void srcu_torture_stats(void)
static void srcu_torture_synchronize_expedited(void)
{
- synchronize_srcu_expedited(srcu_ctlp);
+ if (reader_flavor & SRCU_READ_FLAVOR_ATOMIC)
+ synchronize_srcu_atomic(srcu_ctlp);
+ else
+ synchronize_srcu_expedited(srcu_ctlp);
}
static void srcu_torture_expedite_current(void)
@@ -969,6 +999,10 @@ static void srcud_torture_init(void)
} else if (reader_flavor & SRCU_READ_FLAVOR_FAST_UPDOWN) {
WARN_ON(init_srcu_struct_fast_updown(&srcu_ctld));
VERBOSE_TOROUT_STRING("srcud_torture_init fast-up/down SRCU");
+ } else if (reader_flavor & SRCU_READ_FLAVOR_ATOMIC) {
+ WARN_ON(init_srcu_struct_atomic(&srcu_ctld));
+ VERBOSE_TOROUT_STRING("srcud_torture_init atomic SRCU");
+ srcu_torture_init_forbidden_apis();
} else {
WARN_ON(init_srcu_struct(&srcu_ctld));
}
@@ -1749,7 +1783,7 @@ rcu_torture_writer(void *arg)
pr_alert("%s" TORTURE_FLAG " Waited %lu jiffies for boot to complete.\n",
torture_type, jiffies - j);
- if (IS_ENABLED(CONFIG_RCU_LAZY))
+ if (IS_ENABLED(CONFIG_RCU_LAZY) && cur_ops->call)
INIT_WORK_ONSTACK(&lazy_work, rcu_torture_writer_work);
do {
@@ -1944,7 +1978,7 @@ rcu_torture_writer(void *arg)
!rcu_gp_is_normal();
}
rcu_torture_writer_state = RTWS_STUTTER;
- if (IS_ENABLED(CONFIG_RCU_LAZY))
+ if (IS_ENABLED(CONFIG_RCU_LAZY) && cur_ops->call)
queue_work(system_percpu_wq, &lazy_work);
stutter_waited = stutter_wait("rcu_torture_writer");
if (stutter_waited &&
@@ -1977,7 +2011,7 @@ rcu_torture_writer(void *arg)
" Dynamic grace-period expediting was disabled.\n",
torture_type);
- if (IS_ENABLED(CONFIG_RCU_LAZY)) {
+ if (IS_ENABLED(CONFIG_RCU_LAZY) && cur_ops->call) {
cancel_work_sync(&lazy_work);
destroy_work_on_stack(&lazy_work);
}
--
2.40.1
next prev parent reply other threads:[~2026-09-19 0:35 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-19 0:35 [PATCH 0/19] Add atomic SRCU Paul E. McKenney
2026-09-19 0:35 ` [PATCH 01/19] srcutiny: Make a Tiny SRCU grace period imply an RCU grace period Paul E. McKenney
2026-09-19 0:35 ` [PATCH 02/19] srcutree: Suppress srcu_advance_state() mutex_lock in atomic Paul E. McKenney
2026-09-19 0:35 ` [PATCH 03/19] srcutree: Suppress to-big transition for atomic SRCU Paul E. McKenney
2026-09-19 0:35 ` [PATCH 04/19] srcutree: Add an atomic Tree SRCU Paul E. McKenney
2026-09-19 0:35 ` [PATCH 05/19] srcutiny: Add an atomic Tiny SRCU Paul E. McKenney
2026-09-19 0:35 ` Paul E. McKenney [this message]
2026-09-19 0:35 ` [PATCH 07/19] srcutree: Disable preemption across synchronize_srcu_atomic() Paul E. McKenney
2026-09-19 0:35 ` [PATCH 08/19] srcu: Use IRQ_WORK_INIT_HARD for srcu's irq_work Paul E. McKenney
2026-09-19 0:35 ` [PATCH 09/19] srcu: Fix WARN_ON() for rcu_segcblist_n_cbs() in cleanup_srcu_struct() Paul E. McKenney
2026-09-19 0:35 ` [PATCH 10/19] srcutree: Warn if Tiny SRCU readers are preempted Paul E. McKenney
2026-09-19 0:35 ` [PATCH 11/19] srcutree: Explicitly note DEFINE_SRCU() needs for srcu_barrier() Paul E. McKenney
2026-09-19 0:35 ` [PATCH 12/19] rcutorture: Add atomic-SRCU support to torture.sh Paul E. McKenney
2026-09-19 0:35 ` [PATCH 13/19] srcutree: Add reader-free fastpath to synchronize_srcu_atomic() Paul E. McKenney
2026-09-19 0:35 ` [PATCH 14/19] srcutree: Skip callback scheduling for atomic SRCU grace periods Paul E. McKenney
2026-09-19 0:35 ` [PATCH 15/19] srcutree: Remove srcu_barrier() sleep for atomic SRCU Paul E. McKenney
2026-09-19 0:35 ` [PATCH 16/19] srcu: Restrict atomic-SRCU non_block annotation to task context Paul E. McKenney
2026-09-19 0:35 ` [PATCH 17/19] srcutree: Make init_srcu_struct_atomic() prevent transition to big Paul E. McKenney
2026-09-19 0:35 ` [PATCH 18/19] srcutree: Don't transition atomic SRCU to big in srcu_gp_end() Paul E. McKenney
2026-09-19 0:35 ` [PATCH 19/19] srcutree: Skip torture to-big transition for atomic SRCU Paul E. McKenney
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=20260919003521.3134552-6-paulmck@kernel.org \
--to=paulmck@kernel.org \
--cc=kernel-team@meta.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rcu@vger.kernel.org \
--cc=rostedt@goodmis.org \
/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®