Skip to contentSkip to conversation

workqueue: fix double unlock bug

PATCH Superseded Daeseok Youn 2 participants 2 messages Apr 14, 2014 Workqueue

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 workqueue: fix double unlock bug

mutex_unlock() and put_pwq_unlocked() do not need to be called when alloc_unbound_pwq() is failed.

And remove "if" condition for whether "pwq" is same as "wq->dfl_pwq" when wq_calc_node_cpumask() returns false and just use "goto use_dfl_pwq"

---
V2: replace "if condition" with "goto" as Lai's comment.

 kernel/workqueue.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
kernel/workqueue.c +2 -5
index 0ee63af..9853067 100644
@@ -4087,10 +4087,7 @@ static void wq_update_unbound_numa(struct workqueue_struct *wq, int cpu,
 		if (cpumask_equal(cpumask, pwq->pool->attrs->cpumask))
 			goto out_unlock;
 	} else {
-		if (pwq == wq->dfl_pwq)
-			goto out_unlock;
-		else
-			goto use_dfl_pwq;
+		goto use_dfl_pwq;
 	}
 
 	mutex_unlock(&wq->mutex);
@@ -4100,7 +4097,7 @@ static void wq_update_unbound_numa(struct workqueue_struct *wq, int cpu,
 	if (!pwq) {
 		pr_warning("workqueue: allocation failed while updating NUMA affinity of \"%s\"\n",
 			   wq->name);
-		goto out_unlock;
+		return;
 	}
 
 	/*
Signature · 1 line
1.7.4.4
#1 lore raw
Quoted 31 lines · Daeseok Youn

mutex_unlock() and put_pwq_unlocked() do not need to be called when alloc_unbound_pwq() is failed.

And remove "if" condition for whether "pwq" is same as "wq->dfl_pwq" when wq_calc_node_cpumask() returns false and just use "goto use_dfl_pwq"

---
V2: replace "if condition" with "goto" as Lai's comment.

 kernel/workqueue.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
kernel/workqueue.c +1 -4
index 0ee63af..9853067 100644
@@ -4087,10 +4087,7 @@ static void wq_update_unbound_numa(struct workqueue_struct *wq, int cpu,
                if (cpumask_equal(cpumask, pwq->pool->attrs->cpumask))
                        goto out_unlock;
        } else {
-               if (pwq == wq->dfl_pwq)
-                       goto out_unlock;
-               else
-                       goto use_dfl_pwq;
+               goto use_dfl_pwq;
        }
 
        mutex_unlock(&wq->mutex);

kernel/workqueue.c static void wq_update_unbound_numa(struct workqueue_struct *wq, int cpu, · line 4100

Quoted 5 lines
kernel/workqueue.c +1 -1
@@ -4100,7 +4097,7 @@ static void wq_update_unbound_numa(struct workqueue_struct *wq, int cpu,
        if (!pwq) {
                pr_warning("workqueue: allocation failed while updating NUMA affinity of \"%s\"\n",
                           wq->name);
-               goto out_unlock;
+               return;

Please acquire the wq->mutex and goto use_dfl_pwq;

Quoted 12 lines
kernel/workqueue.c +0 -1
        }
 
        /*
--

1.7.4.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/