Date:   Wed, 10 Nov 2021 17:44:53 -0800
From:   Jakub Kicinski <kuba@kernel.org>
To:     Alexander Lobakin <alexandr.lobakin@intel.com>
Cc:     Eric Dumazet <edumazet@google.com>,
        "David S. Miller" <davem@davemloft.net>,
        Jesse Brandeburg <jesse.brandeburg@intel.com>,
        Maciej Fijalkowski <maciej.fijalkowski@intel.com>,
        Michal Swiatkowski <michal.swiatkowski@intel.com>,
        Xuan Zhuo <xuanzhuo@linux.alibaba.com>,
        Antoine Tenart <atenart@kernel.org>,
        Wei Wang <weiwan@google.com>,
        =?UTF-8?B?QmrDtnJuIFTDtnBlbA==?= <bjorn@kernel.org>,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH net] net: fix premature exit from NAPI state polling in
 napi_disable()
Message-ID: <20211110174453.3cb33cde@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
In-Reply-To: <20211110174407.2b9083a9@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
References: <20211110191126.1214-1-alexandr.lobakin@intel.com>
        <CANn89i+ZH83K9V7-7D6egC5AF=hxBv8FL+rroEqOskB-+TLZCA@mail.gmail.com>
        <20211110194337.179-1-alexandr.lobakin@intel.com>
        <20211110174407.2b9083a9@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Precedence: bulk

On Wed, 10 Nov 2021 17:44:07 -0800 Jakub Kicinski wrote:
> On Wed, 10 Nov 2021 20:43:37 +0100 Alexander Lobakin wrote:
> > > What about replacing the error prone do {...} while (cmpxchg(..)) by
> > > something less confusing ?
> > > 
> > > This way, no need for a label.
> > > 
> > > diff --git a/net/core/dev.c b/net/core/dev.c
> > > index 5e37d6809317fb3c54686188a908bfcb0bfccdab..9327141892cdaaf0282e082e0c6746abae0f12a7
> > > 100644
> > > --- a/net/core/dev.c
> > > +++ b/net/core/dev.c
> > > @@ -6264,7 +6264,7 @@ void napi_disable(struct napi_struct *n)
> > >         might_sleep();
> > >         set_bit(NAPI_STATE_DISABLE, &n->state);
> > > 
> > > -       do {
> > > +       for (;;) {
> > >                 val = READ_ONCE(n->state);
> > >                 if (val & (NAPIF_STATE_SCHED | NAPIF_STATE_NPSVC)) {
> > >                         usleep_range(20, 200);
> > > @@ -6273,7 +6273,9 @@ void napi_disable(struct napi_struct *n)
> > > 
> > >                 new = val | NAPIF_STATE_SCHED | NAPIF_STATE_NPSVC;
> > >                 new &= ~(NAPIF_STATE_THREADED | NAPIF_STATE_PREFER_BUSY_POLL);
> > > -       } while (cmpxchg(&n->state, val, new) != val);
> > > +               if (cmpxchg(&n->state, val, new) == val)
> > > +                       break;
> > > +       }
> > > 
> > >         hrtimer_cancel(&n->timer);    
> > 
> > LFTM, I'l queue v2 in a moment with you in Suggested-by.  
> 
> Ouch.
> 
> Feel free to put
> 
> Acked-by: Jakub Kicinski <kuba@kernel.org>

Or I'll do it myself since it's already out...