2021-02-11 08:26:53

by Zhang, Qiang

Subject: [PATCH] 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.

Signed-off-by: Zqiang <[email protected]>
---
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-02-17 09:56:45

by Zhang, Qiang

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

Hello Tejun Heo

Excuse me, do you have time to make some suggestions for this modification?

Thanks
Qiang

________________________________________
??????: Zhang, Qiang <[email protected]>
????ʱ??: 2021??2??11?? 16:24
?ռ???: [email protected]; [email protected]
????: [email protected]
????: [PATCH] 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.

Signed-off-by: Zqiang <[email protected]>
---
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-02-18 02:50:12

by Lai Jiangshan

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

On Thu, Feb 11, 2021 at 4:24 PM <[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.
>

Please add:
Fixes: e41e704bc4f49 ("workqueue: improve destroy_workqueue() debuggability")

The code looks good to me.

Reviewed-by: Lai Jiangshan <[email protected]>

> Signed-off-by: Zqiang <[email protected]>
> ---
> 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
>