Skip to contentSkip to conversation

workqueue: fix double unlock bug

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

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 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.

---
 kernel/workqueue.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/workqueue.c +1 -1
index 0ee63af..e6e9f6a 100644
@@ -4100,7 +4100,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 14 lines · Daeseok Youn

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

---
 kernel/workqueue.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/workqueue.c +0 -0
index 0ee63af..e6e9f6a 100644

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

Quoted 8 lines
kernel/workqueue.c +1 -1
@@ -4100,7 +4100,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;
 	}
 
 	/*

Nice catch!!!

The supposed correct behavior is documented in the head of this function. We forgot to do it.

* If NUMA affinity can't be adjusted due to memory allocation failure, it
* falls back to @wq->dfl_pwq which may not be optimal but is always
* correct.

Could you use the following code instead of "goto out_unlock":

		mutex_lock(&wq->mutex);
		if (pwq == wq->dfl_pwq)
			goto out_unlock;
		else
			goto use_dfl_pwq;

Correct&BAD. There are two blocks of suck code in this function:

		if (pwq == wq->dfl_pwq)
			goto out_unlock;
		else
			goto use_dfl_pwq;

You can replace both these two blocks code to the following code:

		goto use_dfl_pwq;

The result is the same as before except it adds some small overhead. I don't care the small overhead in this function.

Thanks
Lai

#2 lore raw

2014-04-14 15:50 GMT+09:00 Lai Jiangshan <[email protected]>:

Quoted 41 lines · Daeseok Youn
Quoted 14 lines

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

---
 kernel/workqueue.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/workqueue.c +0 -0
index 0ee63af..e6e9f6a 100644

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

Quoted 8 lines
kernel/workqueue.c +1 -1
@@ -4100,7 +4100,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;
      }
 
      /*

Nice catch!!!

The supposed correct behavior is documented in the head of this function. We forgot to do it.

* If NUMA affinity can't be adjusted due to memory allocation failure, it
* falls back to @wq->dfl_pwq which may not be optimal but is always
* correct.

Could you use the following code instead of "goto out_unlock":

                mutex_lock(&wq->mutex);
                if (pwq == wq->dfl_pwq)
                        goto out_unlock;
                else
                        goto use_dfl_pwq;
Quoted 8 lines

Correct&BAD. There are two blocks of suck code in this function:

                if (pwq == wq->dfl_pwq)
                        goto out_unlock;
                else
                        goto use_dfl_pwq;

You can replace both these two blocks code to the following code:

                goto use_dfl_pwq;

OK. I will remove that "if-else" condition and just use "goto use_dfl_pwq" and send this patch as V2.

Thanks.
Daeseok Youn

Quoted 7 lines

The result is the same as before except it adds some small overhead. I don't care the small overhead in this function.

Thanks
Lai