linux-kernel - Re: [PATCH] workqueue: Move the position of debug_work_activate() in __queue

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Thu, 18 Feb 2021 10:45:20 +0800
From:   Lai Jiangshan <jiangshanlai@...il.com>
To:     "Zhang, Qiang" <qiang.zhang@...driver.com>
Cc:     Tejun Heo <tj@...nel.org>, LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] workqueue: Move the position of debug_work_activate() in __queue_work()

On Thu, Feb 11, 2021 at 4:24 PM <qiang.zhang@...driver.com> wrote:
>
> From: Zqiang <qiang.zhang@...driver.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@...il.com>

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