Commit cd539cff authored Sep 16, 2020 by Jakub Kicinski Committed by Paul E. McKenney Nov 02, 2020

lockdep: Provide dummy forward declaration of *_is_held() helpers



When CONFIG_LOCKDEP is not set, lock_is_held() and lockdep_is_held()
are not declared or defined.  This forces all callers to use #ifdefs
around these checks.

Recent RCU changes added a lot of lockdep_is_held() calls inside
rcu_dereference_protected().  This macro hides its argument on !LOCKDEP
builds, which can lead to false-positive unused-variable warnings.

This commit therefore provides forward declarations of lock_is_held()
and lockdep_is_held() but without defining them.  This way callers
(including those internal to RCU) can keep them visible to the compiler
on !LOCKDEP builds and instead depend on dead code elimination to remove
the references, which in turn prevents the linker from complaining about
the lack of the corresponding function definitions.

[ paulmck: Apply Peter Zijlstra feedback on "extern". ]
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
--
CC: peterz@infradead.org
CC: mingo@redhat.com
CC: will@kernel.org
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>

parent f505d434

include/linux/lockdep.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -375,6 +375,12 @@ static inline void lockdep_unregister_key(struct lock_class_key *key)

		#define lockdep_depth(tsk) (0)

		/*
		* Dummy forward declarations, allow users to write less ifdef-y code
		* and depend on dead code elimination.
		*/
		extern int lock_is_held(const void *);
		extern int lockdep_is_held(const void *);
		#define lockdep_is_held_type(l, r) (1)

		#define lockdep_assert_held(l) do { (void)(l); } while (0)

Admin message