Skip to content

Commit 49e9d1a

Browse files
Sebastian Andrzej Siewiorhtejun
authored andcommitted
workqueue: Add RCU annotation for pwq list walk
An additional check has been recently added to ensure that a RCU related lock is held while the RCU list is iterated. The `pwqs' are sometimes iterated without a RCU lock but with the &wq->mutex acquired leading to a warning. Teach list_for_each_entry_rcu() that the RCU usage is okay if &wq->mutex is acquired during the list traversal. Fixes: 2887594 ("rcu: Add support for consolidated-RCU reader checking") Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Tejun Heo <tj@kernel.org>
1 parent e66b39a commit 49e9d1a

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

kernel/workqueue.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,8 @@ static void show_pwq(struct pool_workqueue *pwq);
426426
* ignored.
427427
*/
428428
#define for_each_pwq(pwq, wq) \
429-
list_for_each_entry_rcu((pwq), &(wq)->pwqs, pwqs_node) \
429+
list_for_each_entry_rcu((pwq), &(wq)->pwqs, pwqs_node, \
430+
lockdep_is_held(&wq->mutex)) \
430431
if (({ assert_rcu_or_wq_mutex(wq); false; })) { } \
431432
else
432433

0 commit comments

Comments
 (0)