[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAD=hENe+xLEfdBwfAYiguc-ttubi3v=ur3chN=tAYqe0v-4+pg@mail.gmail.com>
Date: Wed, 22 Jan 2025 09:42:21 +0100
From: Zhu Logan <zyjzyj2000@...il.com>
To: Jakub Kicinski <kuba@...nel.org>
Cc: davem@...emloft.net, netdev@...r.kernel.org, edumazet@...gle.com,
pabeni@...hat.com, andrew+netdev@...n.ch, horms@...nel.org,
dan.carpenter@...aro.org, rain.1986.08.12@...il.com, kuniyu@...zon.com,
romieu@...zoreil.com
Subject: Re: [PATCH net-next 3/7] eth: forcedeth: fix calling napi_enable() in
atomic context
On Tue, Jan 21, 2025 at 11:15 PM Jakub Kicinski <kuba@...nel.org> wrote:
>
> napi_enable() may sleep now, take netdev_lock() before np->lock.
>
> Fixes: 413f0271f396 ("net: protect NAPI enablement with netdev_lock()")
> Reported-by: Dan Carpenter <dan.carpenter@...aro.org>
> Link: https://lore.kernel.org/dcfd56bc-de32-4b11-9e19-d8bd1543745d@stanley.mountain
> Signed-off-by: Jakub Kicinski <kuba@...nel.org>
Thanks,
Acked-by: Zhu Yanjun <zyjzyj2000@...il.com>
Zhu Yanjun
> ---
> CC: rain.1986.08.12@...il.com
> CC: zyjzyj2000@...il.com
> CC: kuniyu@...zon.com
> CC: romieu@...zoreil.com
> ---
> drivers/net/ethernet/nvidia/forcedeth.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
> index b00df57f2ca3..499e5e39d513 100644
> --- a/drivers/net/ethernet/nvidia/forcedeth.c
> +++ b/drivers/net/ethernet/nvidia/forcedeth.c
> @@ -5562,6 +5562,7 @@ static int nv_open(struct net_device *dev)
> /* ask for interrupts */
> nv_enable_hw_interrupts(dev, np->irqmask);
>
> + netdev_lock(dev);
> spin_lock_irq(&np->lock);
> writel(NVREG_MCASTADDRA_FORCE, base + NvRegMulticastAddrA);
> writel(0, base + NvRegMulticastAddrB);
> @@ -5580,7 +5581,7 @@ static int nv_open(struct net_device *dev)
> ret = nv_update_linkspeed(dev);
> nv_start_rxtx(dev);
> netif_start_queue(dev);
> - napi_enable(&np->napi);
> + napi_enable_locked(&np->napi);
>
> if (ret) {
> netif_carrier_on(dev);
> @@ -5597,6 +5598,7 @@ static int nv_open(struct net_device *dev)
> round_jiffies(jiffies + STATS_INTERVAL));
>
> spin_unlock_irq(&np->lock);
> + netdev_unlock(dev);
>
> /* If the loopback feature was set while the device was down, make sure
> * that it's set correctly now.
> --
> 2.48.1
>
Powered by blists - more mailing lists