Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

rcu: Fix hlist_bl_set_first_rcu() annotation

Abhi noticed that we were getting a complaint from the RCU subsystem
about access of an RCU protected list under the write side bit lock.
This commit adds additional annotation to check both the RCU read
lock and the write side bit lock before printing a message.

Reported by: Abhijith Das <adas@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Tested-by: Abhijith Das <adas@redhat.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>

authored by

Steven Whitehouse and committed by
Paul E. McKenney
49d0de08 6f0a6ad2

+6 -1
+5
include/linux/list_bl.h
··· 125 125 __bit_spin_unlock(0, (unsigned long *)b); 126 126 } 127 127 128 + static inline bool hlist_bl_is_locked(struct hlist_bl_head *b) 129 + { 130 + return bit_spin_is_locked(0, (unsigned long *)b); 131 + } 132 + 128 133 /** 129 134 * hlist_bl_for_each_entry - iterate over list of given type 130 135 * @tpos: the type * to use as a loop cursor.
+1 -1
include/linux/rculist_bl.h
··· 20 20 static inline struct hlist_bl_node *hlist_bl_first_rcu(struct hlist_bl_head *h) 21 21 { 22 22 return (struct hlist_bl_node *) 23 - ((unsigned long)rcu_dereference(h->first) & ~LIST_BL_LOCKMASK); 23 + ((unsigned long)rcu_dereference_check(h->first, hlist_bl_is_locked(h)) & ~LIST_BL_LOCKMASK); 24 24 } 25 25 26 26 /**