Commit-ID: 789cbbeca4eb7141cbd748ee93772471101b507b Gitweb: http://git.kernel.org/tip/789cbbeca4eb7141cbd748ee93772471101b507b Author: Joe Lawrence <[email protected]> AuthorDate: Sun, 5 Oct 2014 13:24:21 -0400 Committer: Paul E. McKenney <[email protected]> CommitDate: Mon, 6 Oct 2014 05:57:43 -0700
workqueue: Add quiescent state between work items Similar to the stop_machine deadlock scenario on !PREEMPT kernels addressed in b22ce2785d97 "workqueue: cond_resched() after processing each work item", kworker threads requeueing back-to-back with zero jiffy delay can stall RCU. The cond_resched call introduced in that fix will yield only iff there are other higher priority tasks to run, so force a quiescent RCU state between work items. Signed-off-by: Joe Lawrence <[email protected]> Link: https://lkml.kernel.org/r/[email protected] Link: https://lkml.kernel.org/r/[email protected] Fixes: b22ce2785d97 ("workqueue: cond_resched() after processing each work item") Cc: <[email protected]> Acked-by: Tejun Heo <[email protected]> Signed-off-by: Paul E. McKenney <[email protected]> --- kernel/workqueue.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 5dbe22a..345bec9 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -2043,8 +2043,10 @@ __acquires(&pool->lock) * kernels, where a requeueing work item waiting for something to * happen could deadlock with stop_machine as such work item could * indefinitely requeue itself while all other CPUs are trapped in - * stop_machine. + * stop_machine. At the same time, report a quiescent RCU state so + * the same condition doesn't freeze RCU. */ + rcu_note_voluntary_context_switch(current); cond_resched(); spin_lock_irq(&pool->lock); -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
