Re: Wireless regression in workqueue: use mod_delayed_work() instead of __cancel + queue
From: Tejun Heo <tj@kernel.org>
Date: 2012-12-01 14:39:33
Also in:
linux-wireless, lkml
Subsystem:
the rest, workqueue · Maintainers:
Linus Torvalds, Tejun Heo
Hey, Anders. On Fri, Nov 30, 2012 at 11:15:50PM -0500, Anders Kaseorg wrote:
Yes. I tested that both directly on top of the bad commit, and on v3.7-rc7, and it fixes the bug in both cases.
Can you please test this one too? Thanks!
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 042d221..94964d1 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c@@ -1364,6 +1364,11 @@ static void __queue_delayed_work(int cpu, struct workqueue_struct *wq, BUG_ON(timer_pending(timer)); BUG_ON(!list_empty(&work->entry)); + if (!delay) { + __queue_work(cpu, wq, &dwork->work); + return; + } + timer_stats_timer_set_start_info(&dwork->timer); /*
@@ -1417,9 +1422,6 @@ bool queue_delayed_work_on(int cpu, struct workqueue_struct *wq, bool ret = false; unsigned long flags; - if (!delay) - return queue_work_on(cpu, wq, &dwork->work); - /* read the comment in __queue_work() */ local_irq_save(flags);