rcu: Force inlining of rcu_read_lock()
PATCH 1/1 rcu: Force inlining of rcu_read_lock()
It is found that when debugging options are turned on, the rcu_read_lock() function may not be inlined at all. That will make it harder to debug RCU related problem as the print_lock() function in lockdep will print "rcu_read_lock()" instead of the caller of rcu_read_lock() function. For example,
[ 10.579995] =============================
[ 10.584033] WARNING: suspicious RCU usage
[ 10.588074] 4.18.0.memcg_v2+ #1 Not tainted
[ 10.593162] -----------------------------
[ 10.597203] include/linux/rcupdate.h:281 Illegal context switch in
RCU read-side critical section!
[ 10.606220]
[ 10.606220] other info that might help us debug this:
[ 10.606220]
[ 10.614280]
[ 10.614280] rcu_scheduler_active = 2, debug_locks = 1
[ 10.620853] 3 locks held by systemd/1:
[ 10.624632] #0: (____ptrval____) (&type->i_mutex_dir_key#5){.+.+}, at: lookup_slow+0x42/0x70
[ 10.633232] #1: (____ptrval____) (rcu_read_lock){....}, at: rcu_read_lock+0x0/0x70
[ 10.640954] #2: (____ptrval____) (rcu_read_lock){....}, at: rcu_read_lock+0x0/0x70To make sure that the proper caller of rcu_read_lock() is shown, we have to force the inlining of the rcu_read_lock() function.
--- include/linux/rcupdate.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/rcupdate.h +1 -1
@@ -588,7 +588,7 @@ static inline void rcu_preempt_sleep_check(void) { }* read-side critical sections may be preempted and they may also block, but * only when acquiring spinlocks that are subject to priority inheritance. */ -static inline void rcu_read_lock (void ) +static __always_inline void rcu_read_lock(void) {__rcu_read_lock ();__acquire (RCU );
Signature · 1 line
2.18.1
Quoted 22 lines · Waiman Long
It is found that when debugging options are turned on, the
rcu_read_lock()function may not be inlined at all. That will make it harder to debug RCU related problem as theprint_lock()function in lockdep will print "rcu_read_lock()" instead of the caller ofrcu_read_lock()function. For example,[ 10.579995] ============================= [ 10.584033] WARNING: suspicious RCU usage [ 10.588074] 4.18.0.memcg_v2+ #1 Not tainted [ 10.593162] ----------------------------- [ 10.597203] include/linux/rcupdate.h:281 Illegal context switch in RCU read-side critical section! [ 10.606220] [ 10.606220] other info that might help us debug this: [ 10.606220] [ 10.614280] [ 10.614280] rcu_scheduler_active = 2, debug_locks = 1 [ 10.620853] 3 locks held by systemd/1: [ 10.624632] #0: (____ptrval____) (&type->i_mutex_dir_key#5){.+.+}, at: lookup_slow+0x42/0x70 [ 10.633232] #1: (____ptrval____) (rcu_read_lock){....}, at: rcu_read_lock+0x0/0x70 [ 10.640954] #2: (____ptrval____) (rcu_read_lock){....}, at: rcu_read_lock+0x0/0x70
Quoted 4 lines
To make sure that the proper caller of
rcu_read_lock()is shown, we have to force the inlining of thercu_read_lock()function.Signed-off-by Waiman Long <[email protected]>
Good point, queued! I reworked the commit log as follows, is this OK?
Thanx, Paul
------------------------------------------------------------------------
commit c006ffd7b607f8ee216f6a7a6d845b9514881e92
Author: Waiman Long <[email protected]> Date: Tue May 21 16:48:43 2019 -0400
rcu: Force inlining of rcu_read_lock()
When debugging options are turned on, the rcu_read_lock() function
might not be inlined. This results in lockdep's print_lock() function
printing "rcu_read_lock+0x0/0x70" instead of rcu_read_lock()'s caller.
For example:
[ 10.579995] =============================
[ 10.584033] WARNING: suspicious RCU usage
[ 10.588074] 4.18.0.memcg_v2+ #1 Not tainted
[ 10.593162] -----------------------------
[ 10.597203] include/linux/rcupdate.h:281 Illegal context switch in
RCU read-side critical section!
[ 10.606220]
[ 10.606220] other info that might help us debug this:
[ 10.606220]
[ 10.614280]
[ 10.614280] rcu_scheduler_active = 2, debug_locks = 1
[ 10.620853] 3 locks held by systemd/1:
[ 10.624632] #0: (____ptrval____) (&type->i_mutex_dir_key#5){.+.+}, at: lookup_slow+0x42/0x70
[ 10.633232] #1: (____ptrval____) (rcu_read_lock){....}, at: rcu_read_lock+0x0/0x70
[ 10.640954] #2: (____ptrval____) (rcu_read_lock){....}, at: rcu_read_lock+0x0/0x70
These "rcu_read_lock+0x0/0x70" strings are not providing any useful
information. This commit therefore forces inlining of the rcu_read_lock()
function so that rcu_read_lock()'s caller is instead shown.
Signed-off-by: Waiman Long <[email protected]>
Signed-off-by: Paul E. McKenney <[email protected]>include/linux/rcupdate.h +1 -1
@@ -588,7 +588,7 @@ static inline void rcu_preempt_sleep_check(void) { }* read-side critical sections may be preempted and they may also block, but * only when acquiring spinlocks that are subject to priority inheritance. */ -static inline void rcu_read_lock (void ) +static __always_inline void rcu_read_lock(void) {__rcu_read_lock ();__acquire (RCU );
Quoted 55 lines · Paul E. McKenney
Quoted 22 lines · Waiman Long
It is found that when debugging options are turned on, the
rcu_read_lock()function may not be inlined at all. That will make it harder to debug RCU related problem as theprint_lock()function in lockdep will print "rcu_read_lock()" instead of the caller ofrcu_read_lock()function. For example,[ 10.579995] ============================= [ 10.584033] WARNING: suspicious RCU usage [ 10.588074] 4.18.0.memcg_v2+ #1 Not tainted [ 10.593162] ----------------------------- [ 10.597203] include/linux/rcupdate.h:281 Illegal context switch in RCU read-side critical section! [ 10.606220] [ 10.606220] other info that might help us debug this: [ 10.606220] [ 10.614280] [ 10.614280] rcu_scheduler_active = 2, debug_locks = 1 [ 10.620853] 3 locks held by systemd/1: [ 10.624632] #0: (____ptrval____) (&type->i_mutex_dir_key#5){.+.+}, at: lookup_slow+0x42/0x70 [ 10.633232] #1: (____ptrval____) (rcu_read_lock){....}, at: rcu_read_lock+0x0/0x70 [ 10.640954] #2: (____ptrval____) (rcu_read_lock){....}, at: rcu_read_lock+0x0/0x70Quoted 4 lines
To make sure that the proper caller of
rcu_read_lock()is shown, we have to force the inlining of thercu_read_lock()function.Signed-off-by Waiman Long <[email protected]>Good point, queued! I reworked the commit log as follows, is this OK?
Thanx, Paul
------------------------------------------------------------------------
commit
c006ffd7b607f8ee216f6a7a6d845b9514881e92Author: Waiman Long <[email protected]> Date: Tue May 21 16:48:43 2019 -0400rcu: Force inlining of rcu_read_lock() When debugging options are turned on, the rcu_read_lock() function might not be inlined. This results in lockdep's print_lock() function printing "rcu_read_lock+0x0/0x70" instead of rcu_read_lock()'s caller. For example: [ 10.579995] ============================= [ 10.584033] WARNING: suspicious RCU usage [ 10.588074] 4.18.0.memcg_v2+ #1 Not tainted [ 10.593162] ----------------------------- [ 10.597203] include/linux/rcupdate.h:281 Illegal context switch in RCU read-side critical section! [ 10.606220] [ 10.606220] other info that might help us debug this: [ 10.606220] [ 10.614280] [ 10.614280] rcu_scheduler_active = 2, debug_locks = 1
Quoted 9 lines
[ 10.620853] 3 locks held by systemd/1:
[ 10.624632] #0: (____ptrval____) (&type->i_mutex_dir_key#5){.+.+}, at: lookup_slow+0x42/0x70
[ 10.633232] #1: (____ptrval____) (rcu_read_lock){....}, at: rcu_read_lock+0x0/0x70
[ 10.640954] #2: (____ptrval____) (rcu_read_lock){....}, at: rcu_read_lock+0x0/0x70
These "rcu_read_lock+0x0/0x70" strings are not providing any useful
information. This commit therefore forces inlining of the rcu_read_lock()
function so that rcu_read_lock()'s caller is instead shown.Your modification make sense to me.
Thanks,
Longman
Quoted 17 lines
Signed-off-by Waiman Long <[email protected]>Signed-off-by Paul E. McKenney <[email protected]>include/linux/rcupdate.h +1
-1@@ -588,7 +588,7 @@ static inline void rcu_preempt_sleep_check(void) { }* read-side critical sections may be preempted and they may also block, but * only when acquiring spinlocks that are subject to priority inheritance. */ -static inline void rcu_read_lock (void ) +static __always_inline void rcu_read_lock(void) {__rcu_read_lock ();__acquire (RCU );