From: "Paul E. McKenney" <paulmck@kernel.org>
To: rcu@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, kernel-team@fb.com,
rostedt@goodmis.org, Neeraj Upadhyay <quic_neeraju@quicinc.com>,
"Paul E . McKenney" <paulmck@kernel.org>
Subject: [PATCH rcu 10/21] srcu: Ensure snp nodes tree is fully initialized before traversal
Date: Mon, 18 Apr 2022 17:03:11 -0700 [thread overview]
Message-ID: <20220419000322.3948903-10-paulmck@kernel.org> (raw)
In-Reply-To: <20220419000315.GA3948789@paulmck-ThinkPad-P17-Gen-1>
From: Neeraj Upadhyay <quic_neeraju@quicinc.com>
For configurations where snp node tree is not initialized at
init time (added in subsequent commits), srcu_funnel_gp_start()
and srcu_funnel_exp_start() can potential traverse and observe
the snp nodes' transient (uninitialized) states. This can potentially
happen, when init_srcu_struct_nodes() initialization of sdp->mynode
races with srcu_funnel_gp_start() and srcu_funnel_exp_start()
Consider the case below where srcu_funnel_gp_start() observes
sdp->mynode to be not NULL and uses an uninitialized sdp->grpmask
P1 P2
init_srcu_struct_nodes() void srcu_funnel_gp_start(...)
{
for_each_possible_cpu(cpu) {
...
sdp->mynode = &snp_first[...];
for (snp = sdp->mynode;...) struct srcu_node *snp_leaf =
smp_load_acquire(&sdp->mynode)
... if (snp_leaf) {
for (snp = snp_leaf; ...)
...
if (snp == snp_leaf)
snp->srcu_data_have_cbs[idx] |=
sdp->grpmask;
sdp->grpmask =
1 << (cpu - sdp->mynode->grplo);
}
}
Similarly, init_srcu_struct_nodes() and srcu_funnel_exp_start() can
race, where srcu_funnel_exp_start() could observe state of snp lock
before spin_lock_init().
P1 P2
init_srcu_struct_nodes() void srcu_funnel_exp_start(...)
{
srcu_for_each_node_breadth_first(ssp, snp) { for (; ...) {
spin_lock_...(snp, )
spin_lock_init(&ACCESS_PRIVATE(snp, lock));
...
}
for_each_possible_cpu(cpu) {
...
sdp->mynode = &snp_first[...];
To avoid these issues, ensure that snp node tree initialization is
complete i.e. after SRCU_SIZE_WAIT_BARRIER srcu_size_state is reached,
before traversing the tree. Given that srcu_funnel_gp_start() and
srcu_funnel_exp_start() are called within SRCU read side critical
sections, this check is safe, in the sense that all callbacks are
enqueued on CPU0 srcu_cblist until SRCU_SIZE_WAIT_CALL is entered,
and these read side critical sections (containing srcu_funnel_gp_start()
and srcu_funnel_exp_start()) need to complete, before SRCU_SIZE_WAIT_CALL
is reached.
Signed-off-by: Neeraj Upadhyay <quic_neeraju@quicinc.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
---
kernel/rcu/srcutree.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/kernel/rcu/srcutree.c b/kernel/rcu/srcutree.c
index 155c430c6a73..2e7ed67646db 100644
--- a/kernel/rcu/srcutree.c
+++ b/kernel/rcu/srcutree.c
@@ -705,9 +705,15 @@ static void srcu_funnel_gp_start(struct srcu_struct *ssp, struct srcu_data *sdp,
int idx = rcu_seq_ctr(s) % ARRAY_SIZE(sdp->mynode->srcu_have_cbs);
unsigned long sgsne;
struct srcu_node *snp;
- struct srcu_node *snp_leaf = smp_load_acquire(&sdp->mynode);
+ struct srcu_node *snp_leaf;
unsigned long snp_seq;
+ /* Ensure that snp node tree is fully initialized before traversing it */
+ if (smp_load_acquire(&ssp->srcu_size_state) < SRCU_SIZE_WAIT_BARRIER)
+ snp_leaf = NULL;
+ else
+ snp_leaf = sdp->mynode;
+
if (snp_leaf)
/* Each pass through the loop does one level of the srcu_node tree. */
for (snp = snp_leaf; snp != NULL; snp = snp->srcu_parent) {
@@ -889,10 +895,13 @@ static unsigned long srcu_gp_start_if_needed(struct srcu_struct *ssp,
bool needgp = false;
unsigned long s;
struct srcu_data *sdp;
+ struct srcu_node *sdp_mynode;
+ int ss_state;
check_init_srcu_struct(ssp);
idx = srcu_read_lock(ssp);
- if (smp_load_acquire(&ssp->srcu_size_state) < SRCU_SIZE_WAIT_CALL)
+ ss_state = smp_load_acquire(&ssp->srcu_size_state);
+ if (ss_state < SRCU_SIZE_WAIT_CALL)
sdp = per_cpu_ptr(ssp->sda, 0);
else
sdp = raw_cpu_ptr(ssp->sda);
@@ -912,10 +921,17 @@ static unsigned long srcu_gp_start_if_needed(struct srcu_struct *ssp,
needexp = true;
}
spin_unlock_irqrestore_rcu_node(sdp, flags);
+
+ /* Ensure that snp node tree is fully initialized before traversing it */
+ if (ss_state < SRCU_SIZE_WAIT_BARRIER)
+ sdp_mynode = NULL;
+ else
+ sdp_mynode = sdp->mynode;
+
if (needgp)
srcu_funnel_gp_start(ssp, sdp, s, do_norm);
else if (needexp)
- srcu_funnel_exp_start(ssp, smp_load_acquire(&sdp->mynode), s);
+ srcu_funnel_exp_start(ssp, sdp_mynode, s);
srcu_read_unlock(ssp, idx);
return s;
}
--
2.31.1.189.g2e36527f23
next prev parent reply other threads:[~2022-04-19 0:05 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-19 0:03 [PATCH rcu 0/21] SRCU updates for v5.19 Paul E. McKenney
2022-04-19 0:03 ` [PATCH rcu 01/21] srcu: Tighten cleanup_srcu_struct() GP checks Paul E. McKenney
2022-04-19 0:03 ` [PATCH rcu 02/21] srcu: Fix s/is/if/ typo in srcu_node comment Paul E. McKenney
2022-04-19 0:03 ` [PATCH rcu 03/21] srcu: Make srcu_funnel_gp_start() cache ->mynode in snp_leaf Paul E. McKenney
2022-04-19 0:03 ` [PATCH rcu 04/21] srcu: Make Tree SRCU able to operate without snp_node array Paul E. McKenney
2022-04-19 0:03 ` [PATCH rcu 05/21] srcu: Dynamically allocate srcu_node array Paul E. McKenney
2022-04-19 0:03 ` [PATCH rcu 06/21] srcu: Add size-state transitioning code Paul E. McKenney
2022-04-19 0:03 ` [PATCH rcu 07/21] srcu: Make rcutorture dump the SRCU size state Paul E. McKenney
2022-04-19 0:03 ` [PATCH rcu 08/21] srcu: Compute snp_seq earlier in srcu_funnel_gp_start() Paul E. McKenney
2022-04-19 0:03 ` [PATCH rcu 09/21] srcu: Use invalid initial value for srcu_node GP sequence numbers Paul E. McKenney
2022-04-19 0:03 ` Paul E. McKenney [this message]
2022-04-19 0:03 ` [PATCH rcu 11/21] srcu: Add boot-time control over srcu_node array allocation Paul E. McKenney
2022-04-19 0:03 ` [PATCH rcu 12/21] srcu: Use export for srcu_struct defined by DEFINE_STATIC_SRCU() Paul E. McKenney
2022-04-19 0:03 ` [PATCH rcu 13/21] srcu: Avoid NULL dereference in srcu_torture_stats_print() Paul E. McKenney
2022-04-19 0:03 ` [PATCH rcu 14/21] srcu: Prevent cleanup_srcu_struct() from freeing non-dynamic ->sda Paul E. McKenney
2022-04-19 0:03 ` [PATCH rcu 15/21] srcu: Explain srcu_funnel_gp_start() call to list_add() is safe Paul E. McKenney
2022-04-19 0:03 ` [PATCH rcu 16/21] srcu: Create concurrency-safe helper for initiating size transition Paul E. McKenney
2022-04-19 0:03 ` [PATCH rcu 17/21] srcu: Add contention-triggered addition of srcu_node tree Paul E. McKenney
2022-04-19 0:03 ` [PATCH rcu 18/21] srcu: Automatically determine size-transition strategy at boot Paul E. McKenney
2022-04-19 0:03 ` [PATCH rcu 19/21] srcu: Add contention check to call_srcu() srcu_data ->lock acquisition Paul E. McKenney
2022-04-19 0:03 ` [PATCH rcu 20/21] srcu: Prevent expedited GPs and blocking readers from consuming CPU Paul E. McKenney
2022-04-19 0:03 ` [PATCH rcu 21/21] srcu: Drop needless initialization of sdp in srcu_gp_start() 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=20220419000322.3948903-10-paulmck@kernel.org \
--to=paulmck@kernel.org \
--cc=kernel-team@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=quic_neeraju@quicinc.com \
--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®