Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20210211082351.178536-1-qiang.zhang@windriver.com>
In-Reply-To: <20210211082351.178536-1-qiang.zhang@windriver.com>
From:   Lai Jiangshan <jiangshanlai@gmail.com>
Date:   Thu, 18 Feb 2021 10:45:20 +0800
Message-ID: <CAJhGHyA6gtufYfZ5CmFnS-Uyu8VC0G9uFoiJQO6-ZTTUBB-eXQ@mail.gmail.com>
Subject: Re: [PATCH] workqueue: Move the position of debug_work_activate() in __queue_work()
To:     "Zhang, Qiang" <qiang.zhang@windriver.com>
Cc:     Tejun Heo <tj@kernel.org>, LKML <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

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
>