Received-SPF: pass (google.com: domain of linux-kernel+bounces-72466-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Precedence: bulk
MIME-Version: 1.0
References: <20240216180559.208276-1-tj@kernel.org> <20240216180559.208276-14-tj@kernel.org>
In-Reply-To: <20240216180559.208276-14-tj@kernel.org>
From: Lai Jiangshan <jiangshanlai@gmail.com>
Date: Tue, 20 Feb 2024 15:23:53 +0800
Message-ID: <CAJhGHyBHsu_o02eZ4HWHhuFVXtVUR-sH_W8gFXw7QbLOBm+k+g@mail.gmail.com>
Subject: Re: [PATCH 13/17] workqueue: Remove WORK_OFFQ_CANCELING
To: Tejun Heo <tj@kernel.org>
Cc: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, 
	allen.lkml@gmail.com, kernel-team@meta.com
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hello, Tejun

On Sat, Feb 17, 2024 at 2:06=E2=80=AFAM Tejun Heo <tj@kernel.org> wrote:

> @@ -2631,19 +2567,13 @@ bool mod_delayed_work_on(int cpu, struct workqueu=
e_struct *wq,
>                          struct delayed_work *dwork, unsigned long delay)
>  {
>         unsigned long irq_flags;
> -       int ret;
> +       bool ret;
>
> -       do {
> -               ret =3D try_to_grab_pending(&dwork->work, WORK_CANCEL_DEL=
AYED,
> -                                         &irq_flags);
> -       } while (unlikely(ret =3D=3D -EAGAIN));
> +       ret =3D work_grab_pending(&dwork->work, WORK_CANCEL_DELAYED, &irq=
_flags);
>
> -       if (likely(ret >=3D 0)) {
> -               __queue_delayed_work(cpu, wq, dwork, delay);
> -               local_irq_restore(irq_flags);
> -       }
> +       __queue_delayed_work(cpu, wq, dwork, delay);

The disable count has to be checked before queuing it.

Thanks
Lai

>
> -       /* -ENOENT from try_to_grab_pending() becomes %true */
> +       local_irq_restore(irq_flags);
>         return ret;
>  }
>  EXPORT_SYMBOL_GPL(mod_delayed_work_on);