Skip to contentSkip to conversation

ixgbe: fix possible deadlock in ixgbe_service_task()

PATCH Superseded Taehee Yoo 2 participants 2 messages Jul 15, 2019 – Jul 19, 2019

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Taehee Yoo

author
#0 lore raw

PATCH 1/1 ixgbe: fix possible deadlock in ixgbe_service_task()

ixgbe_service_task() calls unregister_netdev() under rtnl_lock(). But unregister_netdev() internally calls rtnl_lock(). So deadlock would occur.

Fixes 59dd45d550c5 ("ixgbe: firmware recovery mode")

---
I did only compile test because I don't have the hardware. Could anyone test this patch?

 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 --
 1 file changed, 2 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +0 -2
index 57fd9ee6de66..b4888be94dfb 100644
@@ -7894,9 +7894,7 @@ static void ixgbe_service_task(struct work_struct *work)
 	}
 	if (ixgbe_check_fw_error(adapter)) {
 		if (!test_bit(__IXGBE_DOWN, &adapter->state)) {
-			rtnl_lock();
 			unregister_netdev(adapter->netdev);
-			rtnl_unlock();
 		}
 		ixgbe_service_event_complete(adapter);
 		return;
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 ixgbe: fix possible deadlock in ixgbe_service_task()

Quoted 13 lines

-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Taehee Yoo
Sent: Sunday, July 14, 2019 9:57 PM
To: Kirsher, Jeffrey T <[email protected]>; intel-wired- lan at lists.osuosl.org; ap420073 at gmail.com
Subject: [Intel-wired-lan] [PATCH net] ixgbe: fix possible deadlock in ixgbe_service_task()

ixgbe_service_task() calls unregister_netdev() under rtnl_lock(). But unregister_netdev() internally calls rtnl_lock(). So deadlock would occur.

Quoted 7 lines
Fixes 59dd45d550c5 ("ixgbe: firmware recovery mode")

---
I did only compile test because I don't have the hardware. Could anyone test this patch?

 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 --
 1 file changed, 2 deletions(-)