Commit 41e1c9a3 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Liu Chuang
Browse files

eth: sungem: remove .ndo_poll_controller to avoid deadlocks 

stable inclusion
from stable-v6.6.33
commit 5de5aeb98f9a000adb0db184e32765e4815d860b
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IA6S6S
CVE: CVE-2024-38597

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5de5aeb98f9a000adb0db184e32765e4815d860b



--------------------------------

[ Upstream commit ac0a230f719b02432d8c7eba7615ebd691da86f4 ]

Erhard reports netpoll warnings from sungem:

  netpoll_send_skb_on_dev(): eth0 enabled interrupts in poll (gem_start_xmit+0x0/0x398)
  WARNING: CPU: 1 PID: 1 at net/core/netpoll.c:370 netpoll_send_skb+0x1fc/0x20c

gem_poll_controller() disables interrupts, which may sleep.
We can't sleep in netpoll, it has interrupts disabled completely.
Strangely, gem_poll_controller() doesn't even poll the completions,
and instead acts as if an interrupt has fired so it just schedules
NAPI and exits. None of this has been necessary for years, since
netpoll invokes NAPI directly.

Fixes: fe09bb61 ("sungem: Spring cleaning and GRO support")
Reported-and-tested-by: default avatarErhard Furtner <erhard_f@mailbox.org>
Link: https://lore.kernel.org/all/20240428125306.2c3080ef@legion


Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20240508134504.3560956-1-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarLiu Chuang <liuchuang40@huawei.com>
parent e03ea5d6

drivers/net/ethernet/sun/sungem.c

+0 −14
Original line number Diff line number Diff line
@@ -949,17 +949,6 @@ static irqreturn_t gem_interrupt(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



#ifdef CONFIG_NET_POLL_CONTROLLER

static void gem_poll_controller(struct net_device *dev)

{

	struct gem *gp = netdev_priv(dev);



	disable_irq(gp->pdev->irq);

	gem_interrupt(gp->pdev->irq, dev);

	enable_irq(gp->pdev->irq);

}

#endif



static void gem_tx_timeout(struct net_device *dev, unsigned int txqueue)

{

	struct gem *gp = netdev_priv(dev);
@@ -2839,9 +2828,6 @@ static const struct net_device_ops gem_netdev_ops = { 
	.ndo_change_mtu		= gem_change_mtu,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address    = gem_set_mac_address,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller    = gem_poll_controller,

#endif

};



static int gem_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)