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

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

[qiang.zhang]

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.

Signed-off-by: Zqiang <qiang.zhang@windriver.com>
---
 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

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

[Zhang, Qiang]

Hello Tejun Heo

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

Thanks
Qiang

________________________________________
发件人: Zhang, Qiang <qiang.zhang@windriver.com>
发送时间: 2021年2月11日 16:24
收件人: tj@kernel.org; jiangshanlai@gmail.com
抄送: linux-kernel@vger.kernel.org
主题: [PATCH] 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.

Signed-off-by: Zqiang <qiang.zhang@windriver.com>
---
 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

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

[Lai Jiangshan]

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

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

The code looks good to me.

Reviewed-by: Lai Jiangshan <jiangshanlai@gmail.com>

> Signed-off-by: Zqiang <qiang.zhang@windriver.com>
> ---
>  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
>