Commit 891cd1f9 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Paul E. McKenney
Browse files

rcu: Un-hide lockdep maps for !LOCKDEP 



Currently, variables used only within lockdep expressions are flagged as
unused, requiring that these variables' declarations be decorated with
either #ifdef or __maybe_unused.  This results in ugly code.  This commit
therefore causes the RCU lock maps to be visible even when lockdep is not
enabled, thus removing the need for these decorations.  This approach
further relies on dead-code elimination to remove any references to
functions or variables that are not available in non-lockdep kernels.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 9f14cb03

include/linux/rcupdate.h

+5 −4
Original line number Diff line number Diff line
@@ -241,6 +241,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)
@@ -253,10 +258,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);

include/linux/rcupdate_trace.h

+2 −2
Original line number Diff line number Diff line
@@ -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);