* [PATCH v2] workqueue: Move the position of debug_work_activate() in __queue_work()
@ 2021-02-18 3:16 qiang.zhang
2021-03-03 5:56 ` 回复: " Zhang, Qiang
2021-03-03 15:14 ` Tejun Heo
0 siblings, 2 replies; 3+ messages in thread
From: qiang.zhang @ 2021-02-18 3:16 UTC (permalink / raw)
To: jiangshanlai, tj; +Cc: linux-kernel
From: Zqiang <qiang.zhang@windriver.com>
The debug_work_activate() is called on the premise that
the work can be inserted, because if wq be in WQ_DRAINING
status, insert work may be failed.
Fixes: e41e704bc4f4 ("workqueue: improve destroy_workqueue() debuggability")
Signed-off-by: Zqiang <qiang.zhang@windriver.com>
Reviewed-by: Lai Jiangshan <jiangshanlai@gmail.com>
---
v1->v2:
add Fixes tag.
kernel/workqueue.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 0d150da252e8..21fb00b52def 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -1412,7 +1412,6 @@ static void __queue_work(int cpu, struct workqueue_struct *wq,
*/
lockdep_assert_irqs_disabled();
- debug_work_activate(work);
/* if draining, only works from the same workqueue are allowed */
if (unlikely(wq->flags & __WQ_DRAINING) &&
@@ -1494,6 +1493,7 @@ static void __queue_work(int cpu, struct workqueue_struct *wq,
worklist = &pwq->delayed_works;
}
+ debug_work_activate(work);
insert_work(pwq, work, worklist, work_flags);
out:
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* 回复: [PATCH v2] workqueue: Move the position of debug_work_activate() in __queue_work()
2021-02-18 3:16 [PATCH v2] workqueue: Move the position of debug_work_activate() in __queue_work() qiang.zhang
@ 2021-03-03 5:56 ` Zhang, Qiang
2021-03-03 15:14 ` Tejun Heo
1 sibling, 0 replies; 3+ messages in thread
From: Zhang, Qiang @ 2021-03-03 5:56 UTC (permalink / raw)
To: jiangshanlai, tj, Tejun Heo; +Cc: linux-kernel
Hello Tejun
Please review this change.
Thanks
Qiang
>________________________________________
>发件人: Zhang, Qiang <qiang.zhang@windriver.com>
>发送时间: 2021年2月18日 11:17
>收件人: jiangshanlai@gmail.com; tj@kernel.org
>抄送: linux-kernel@vger.kernel.org
>主题: [PATCH v2] workqueue: Move the position of >debug_work_activate() in __queue_work()
>
>From: Zqiang <qiang.zhang@windriver.com>
>
>The debug_work_activate() is called on the premise that
>the work can be inserted, because if wq be in WQ_DRAINING
>status, insert work may be failed.
>
>Fixes: e41e704bc4f4 ("workqueue: improve destroy_workqueue() >debuggability")
>Signed-off-by: Zqiang <qiang.zhang@windriver.com>
>Reviewed-by: Lai Jiangshan <jiangshanlai@gmail.com>
>---
>v1->v2:
> add Fixes tag.
>
> kernel/workqueue.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/kernel/workqueue.c b/kernel/workqueue.c
>index 0d150da252e8..21fb00b52def 100644
>--- a/kernel/workqueue.c
>+++ b/kernel/workqueue.c
>@@ -1412,7 +1412,6 @@ static void __queue_work(int cpu, struct >workqueue_struct *wq,
> */
> lockdep_assert_irqs_disabled();
>
>- debug_work_activate(work);
>
> /* if draining, only works from the same workqueue are allowed >*/
> if (unlikely(wq->flags & __WQ_DRAINING) &&
>@@ -1494,6 +1493,7 @@ static void __queue_work(int cpu, struct >workqueue_struct *wq,
> worklist = &pwq->delayed_works;
> }
>
>+ debug_work_activate(work);
> insert_work(pwq, work, worklist, work_flags);
>
> out:
>--
>2.25.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] workqueue: Move the position of debug_work_activate() in __queue_work()
2021-02-18 3:16 [PATCH v2] workqueue: Move the position of debug_work_activate() in __queue_work() qiang.zhang
2021-03-03 5:56 ` 回复: " Zhang, Qiang
@ 2021-03-03 15:14 ` Tejun Heo
1 sibling, 0 replies; 3+ messages in thread
From: Tejun Heo @ 2021-03-03 15:14 UTC (permalink / raw)
To: qiang.zhang; +Cc: jiangshanlai, linux-kernel
On Thu, Feb 18, 2021 at 11:16:49AM +0800, qiang.zhang@windriver.com wrote:
> From: Zqiang <qiang.zhang@windriver.com>
>
> The debug_work_activate() is called on the premise that
> the work can be inserted, because if wq be in WQ_DRAINING
> status, insert work may be failed.
>
> Fixes: e41e704bc4f4 ("workqueue: improve destroy_workqueue() debuggability")
> Signed-off-by: Zqiang <qiang.zhang@windriver.com>
> Reviewed-by: Lai Jiangshan <jiangshanlai@gmail.com>
Applied to wq/for-5.12-fixes.
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-03 18:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-18 3:16 [PATCH v2] workqueue: Move the position of debug_work_activate() in __queue_work() qiang.zhang
2021-03-03 5:56 ` 回复: " Zhang, Qiang
2021-03-03 15:14 ` Tejun Heo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).