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>,
rostedt@goodmis.org, mathieu.desnoyers@efficios.com,
jiangshanlai@gmail.com
Subject: [PATCH net-next 2/7] rcu: un-hide lockdep maps for !LOCKDEP
Date: Wed, 16 Sep 2020 11:45:23 -0700 [thread overview]
Message-ID: <20200916184528.498184-3-kuba@kernel.org> (raw)
In-Reply-To: <20200916184528.498184-1-kuba@kernel.org>
We're trying to make LOCKDEP-related forward declarations
visible to the compiler and depend on dead code elimination
to remove them.
Expose RCU lock maps.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
CC: paulmck@kernel.org
CC: josh@joshtriplett.org
CC: rostedt@goodmis.org
CC: mathieu.desnoyers@efficios.com
CC: joel@joelfernandes.org
CC: jiangshanlai@gmail.com
---
include/linux/rcupdate.h | 9 +++++----
include/linux/rcupdate_trace.h | 4 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index d15d46db61f7..53f9648cb982 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -234,6 +234,11 @@ bool rcu_lockdep_current_cpu_online(void);
static inline bool rcu_lockdep_current_cpu_online(void) { return true; }
#endif /* #else #if defined(CONFIG_HOTPLUG_CPU) && defined(CONFIG_PROVE_RCU) */
+extern struct lockdep_map rcu_lock_map;
+extern struct lockdep_map rcu_bh_lock_map;
+extern struct lockdep_map rcu_sched_lock_map;
+extern struct lockdep_map rcu_callback_map;
+
#ifdef CONFIG_DEBUG_LOCK_ALLOC
static inline void rcu_lock_acquire(struct lockdep_map *map)
@@ -246,10 +251,6 @@ static inline void rcu_lock_release(struct lockdep_map *map)
lock_release(map, _THIS_IP_);
}
-extern struct lockdep_map rcu_lock_map;
-extern struct lockdep_map rcu_bh_lock_map;
-extern struct lockdep_map rcu_sched_lock_map;
-extern struct lockdep_map rcu_callback_map;
int debug_lockdep_rcu_enabled(void);
int rcu_read_lock_held(void);
int rcu_read_lock_bh_held(void);
diff --git a/include/linux/rcupdate_trace.h b/include/linux/rcupdate_trace.h
index aaaac8ac927c..25cdef506cae 100644
--- a/include/linux/rcupdate_trace.h
+++ b/include/linux/rcupdate_trace.h
@@ -11,10 +11,10 @@
#include <linux/sched.h>
#include <linux/rcupdate.h>
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-
extern struct lockdep_map rcu_trace_lock_map;
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+
static inline int rcu_read_lock_trace_held(void)
{
return lock_is_held(&rcu_trace_lock_map);
--
2.26.2
next prev parent reply other threads:[~2020-09-16 18:48 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 ` Jakub Kicinski [this message]
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 ` [PATCH net-next 5/7] srcu: use a more appropriate lockdep helper Jakub Kicinski
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-3-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