MIME-Version: 1.0
References: <20230309035641.3439953-1-zyytlz.wz@163.com> <ec579c96-9955-f317-b37a-4f3fcd0c206e@huawei.com>
In-Reply-To: <ec579c96-9955-f317-b37a-4f3fcd0c206e@huawei.com>
From:   Zheng Hacker <hackerzheng666@gmail.com>
Date:   Thu, 9 Mar 2023 15:25:33 +0800
Message-ID: <CAJedcCw=XmZzP+wBQRmVrtM-ns9Gs0uvxGowTn-QfQ4QJ0Upyw@mail.gmail.com>
Subject: Re: [PATCH] net: calxeda: fix race condition in xgmac_remove due to
 unfinshed work
To:     Yunsheng Lin <linyunsheng@huawei.com>
Cc:     Zheng Wang <zyytlz.wz@163.com>, davem@davemloft.net,
        edumazet@google.com, kuba@kernel.org, pabeni@redhat.com,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        1395428693sheep@gmail.com, alex000young@gmail.com
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Yunsheng Lin <linyunsheng@huawei.com> =E4=BA=8E2023=E5=B9=B43=E6=9C=889=E6=
=97=A5=E5=91=A8=E5=9B=9B 14:24=E5=86=99=E9=81=93=EF=BC=9A
>
> On 2023/3/9 11:56, Zheng Wang wrote:
> > In xgmac_probe, the priv->tx_timeout_work is bound with
> > xgmac_tx_timeout_work. In xgmac_remove, if there is an
> > unfinished work, there might be a race condition that
> > priv->base was written byte after iounmap it.
> >
> > Fix it by finishing the work before cleanup.
>
> This should go to net branch, so title should be:
>
>  [PATCH net] net: calxeda: fix race condition in xgmac_remove due to unfi=
nshed work
>

Sorry for the confusion.

> From history commit, it seems more common to use "net: calxedaxgmac" inst=
ead of
> "net: calxeda", I am not sure which one is better.
>
> Also there should be a Fixes tag for net branch, maybe:
>
> Fixes: 8746f671ef04 ("net: calxedaxgmac: fix race between xgmac_tx_comple=
te and xgmac_tx_err")
>
>

Yes, I was eager to report the fix and ignored that. Thanks for
pointing that out.

> >
> > Signed-off-by: Zheng Wang <zyytlz.wz@163.com>
> > ---
> >  drivers/net/ethernet/calxeda/xgmac.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/etherne=
t/calxeda/xgmac.c
> > index f4f87dfa9687..94c3804001e3 100644
> > --- a/drivers/net/ethernet/calxeda/xgmac.c
> > +++ b/drivers/net/ethernet/calxeda/xgmac.c
> > @@ -1831,6 +1831,7 @@ static int xgmac_remove(struct platform_device *p=
dev)
> >       /* Free the IRQ lines */
> >       free_irq(ndev->irq, ndev);
> >       free_irq(priv->pmt_irq, ndev);
> > +     cancel_work_sync(&priv->tx_timeout_work);
>
> It seems the blow function need to stop the dev_watchdog() from
> calling dev->netdev_ops->ndo_tx_timeout before calling
> cancel_work_sync(&priv->tx_timeout_work), otherwise the
> dev_watchdog() may trigger the priv->tx_timeout_work to run again.
>
>         netif_carrier_off(ndev);
>         netif_tx_disable(ndev);
>
> >
> >       unregister_netdev(ndev);
> >       netif_napi_del(&priv->napi);
> >

Yes, I agree with that. Thanks for your advice. I learned a lot from it.

Best regards,
Zheng