[PATCH] workqueue: fix spurious CPU locality WARN from process_one_work()

From: Tejun Heo <tj@kernel.org>
To: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org,
	peterz@infradead.org, tglx@linutronix.de,
	linux-pm@vger.kernel.org, stable@vger.kernel.org
Subject: [PATCH] workqueue: fix spurious CPU locality WARN from process_one_work()
Date: Sun, 22 Jul 2012 09:43:27 -0700	[thread overview]
Message-ID: <20120722164327.GA5144@dhcp-172-17-108-109.mtv.corp.google.com> (raw)
In-Reply-To: <20120721213656.GA7783@linux.vnet.ibm.com>

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.

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>
---
This should fix it.  Will queue it on wq/for-3.6.

Thanks!

 kernel/workqueue.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -1949,7 +1949,13 @@ __acquires(&gcwq->lock)
 
 	lockdep_copy_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);
 
 	/*
