From: "Joel Fernandes (Google)" <joel@joelfernandes.org>
To: linux-kernel@vger.kernel.org
Cc: "Joel Fernandes (Google)" <joel@joelfernandes.org>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
Josh Triplett <josh@joshtriplett.org>,
Steven Rostedt <rostedt@goodmis.org>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Lai Jiangshan <jiangshanlai@gmail.com>,
byungchul.park@lge.com, kernel-team@android.com
Subject: [PATCH RFC 5/8] rcu: Use rcu_node as temporary variable in funnel locking loop
Date: Sun, 13 May 2018 20:15:38 -0700 [thread overview]
Message-ID: <20180514031541.67247-6-joel@joelfernandes.org> (raw)
In-Reply-To: <20180514031541.67247-1-joel@joelfernandes.org>
The funnel locking loop in rcu_start_this_gp uses rcu_root as a
temporary variable while walking the combining tree. This causes a
tiresome exercise of a code reader reminding themselves that rcu_root
may not be root. Lets just call it rcu_node, and then finally when
rcu_node is the rcu_root, lets assign it at that time.
Just a clean up patch, no logical change.
Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org>
---
kernel/rcu/tree.c | 34 ++++++++++++++++++----------------
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index 9f5679ba413b..40670047d22c 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -1568,7 +1568,7 @@ static bool rcu_start_this_gp(struct rcu_node *rnp, struct rcu_data *rdp,
{
bool ret = false;
struct rcu_state *rsp = rdp->rsp;
- struct rcu_node *rnp_root;
+ struct rcu_node *rnp_node, *rnp_root = NULL;
/*
* Use funnel locking to either acquire the root rcu_node
@@ -1581,24 +1581,26 @@ static bool rcu_start_this_gp(struct rcu_node *rnp, struct rcu_data *rdp,
*/
raw_lockdep_assert_held_rcu_node(rnp);
trace_rcu_this_gp(rnp, rdp, gp_seq_start, TPS("Startleaf"));
- for (rnp_root = rnp; 1; rnp_root = rnp_root->parent) {
- if (rnp_root != rnp)
- raw_spin_lock_rcu_node(rnp_root);
- if (ULONG_CMP_GE(rnp_root->gp_seq_needed, gp_seq_start) ||
- rcu_seq_done(&rnp_root->gp_seq, gp_seq_start) ||
- (rnp != rnp_root &&
- rcu_seq_state(rcu_seq_current(&rnp_root->gp_seq)))) {
- trace_rcu_this_gp(rnp_root, rdp, gp_seq_start,
+ for (rnp_node = rnp; 1; rnp_node = rnp_node->parent) {
+ if (rnp_node != rnp)
+ raw_spin_lock_rcu_node(rnp_node);
+ if (ULONG_CMP_GE(rnp_node->gp_seq_needed, gp_seq_start) ||
+ rcu_seq_done(&rnp_node->gp_seq, gp_seq_start) ||
+ (rnp != rnp_node &&
+ rcu_seq_state(rcu_seq_current(&rnp_node->gp_seq)))) {
+ trace_rcu_this_gp(rnp_node, rdp, gp_seq_start,
TPS("Prestarted"));
goto unlock_out;
}
- rnp_root->gp_seq_needed = gp_seq_start;
+ rnp_node->gp_seq_needed = gp_seq_start;
if (rcu_seq_state(rcu_seq_current(&rnp->gp_seq)))
goto unlock_out;
- if (rnp_root != rnp && rnp_root->parent != NULL)
- raw_spin_unlock_rcu_node(rnp_root);
- if (!rnp_root->parent)
+ if (rnp_node != rnp && rnp_node->parent != NULL)
+ raw_spin_unlock_rcu_node(rnp_node);
+ if (!rnp_node->parent) {
+ rnp_root = rnp_node;
break; /* At root, and perhaps also leaf. */
+ }
}
/* If GP already in progress, just leave, otherwise start one. */
@@ -1616,10 +1618,10 @@ static bool rcu_start_this_gp(struct rcu_node *rnp, struct rcu_data *rdp,
trace_rcu_grace_period(rsp->name, READ_ONCE(rsp->gp_seq), TPS("newreq"));
ret = true; /* Caller must wake GP kthread. */
unlock_out:
- if (rnp != rnp_root)
- raw_spin_unlock_rcu_node(rnp_root);
+ if (rnp != rnp_node)
+ raw_spin_unlock_rcu_node(rnp_node);
/* Push furthest requested GP to leaf node and rcu_data structure. */
- if (ULONG_CMP_GE(rnp_root->gp_seq_needed, gp_seq_start)) {
+ if (ULONG_CMP_GE(rnp_node->gp_seq_needed, gp_seq_start)) {
rnp->gp_seq_needed = gp_seq_start;
rdp->gp_seq_needed = gp_seq_start;
}
--
2.17.0.441.gb46fe60e1d-goog
next prev parent reply other threads:[~2018-05-14 3:16 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-14 3:15 [PATCH RFC 0/8] rcu fixes, clean ups for rcu/dev Joel Fernandes (Google)
2018-05-14 3:15 ` [PATCH RFC 1/8] rcu: Add comment documenting how rcu_seq_snap works Joel Fernandes (Google)
2018-05-14 3:47 ` Randy Dunlap
2018-05-14 5:05 ` Joel Fernandes
2018-05-14 17:38 ` Paul E. McKenney
2018-05-15 1:51 ` Joel Fernandes
2018-05-15 3:59 ` Paul E. McKenney
2018-05-15 7:02 ` Joel Fernandes
2018-05-15 12:55 ` Paul E. McKenney
2018-05-15 18:41 ` Joel Fernandes
2018-05-15 19:08 ` Paul E. McKenney
2018-05-15 22:55 ` Joel Fernandes
2018-05-16 15:45 ` Paul E. McKenney
2018-05-16 23:21 ` Joel Fernandes
2018-05-14 3:15 ` [PATCH RFC 2/8] rcu: Clarify usage of cond_resched for tasks-RCU Joel Fernandes (Google)
2018-05-14 14:54 ` Steven Rostedt
2018-05-14 17:22 ` Paul E. McKenney
2018-05-15 0:35 ` Joel Fernandes
2018-05-15 3:42 ` Paul E. McKenney
2018-05-14 3:15 ` [PATCH RFC 3/8] rcu: Add back the cpuend tracepoint Joel Fernandes (Google)
2018-05-14 18:12 ` Paul E. McKenney
2018-05-15 0:43 ` Joel Fernandes
2018-05-14 3:15 ` [PATCH RFC 4/8] rcu: Get rid of old c variable from places in tree RCU Joel Fernandes (Google)
2018-05-14 17:57 ` Paul E. McKenney
2018-05-15 0:41 ` Joel Fernandes
2018-05-14 3:15 ` Joel Fernandes (Google) [this message]
2018-05-14 18:00 ` [PATCH RFC 5/8] rcu: Use rcu_node as temporary variable in funnel locking loop Paul E. McKenney
2018-05-15 0:43 ` Joel Fernandes
2018-05-14 3:15 ` [PATCH RFC 6/8] rcu: Add back the Startedleaf tracepoint Joel Fernandes (Google)
2018-05-14 18:38 ` Paul E. McKenney
2018-05-15 0:57 ` Joel Fernandes
2018-05-15 3:46 ` Paul E. McKenney
2018-05-15 23:04 ` Joel Fernandes
2018-05-16 15:48 ` Paul E. McKenney
2018-05-16 23:13 ` Joel Fernandes
2018-05-14 3:15 ` [PATCH RFC 7/8] rcu: trace CleanupMore condition only if needed Joel Fernandes (Google)
2018-05-14 19:20 ` Paul E. McKenney
2018-05-15 1:01 ` Joel Fernandes
2018-05-15 3:47 ` Paul E. McKenney
2018-05-14 3:15 ` [PATCH RFC 8/8] rcu: Fix cpustart tracepoint gp_seq number Joel Fernandes (Google)
2018-05-14 20:33 ` Paul E. McKenney
2018-05-15 1:02 ` Joel Fernandes
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=20180514031541.67247-6-joel@joelfernandes.org \
--to=joel@joelfernandes.org \
--cc=byungchul.park@lge.com \
--cc=jiangshanlai@gmail.com \
--cc=josh@joshtriplett.org \
--cc=kernel-team@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=paulmck@linux.vnet.ibm.com \
--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;
as well as URLs for NNTP newsgroup(s).