Received-SPF: pass (google.com: domain of linux-kernel+bounces-73551-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Sender: Tejun Heo <htejun@gmail.com>
Date: Tue, 20 Feb 2024 08:53:14 -1000
From: Tejun Heo <tj@kernel.org>
To: Lai Jiangshan <jiangshanlai@gmail.com>
Cc: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org,
	allen.lkml@gmail.com, kernel-team@meta.com
Subject: Re: [PATCH 13/17] workqueue: Remove WORK_OFFQ_CANCELING
Message-ID: <ZdT1GghILBWPMfLV@slm.duckdns.org>
References: <20240216180559.208276-1-tj@kernel.org>
 <20240216180559.208276-14-tj@kernel.org>
 <CAJhGHyBHsu_o02eZ4HWHhuFVXtVUR-sH_W8gFXw7QbLOBm+k+g@mail.gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <CAJhGHyBHsu_o02eZ4HWHhuFVXtVUR-sH_W8gFXw7QbLOBm+k+g@mail.gmail.com>

On Tue, Feb 20, 2024 at 03:23:53PM +0800, Lai Jiangshan wrote:
> Hello, Tejun
> 
> On Sat, Feb 17, 2024 at 2:06 AM Tejun Heo <tj@kernel.org> wrote:
> 
> > @@ -2631,19 +2567,13 @@ bool mod_delayed_work_on(int cpu, struct workqueue_struct *wq,
> >                          struct delayed_work *dwork, unsigned long delay)
> >  {
> >         unsigned long irq_flags;
> > -       int ret;
> > +       bool ret;
> >
> > -       do {
> > -               ret = try_to_grab_pending(&dwork->work, WORK_CANCEL_DELAYED,
> > -                                         &irq_flags);
> > -       } while (unlikely(ret == -EAGAIN));
> > +       ret = work_grab_pending(&dwork->work, WORK_CANCEL_DELAYED, &irq_flags);
> >
> > -       if (likely(ret >= 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.

Ah, right, this also needs a clear_pending_if_disabled() call.

Thanks.

-- 
tejun