Subject: Re: [PATCH net v2] net: calxedaxgmac: fix race condition in
 xgmac_remove due to unfinished work
To:     Zheng Wang <zyytlz.wz@163.com>, <davem@davemloft.net>
CC:     <edumazet@google.com>, <kuba@kernel.org>, <pabeni@redhat.com>,
        <mkl@pengutronix.de>, <j.neuschaefer@gmx.net>,
        <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        <hackerzheng666@gmail.com>, <1395428693sheep@gmail.com>,
        <alex000young@gmail.com>
References: <20230311180404.4007176-1-zyytlz.wz@163.com>
From:   Yunsheng Lin <linyunsheng@huawei.com>
Message-ID: <6f0dc4f0-8a1a-9512-01f8-71b0ce6024ea@huawei.com>
Date:   Mon, 13 Mar 2023 09:22:07 +0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101
 Thunderbird/52.2.0
MIME-Version: 1.0
In-Reply-To: <20230311180404.4007176-1-zyytlz.wz@163.com>
Content-Type: text/plain; charset="utf-8"
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 2023/3/12 2:04, 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.
> 
> Fixes: 8746f671ef04 ("net: calxedaxgmac: fix race between xgmac_tx_complete and xgmac_tx_err")
> Signed-off-by: Zheng Wang <zyytlz.wz@163.com>


LGTM.
Reviewed-by: Yunsheng Lin <linyunsheng@huawei.com>

> ---
> v2:
> - fix typo,add Fixes label and stop dev_watchdog so that it will handle no more timeout work suggested by Yunsheng Lin
> ---
>  drivers/net/ethernet/calxeda/xgmac.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c
> index f4f87dfa9687..f0880538f6f3 100644
> --- a/drivers/net/ethernet/calxeda/xgmac.c
> +++ b/drivers/net/ethernet/calxeda/xgmac.c
> @@ -1832,6 +1832,10 @@ static int xgmac_remove(struct platform_device *pdev)
>  	free_irq(ndev->irq, ndev);
>  	free_irq(priv->pmt_irq, ndev);
>  
> +	netif_carrier_off(ndev);
> +	netif_tx_disable(ndev);
> +	cancel_work_sync(&priv->tx_timeout_work);
> +
>  	unregister_netdev(ndev);
>  	netif_napi_del(&priv->napi);
>  
>