workqueue: Add RCU annotation for pwq list walk
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>
Fri, 15 Nov 2019 18:01:25 +0000 (19:01 +0100)
committerTejun Heo <tj@kernel.org>
Fri, 15 Nov 2019 19:53:35 +0000 (11:53 -0800)
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: 28875945ba98d ("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>
kernel/workqueue.c

index 4dc8270326d79900d38648340dfa8062cd490287..914b845ad4ff10e2d89ba34db43ed68d1d2367d2 100644 (file)
@@ -426,7 +426,8 @@ static void show_pwq(struct pool_workqueue *pwq);
  * ignored.
  */
 #define for_each_pwq(pwq, wq)                                          \
-       list_for_each_entry_rcu((pwq), &(wq)->pwqs, pwqs_node)          \
+       list_for_each_entry_rcu((pwq), &(wq)->pwqs, pwqs_node,          \
+                               lockdep_is_held(&wq->mutex))            \
                if (({ assert_rcu_or_wq_mutex(wq); false; })) { }       \
                else