Re: Wireless regression in workqueue: use mod_delayed_work() instead of __cancel + queue
From: Anders Kaseorg <hidden>
Date: 2012-12-01 04:15:58
Also in:
lkml, netdev
On Fri, 30 Nov 2012, Tejun Heo wrote:
quoted hunk ↗ jump to hunk
Hey, again. Can you please test whether the following patch makes any difference? Thanks!diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 042d221..26368ef 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c@@ -1477,7 +1477,10 @@ bool mod_delayed_work_on(int cpu, struct workqueue_struct *wq, } while (unlikely(ret == -EAGAIN)); if (likely(ret >= 0)) { - __queue_delayed_work(cpu, wq, dwork, delay); + if (!delay) + __queue_work(cpu, wq, &dwork->work); + else + __queue_delayed_work(cpu, wq, dwork, delay); local_irq_restore(flags); }
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. Thanks, Anders