2021-02-18 03:19:01

by Zhang, Qiang

Subject: [PATCH v2] workqueue: Move the position of debug_work_activate() in __queue_work()

From: Zqiang <[email protected]>

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 <[email protected]>
Reviewed-by: Lai Jiangshan <[email protected]>
---
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

2021-03-04 08:26:08

by Zhang, Qiang

Subject: 回复: [PATCH v2] workqueue: Move the position of debug_work_activate() in __queue_work()

Hello Tejun

Please review this change.

Thanks
Qiang

>________________________________________
>??????: Zhang, Qiang <[email protected]>
>????ʱ??: 2021??2??18?? 11:17
>?ռ???: [email protected]; [email protected]
>????: [email protected]
>????: [PATCH v2] workqueue: Move the position of >debug_work_activate() in __queue_work()
>
>From: Zqiang <[email protected]>
>
>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 <[email protected]>
>Reviewed-by: Lai Jiangshan <[email protected]>
>---
>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

2021-03-04 23:23:33

by Tejun Heo

Subject: Re: [PATCH v2] workqueue: Move the position of debug_work_activate() in __queue_work()

On Thu, Feb 18, 2021 at 11:16:49AM +0800, [email protected] wrote:
> From: Zqiang <[email protected]>
>
> 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 <[email protected]>
> Reviewed-by: Lai Jiangshan <[email protected]>

Applied to wq/for-5.12-fixes.

Thanks.

--
tejun