Skip to contentSkip to conversation

Revert "igb: Fix a deadlock in igb_sriov_reinit"

PATCH New c00176621 2 participants 2 messages Apr 6, 2016 – Apr 7, 2016

Subsystems (2)
Network drivers Intel Ethernet
lore
Share & tools
lore

c00176621

author
#0 lore raw

PATCH 1/1 Revert "igb: Fix a deadlock in igb_sriov_reinit"

This reverts commit 3eb14ea8d958 ("igb: Fix a deadlock in igb_sriov_reinit")
It is the same as commit f468adc944ef ("igb: missing rtnl_unlock in igb_sriov_reinit()")
There is no rtnl_lock() in igb_resume before, rtnl_unlock will cause a deadlock.

Signed-off-by Arika Chen <[email protected]>
---
 drivers/net/ethernet/intel/igb/igb_main.c | 1 -
 1 file changed, 1 deletion(-)
drivers/net/ethernet/intel/igb/igb_main.c +0 -1
index 55a1405c..b252f9c 100644
@@ -7574,7 +7574,6 @@ static int igb_resume(struct device *dev)
 
        if (igb_init_interrupt_scheme(adapter, true)) {
                dev_err(&pdev->dev, "Unable to allocate memory for queues\n");
-               rtnl_unlock();
                return -ENOMEM;
        }

--
1.8.5.2

#1 lore raw

PATCH 1/1 Revert "igb: Fix a deadlock in igb_sriov_reinit"

Quoted 16 lines

From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of c00176621
Sent: Tuesday, April 5, 2016 8:10 PM
To: intel-wired-lan at lists.osuosl.org
Cc: Liuyongan <[email protected]>; baijiaju1990 at 163.com; wangyunjian <[email protected]>
Subject: [Intel-wired-lan] [PATCH] Revert "igb: Fix a deadlock in igb_sriov_reinit"

This reverts commit 3eb14ea8d958 ("igb: Fix a deadlock in igb_sriov_reinit")
It is the same as commit f468adc944ef ("igb: missing rtnl_unlock in igb_sriov_reinit()")
There is no rtnl_lock() in igb_resume before, rtnl_unlock will cause a deadlock.

Quoted 4 lines
Signed-off-by Arika Chen <[email protected]>
---
 drivers/net/ethernet/intel/igb/igb_main.c | 1 -
 1 file changed, 1 deletion(-)

Yeah, it looks like the a rtnl_unlock got thrown into another function as a side effect of adding it to igb_sriov_reinit

Tested-by Aaron Brown <[email protected]>