Commit 24ef659a authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcu: Provide better diagnostics for blocking in RCU callback functions 



Currently blocking in an RCU callback function will result in
"scheduling while atomic", which could be triggered for any number
of reasons.  To aid debugging, this patch introduces a rcu_callback_map
that is used to tie the inappropriate voluntary context switch back
to the fact that the function is being invoked from within a callback.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
parent bc72d962

include/linux/rcupdate.h

+1 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ static inline void rcu_lock_release(struct lockdep_map *map) 
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;

extern int debug_lockdep_rcu_enabled(void);



/**

kernel/rcu/rcu.h

+3 −0
Original line number Diff line number Diff line
@@ -102,13 +102,16 @@ static inline bool __rcu_reclaim(const char *rn, struct rcu_head *head) 
{

	unsigned long offset = (unsigned long)head->func;



	rcu_lock_acquire(&rcu_callback_map);

	if (__is_kfree_rcu_offset(offset)) {

		RCU_TRACE(trace_rcu_invoke_kfree_callback(rn, head, offset));

		kfree((void *)head - offset);

		rcu_lock_release(&rcu_callback_map);

		return 1;

	} else {

		RCU_TRACE(trace_rcu_invoke_callback(rn, head));

		head->func(head);

		rcu_lock_release(&rcu_callback_map);

		return 0;

	}

}

kernel/rcu/update.c

+5 −0
Original line number Diff line number Diff line
@@ -128,6 +128,11 @@ struct lockdep_map rcu_sched_lock_map = 
	STATIC_LOCKDEP_MAP_INIT("rcu_read_lock_sched", &rcu_sched_lock_key);

EXPORT_SYMBOL_GPL(rcu_sched_lock_map);



static struct lock_class_key rcu_callback_key;

struct lockdep_map rcu_callback_map =

	STATIC_LOCKDEP_MAP_INIT("rcu_callback", &rcu_callback_key);

EXPORT_SYMBOL_GPL(rcu_callback_map);



int notrace debug_lockdep_rcu_enabled(void)

{

	return rcu_scheduler_active && debug_locks &&