Commit d355001f authored by Tejun Heo's avatar Tejun Heo
Browse files

workqueue: Use rcu_read_lock_any_held() instead of rcu_read_lock_held() 



The different flavors of RCU read critical sections have been unified. Let's
update the locking assertion macros accordingly to avoid requiring
unnecessary explicit rcu_read_[un]lock() calls.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Reviewed-by: default avatarLai Jiangshan <jiangshanlai@gmail.com>
parent c7a40c49

kernel/workqueue.c

+2 −2
Original line number Diff line number Diff line
@@ -515,12 +515,12 @@ static void show_one_worker_pool(struct worker_pool *pool); 
#include <trace/events/workqueue.h>



#define assert_rcu_or_pool_mutex()					\

	RCU_LOCKDEP_WARN(!rcu_read_lock_held() &&			\

	RCU_LOCKDEP_WARN(!rcu_read_lock_any_held() &&			\

			 !lockdep_is_held(&wq_pool_mutex),		\

			 "RCU or wq_pool_mutex should be held")



#define assert_rcu_or_wq_mutex_or_pool_mutex(wq)			\

	RCU_LOCKDEP_WARN(!rcu_read_lock_held() &&			\

	RCU_LOCKDEP_WARN(!rcu_read_lock_any_held() &&			\

			 !lockdep_is_held(&wq->mutex) &&		\

			 !lockdep_is_held(&wq_pool_mutex),		\

			 "RCU, wq->mutex or wq_pool_mutex should be held")