diff options
| author | Tejun Heo <tj@kernel.org> | 2012-07-22 10:16:34 -0700 |
|---|---|---|
| committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2013-05-08 23:36:04 -0700 |
| commit | 411c7d962b5cfc99e7c1e701e5f5cfca6c9d2334 (patch) | |
| tree | 89ed28131be8aca09dd8d33021bd915583112546 /kernel | |
| parent | d9361d270b87089b35e01721968d77fdf4fa6359 (diff) | |
workqueue: fix spurious CPU locality WARN from process_one_work()
25511a4776 "workqueue: reimplement CPU online rebinding to handle idle
workers" added CPU locality sanity check in process_one_work(). It
triggers if a worker is executing on a different CPU without UNBOUND
or REBIND set.
This works for all normal workers but rescuers can trigger this
spuriously when they're serving the unbound or a disassociated
global_cwq - rescuers don't have either flag set and thus its
gcwq->cpu can be a different value including %WORK_CPU_UNBOUND.
Fix it by additionally testing %GCWQ_DISASSOCIATED.
bug 1237774
Change-Id: I7ac841fb02f97c354f096df1715669acca0265b5
Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
LKML-Refence: <20120721213656.GA7783@linux.vnet.ibm.com>
Signed-off-by: Bo Yan <byan@nvidia.com>
Reviewed-on: http://git-master/r/226758
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/workqueue.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index c1e3432cacae..ca02bb53835c 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1946,7 +1946,13 @@ __acquires(&gcwq->lock) */ struct lockdep_map lockdep_map = work->lockdep_map; #endif + /* + * Ensure we're on the correct CPU. DISASSOCIATED test is + * necessary to avoid spurious warnings from rescuers servicing the + * unbound or a disassociated gcwq. + */ WARN_ON_ONCE(!(worker->flags & (WORKER_UNBOUND | WORKER_REBIND)) && + !(gcwq->flags & GCWQ_DISASSOCIATED) && raw_smp_processor_id() != gcwq->cpu); /* |