[GIT PULL] more workqueue fixes for v3.10-rc1

[GIT PULL] more workqueue fixes for v3.10-rc1

[Tejun Heo]

Hello, Linus.

Three more workqueue regression fixes.

* Fix unbalanced unlock in trylock failure path of manage_workers().
  This shouldn't happen often in the wild but is possible.

* While making schedule_work() and friends inline, they become
  unavailable to !GPL modules.  Allow !GPL modules to access basic
  stuff - system_wq and queue_*work_on() - so that schedule_work() and
  friends can be used.

* During boot, the unbound NUMA support code allocates a cpumask for
  each possible node using alloc_cpumask_var_node(), which ends up
  trying to allocate node-specific memory even for offline nodes
  triggering BUG in the memory alloc code.  Use NUMA_NO_NODE for
  offline nodes.

The above three fixes are available in the following branch

  git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git for-3.10-fixes

for you to fetch changes up to 1be0c25da56e860992af972a60321563ca2cfcd1:

  workqueue: don't perform NUMA-aware allocations on offline nodes in wq_numa_init() (2013-05-15 14:24:24 -0700)

Thanks.

----------------------------------------------------------------
Joonsoo Kim (1):
      workqueue: correct handling of the pool spin_lock

Marc Dionne (1):
      workqueue: Make schedule_work() available again to non GPL modules

Tejun Heo (1):
      workqueue: don't perform NUMA-aware allocations on offline nodes in wq_numa_init()

 kernel/workqueue.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 1ae6028..ee8e29a 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -296,7 +296,7 @@ static DEFINE_HASHTABLE(unbound_pool_hash, UNBOUND_POOL_HASH_ORDER);
 static struct workqueue_attrs *unbound_std_wq_attrs[NR_STD_WORKER_POOLS];
 
 struct workqueue_struct *system_wq __read_mostly;
-EXPORT_SYMBOL_GPL(system_wq);
+EXPORT_SYMBOL(system_wq);
 struct workqueue_struct *system_highpri_wq __read_mostly;
 EXPORT_SYMBOL_GPL(system_highpri_wq);
 struct workqueue_struct *system_long_wq __read_mostly;
@@ -1411,7 +1411,7 @@ bool queue_work_on(int cpu, struct workqueue_struct *wq,
 	local_irq_restore(flags);
 	return ret;
 }
-EXPORT_SYMBOL_GPL(queue_work_on);
+EXPORT_SYMBOL(queue_work_on);
 
 void delayed_work_timer_fn(unsigned long __data)
 {
@@ -1485,7 +1485,7 @@ bool queue_delayed_work_on(int cpu, struct workqueue_struct *wq,
 	local_irq_restore(flags);
 	return ret;
 }
-EXPORT_SYMBOL_GPL(queue_delayed_work_on);
+EXPORT_SYMBOL(queue_delayed_work_on);
 
 /**
  * mod_delayed_work_on - modify delay of or queue a delayed work on specific CPU
@@ -2059,6 +2059,7 @@ static bool manage_workers(struct worker *worker)
 	if (unlikely(!mutex_trylock(&pool->manager_mutex))) {
 		spin_unlock_irq(&pool->lock);
 		mutex_lock(&pool->manager_mutex);
+		spin_lock_irq(&pool->lock);
 		ret = true;
 	}
 
@@ -4904,7 +4905,8 @@ static void __init wq_numa_init(void)
 	BUG_ON(!tbl);
 
 	for_each_node(node)
-		BUG_ON(!alloc_cpumask_var_node(&tbl[node], GFP_KERNEL, node));
+		BUG_ON(!alloc_cpumask_var_node(&tbl[node], GFP_KERNEL,
+				node_online(node) ? node : NUMA_NO_NODE));
 
 	for_each_possible_cpu(cpu) {
 		node = cpu_to_node(cpu);