From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net, paulmck@kernel.org, joel@joelfernandes.org
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
rcu@vger.kernel.org, josh@joshtriplett.org, peterz@infradead.org,
christian.brauner@ubuntu.com, Jakub Kicinski <kuba@kernel.org>,
jiangshanlai@gmail.com, rostedt@goodmis.org,
mathieu.desnoyers@efficios.com
Subject: [PATCH net-next 5/7] srcu: use a more appropriate lockdep helper
Date: Wed, 16 Sep 2020 11:45:26 -0700 [thread overview]
Message-ID: <20200916184528.498184-6-kuba@kernel.org> (raw)
In-Reply-To: <20200916184528.498184-1-kuba@kernel.org>
lockdep_is_held() is defined as:
#define lockdep_is_held(lock) lock_is_held(&(lock)->dep_map)
it hides away the dereference, so that builds with !LOCKDEP
don't break. We should use it instead of using lock_is_held()
directly.
This didn't use to be a problem, because RCU_LOCKDEP_WARN()
cuts the condition out with the preprocessor if !LOCKDEP.
This will soon change.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
--
CC: jiangshanlai@gmail.com
CC: paulmck@kernel.org
CC: josh@joshtriplett.org
CC: rostedt@goodmis.org
CC: mathieu.desnoyers@efficios.com
---
kernel/rcu/srcutree.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/rcu/srcutree.c b/kernel/rcu/srcutree.c
index c100acf332ed..8123ef15a159 100644
--- a/kernel/rcu/srcutree.c
+++ b/kernel/rcu/srcutree.c
@@ -919,7 +919,7 @@ static void __synchronize_srcu(struct srcu_struct *ssp, bool do_norm)
{
struct rcu_synchronize rcu;
- RCU_LOCKDEP_WARN(lock_is_held(&ssp->dep_map) ||
+ RCU_LOCKDEP_WARN(lockdep_is_held(ssp) ||
lock_is_held(&rcu_bh_lock_map) ||
lock_is_held(&rcu_lock_map) ||
lock_is_held(&rcu_sched_lock_map),
--
2.26.2
next prev parent reply other threads:[~2020-09-16 18:46 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-16 18:45 [PATCH net-next 0/7] rcu: prevent RCU_LOCKDEP_WARN() from swallowing the condition Jakub Kicinski
2020-09-16 18:45 ` [PATCH net-next 1/7] sched: un-hide lockdep_tasklist_lock_is_held() for !LOCKDEP Jakub Kicinski
2020-09-16 18:45 ` [PATCH net-next 2/7] rcu: un-hide lockdep maps " Jakub Kicinski
2020-09-16 18:45 ` [PATCH net-next 3/7] net: un-hide lockdep_sock_is_held() " Jakub Kicinski
2020-09-16 18:45 ` [PATCH net-next 4/7] net: sched: remove broken definitions and un-hide " Jakub Kicinski
2020-09-16 18:45 ` Jakub Kicinski [this message]
2020-09-16 18:45 ` [PATCH net-next 6/7] lockdep: provide dummy forward declaration of *_is_held() helpers Jakub Kicinski
2020-09-17 15:14 ` peterz
2020-09-16 18:45 ` [PATCH net-next 7/7] rcu: prevent RCU_LOCKDEP_WARN() from swallowing the condition Jakub Kicinski
2020-09-16 23:15 ` [PATCH net-next 0/7] " Paul E. McKenney
2020-09-17 0:48 ` Jakub Kicinski
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=20200916184528.498184-6-kuba@kernel.org \
--to=kuba@kernel.org \
--cc=christian.brauner@ubuntu.com \
--cc=davem@davemloft.net \
--cc=jiangshanlai@gmail.com \
--cc=joel@joelfernandes.org \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=netdev@vger.kernel.org \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.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