| Message ID | 20220811202524.78323-1-vinicius.gomes@intel.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [WIP,v2] igc: fix deadlock caused by taking RTNL in RPM resume path | expand |
On Thursday, 11 August 2022 21:25:24 BST Vinicius Costa Gomes wrote: > It was reported a RTNL deadlock in the igc driver that was causing > problems during suspend/resume. > > The solution is similar to commit ac8c58f5b535 ("igb: fix deadlock > caused by taking RTNL in RPM resume path"). > > Reported-by: James Hogan <jhogan@kernel.org> > Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com> > --- > Sorry for the noise earlier, my kernel config didn't have runtime PM > enabled. Thanks for looking into this. This is identical to the patch I've been running for the last week. The deadlock is avoided, however I now occasionally see an assertion from netif_set_real_num_tx_queues due to the lock not being taken in some cases via the runtime_resume path, and a suspicious rcu_dereference_protected() warning (presumably due to the same issue of the lock not being taken). See here for details: https://lore.kernel.org/netdev/4765029.31r3eYUQgx@saruman/ Cheers James
Hi James, James Hogan <jhogan@kernel.org> writes: > On Thursday, 11 August 2022 21:25:24 BST Vinicius Costa Gomes wrote: >> It was reported a RTNL deadlock in the igc driver that was causing >> problems during suspend/resume. >> >> The solution is similar to commit ac8c58f5b535 ("igb: fix deadlock >> caused by taking RTNL in RPM resume path"). >> >> Reported-by: James Hogan <jhogan@kernel.org> >> Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com> >> --- >> Sorry for the noise earlier, my kernel config didn't have runtime PM >> enabled. > > Thanks for looking into this. > > This is identical to the patch I've been running for the last week. The > deadlock is avoided, however I now occasionally see an assertion from > netif_set_real_num_tx_queues due to the lock not being taken in some cases via > the runtime_resume path, and a suspicious rcu_dereference_protected() warning > (presumably due to the same issue of the lock not being taken). See here for > details: > https://lore.kernel.org/netdev/4765029.31r3eYUQgx@saruman/ Oh, sorry. I missed the part that the rtnl assert splat was already using similar/identical code to what I got/copied from igb. So what this seems to be telling us is that the "fix" from igb is only hiding the issue, and we would need to remove the need for taking the RTNL for the suspend/resume paths in igc and igb? (as someone else said in that igb thread, iirc) Cheers,
On Saturday, 13 August 2022 01:05:41 BST Vinicius Costa Gomes wrote: > James Hogan <jhogan@kernel.org> writes: > > On Thursday, 11 August 2022 21:25:24 BST Vinicius Costa Gomes wrote: > >> It was reported a RTNL deadlock in the igc driver that was causing > >> problems during suspend/resume. > >> > >> The solution is similar to commit ac8c58f5b535 ("igb: fix deadlock > >> caused by taking RTNL in RPM resume path"). > >> > >> Reported-by: James Hogan <jhogan@kernel.org> > >> Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com> > >> --- > >> Sorry for the noise earlier, my kernel config didn't have runtime PM > >> enabled. > > > > Thanks for looking into this. > > > > This is identical to the patch I've been running for the last week. The > > deadlock is avoided, however I now occasionally see an assertion from > > netif_set_real_num_tx_queues due to the lock not being taken in some cases > > via the runtime_resume path, and a suspicious rcu_dereference_protected() > > warning (presumably due to the same issue of the lock not being taken). > > See here for details: > > https://lore.kernel.org/netdev/4765029.31r3eYUQgx@saruman/ > > Oh, sorry. I missed the part that the rtnl assert splat was already > using similar/identical code to what I got/copied from igb. > > So what this seems to be telling us is that the "fix" from igb is only > hiding the issue, I suppose the patch just changes the assumption from "lock will never be held on runtime resume path" (incorrect, deadlock) to "lock will always be held on runtime resume path" (also incorrect, probably racy). > and we would need to remove the need for taking the > RTNL for the suspend/resume paths in igc and igb? (as someone else said > in that igb thread, iirc) (I'll defer to others on this. I'm pretty unfamiliar with networking code and this particular lock.) Cheers James
On Saturday, 13 August 2022 18:18:25 BST James Hogan wrote: > On Saturday, 13 August 2022 01:05:41 BST Vinicius Costa Gomes wrote: > > James Hogan <jhogan@kernel.org> writes: > > > On Thursday, 11 August 2022 21:25:24 BST Vinicius Costa Gomes wrote: > > >> It was reported a RTNL deadlock in the igc driver that was causing > > >> problems during suspend/resume. > > >> > > >> The solution is similar to commit ac8c58f5b535 ("igb: fix deadlock > > >> caused by taking RTNL in RPM resume path"). > > >> > > >> Reported-by: James Hogan <jhogan@kernel.org> > > >> Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com> > > >> --- > > >> Sorry for the noise earlier, my kernel config didn't have runtime PM > > >> enabled. > > > > > > Thanks for looking into this. > > > > > > This is identical to the patch I've been running for the last week. The > > > deadlock is avoided, however I now occasionally see an assertion from > > > netif_set_real_num_tx_queues due to the lock not being taken in some > > > cases > > > via the runtime_resume path, and a suspicious > > > rcu_dereference_protected() > > > warning (presumably due to the same issue of the lock not being taken). > > > See here for details: > > > https://lore.kernel.org/netdev/4765029.31r3eYUQgx@saruman/ > > > > Oh, sorry. I missed the part that the rtnl assert splat was already > > using similar/identical code to what I got/copied from igb. > > > > So what this seems to be telling us is that the "fix" from igb is only > > hiding the issue, > > I suppose the patch just changes the assumption from "lock will never be > held on runtime resume path" (incorrect, deadlock) to "lock will always be > held on runtime resume path" (also incorrect, probably racy). > > > and we would need to remove the need for taking the > > RTNL for the suspend/resume paths in igc and igb? (as someone else said > > in that igb thread, iirc) > > (I'll defer to others on this. I'm pretty unfamiliar with networking code > and this particular lock.) I'd be great to have this longstanding issue properly fixed rather than having to carry a patch locally that may not be lock safe. Also, any tips for diagnosing the issue of the network link not coming back up after resume? I sometimes have to unload and reload the driver module to get it back again. Cheers James
On Monday, 29 August 2022 09:16:33 BST James Hogan wrote: > On Saturday, 13 August 2022 18:18:25 BST James Hogan wrote: > > On Saturday, 13 August 2022 01:05:41 BST Vinicius Costa Gomes wrote: > > > James Hogan <jhogan@kernel.org> writes: > > > > On Thursday, 11 August 2022 21:25:24 BST Vinicius Costa Gomes wrote: > > > >> It was reported a RTNL deadlock in the igc driver that was causing > > > >> problems during suspend/resume. > > > >> > > > >> The solution is similar to commit ac8c58f5b535 ("igb: fix deadlock > > > >> caused by taking RTNL in RPM resume path"). > > > >> > > > >> Reported-by: James Hogan <jhogan@kernel.org> > > > >> Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com> > > > >> --- > > > >> Sorry for the noise earlier, my kernel config didn't have runtime PM > > > >> enabled. > > > > > > > > Thanks for looking into this. > > > > > > > > This is identical to the patch I've been running for the last week. > > > > The > > > > deadlock is avoided, however I now occasionally see an assertion from > > > > netif_set_real_num_tx_queues due to the lock not being taken in some > > > > cases > > > > via the runtime_resume path, and a suspicious > > > > rcu_dereference_protected() > > > > warning (presumably due to the same issue of the lock not being > > > > taken). > > > > See here for details: > > > > https://lore.kernel.org/netdev/4765029.31r3eYUQgx@saruman/ > > > > > > Oh, sorry. I missed the part that the rtnl assert splat was already > > > using similar/identical code to what I got/copied from igb. > > > > > > So what this seems to be telling us is that the "fix" from igb is only > > > hiding the issue, > > > > I suppose the patch just changes the assumption from "lock will never be > > held on runtime resume path" (incorrect, deadlock) to "lock will always be > > held on runtime resume path" (also incorrect, probably racy). > > > > > and we would need to remove the need for taking the > > > RTNL for the suspend/resume paths in igc and igb? (as someone else said > > > in that igb thread, iirc) > > > > (I'll defer to others on this. I'm pretty unfamiliar with networking code > > and this particular lock.) > > I'd be great to have this longstanding issue properly fixed rather than > having to carry a patch locally that may not be lock safe. > > Also, any tips for diagnosing the issue of the network link not coming back > up after resume? I sometimes have to unload and reload the driver module to > get it back again. Any thoughts on this from anybody? Cheers James
On Sunday, 2 October 2022 11:56:28 BST James Hogan wrote: > On Monday, 29 August 2022 09:16:33 BST James Hogan wrote: > > On Saturday, 13 August 2022 18:18:25 BST James Hogan wrote: > > > On Saturday, 13 August 2022 01:05:41 BST Vinicius Costa Gomes wrote: > > > > James Hogan <jhogan@kernel.org> writes: > > > > > On Thursday, 11 August 2022 21:25:24 BST Vinicius Costa Gomes wrote: > > > > >> It was reported a RTNL deadlock in the igc driver that was causing > > > > >> problems during suspend/resume. > > > > >> > > > > >> The solution is similar to commit ac8c58f5b535 ("igb: fix deadlock > > > > >> caused by taking RTNL in RPM resume path"). > > > > >> > > > > >> Reported-by: James Hogan <jhogan@kernel.org> > > > > >> Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com> > > > > >> --- > > > > >> Sorry for the noise earlier, my kernel config didn't have runtime > > > > >> PM > > > > >> enabled. > > > > > > > > > > Thanks for looking into this. > > > > > > > > > > This is identical to the patch I've been running for the last week. > > > > > The > > > > > deadlock is avoided, however I now occasionally see an assertion > > > > > from > > > > > netif_set_real_num_tx_queues due to the lock not being taken in some > > > > > cases > > > > > via the runtime_resume path, and a suspicious > > > > > rcu_dereference_protected() > > > > > warning (presumably due to the same issue of the lock not being > > > > > taken). > > > > > See here for details: > > > > > https://lore.kernel.org/netdev/4765029.31r3eYUQgx@saruman/ > > > > > > > > Oh, sorry. I missed the part that the rtnl assert splat was already > > > > using similar/identical code to what I got/copied from igb. > > > > > > > > So what this seems to be telling us is that the "fix" from igb is only > > > > hiding the issue, > > > > > > I suppose the patch just changes the assumption from "lock will never be > > > held on runtime resume path" (incorrect, deadlock) to "lock will always > > > be > > > held on runtime resume path" (also incorrect, probably racy). > > > > > > > and we would need to remove the need for taking the > > > > RTNL for the suspend/resume paths in igc and igb? (as someone else > > > > said > > > > in that igb thread, iirc) > > > > > > (I'll defer to others on this. I'm pretty unfamiliar with networking > > > code > > > and this particular lock.) > > > > I'd be great to have this longstanding issue properly fixed rather than > > having to carry a patch locally that may not be lock safe. > > > > Also, any tips for diagnosing the issue of the network link not coming > > back > > up after resume? I sometimes have to unload and reload the driver module > > to > > get it back again. > > Any thoughts on this from anybody? Ping... I've been carrying this patch locally on archlinux for almost a year now. Every time I update my kernel and forget to rebuild with the patch it catches me out with deadlocks after resume, and even with the patch I frequently have to reload the igc module after resume to get the network to come up (which is preferable to deadlocks but still really sucks). I'd really appreciate if it could get some attention. Many thanks James
Hi James, James Hogan <jhogan@kernel.org> writes: > On Sunday, 2 October 2022 11:56:28 BST James Hogan wrote: >> On Monday, 29 August 2022 09:16:33 BST James Hogan wrote: >> > On Saturday, 13 August 2022 18:18:25 BST James Hogan wrote: >> > > On Saturday, 13 August 2022 01:05:41 BST Vinicius Costa Gomes wrote: >> > > > James Hogan <jhogan@kernel.org> writes: >> > > > > On Thursday, 11 August 2022 21:25:24 BST Vinicius Costa Gomes wrote: >> > > > >> It was reported a RTNL deadlock in the igc driver that was causing >> > > > >> problems during suspend/resume. >> > > > >> >> > > > >> The solution is similar to commit ac8c58f5b535 ("igb: fix deadlock >> > > > >> caused by taking RTNL in RPM resume path"). >> > > > >> >> > > > >> Reported-by: James Hogan <jhogan@kernel.org> >> > > > >> Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com> >> > > > >> --- >> > > > >> Sorry for the noise earlier, my kernel config didn't have runtime >> > > > >> PM >> > > > >> enabled. >> > > > > >> > > > > Thanks for looking into this. >> > > > > >> > > > > This is identical to the patch I've been running for the last week. >> > > > > The >> > > > > deadlock is avoided, however I now occasionally see an assertion >> > > > > from >> > > > > netif_set_real_num_tx_queues due to the lock not being taken in some >> > > > > cases >> > > > > via the runtime_resume path, and a suspicious >> > > > > rcu_dereference_protected() >> > > > > warning (presumably due to the same issue of the lock not being >> > > > > taken). >> > > > > See here for details: >> > > > > https://lore.kernel.org/netdev/4765029.31r3eYUQgx@saruman/ >> > > > >> > > > Oh, sorry. I missed the part that the rtnl assert splat was already >> > > > using similar/identical code to what I got/copied from igb. >> > > > >> > > > So what this seems to be telling us is that the "fix" from igb is only >> > > > hiding the issue, >> > > >> > > I suppose the patch just changes the assumption from "lock will never be >> > > held on runtime resume path" (incorrect, deadlock) to "lock will always >> > > be >> > > held on runtime resume path" (also incorrect, probably racy). >> > > >> > > > and we would need to remove the need for taking the >> > > > RTNL for the suspend/resume paths in igc and igb? (as someone else >> > > > said >> > > > in that igb thread, iirc) >> > > >> > > (I'll defer to others on this. I'm pretty unfamiliar with networking >> > > code >> > > and this particular lock.) >> > >> > I'd be great to have this longstanding issue properly fixed rather than >> > having to carry a patch locally that may not be lock safe. >> > >> > Also, any tips for diagnosing the issue of the network link not coming >> > back >> > up after resume? I sometimes have to unload and reload the driver module >> > to >> > get it back again. >> >> Any thoughts on this from anybody? > > Ping... I've been carrying this patch locally on archlinux for almost a year > now. Every time I update my kernel and forget to rebuild with the patch it > catches me out with deadlocks after resume, and even with the patch I > frequently have to reload the igc module after resume to get the network to > come up (which is preferable to deadlocks but still really sucks). I'd really > appreciate if it could get some attention. I am setting up my test systems to reproduce the deadlocks, then let's see what ideas happen about removing the need for those locks. About the link failures, are there any error messages in the kernel logs? (also, if you could share those logs, can be off-list, it would help) I am trying to think what could be happening, and how to further debug this. Cheers,
On Tuesday, 29 August 2023 02:58:42 BST Vinicius Costa Gomes wrote: > James Hogan <jhogan@kernel.org> writes: > > On Sunday, 2 October 2022 11:56:28 BST James Hogan wrote: > >> On Monday, 29 August 2022 09:16:33 BST James Hogan wrote: > >> > I'd be great to have this longstanding issue properly fixed rather than > >> > having to carry a patch locally that may not be lock safe. > >> > > >> > Also, any tips for diagnosing the issue of the network link not coming > >> > back > >> > up after resume? I sometimes have to unload and reload the driver > >> > module > >> > to > >> > get it back again. > >> > >> Any thoughts on this from anybody? > > > > Ping... I've been carrying this patch locally on archlinux for almost a > > year now. Every time I update my kernel and forget to rebuild with the > > patch it catches me out with deadlocks after resume, and even with the > > patch I frequently have to reload the igc module after resume to get the > > network to come up (which is preferable to deadlocks but still really > > sucks). I'd really appreciate if it could get some attention. > > I am setting up my test systems to reproduce the deadlocks, then let's > see what ideas happen about removing the need for those locks. > > About the link failures, are there any error messages in the kernel > logs? (also, if you could share those logs, can be off-list, it would > help) I am trying to think what could be happening, and how to further > debug this. Looking through the resume log, the only network/igc related items are these: Sep 03 18:28:17 saruman kernel: igc 0000:06:00.0 enp6s0: NIC Link is Up 1000 Mbps Full Duplex, Flow Control: RX Sep 03 18:28:17 saruman NetworkManager[1016]: <info> [1693762097.7180] manager: sleep: wake requested (sleeping: yes enabled: yes) Sep 03 18:28:17 saruman NetworkManager[1016]: <info> [1693762097.7181] device (enp6s0): state change: activated -> unmanaged (reason 'sleeping', sys-iface-state: 'managed') Sep 03 18:28:17 saruman avahi-daemon[989]: Withdrawing address record for 192.168.1.239 on enp6s0. Sep 03 18:28:17 saruman avahi-daemon[989]: Leaving mDNS multicast group on interface enp6s0.IPv4 with address 192.168.1.239. Sep 03 18:28:17 saruman avahi-daemon[989]: Interface enp6s0.IPv4 no longer relevant for mDNS. Sep 03 18:28:17 saruman NetworkManager[1016]: <info> [1693762097.8202] manager: NetworkManager state is now CONNECTED_GLOBAL Sep 03 18:28:17 saruman NetworkManager[1016]: <info> [1693762097.8657] manager: NetworkManager state is now DISCONNECTED Sep 03 18:28:17 saruman NetworkManager[1016]: <info> [1693762097.8660] device (enp6s0): state change: unmanaged -> unavailable (reason 'managed', sys-iface-state: 'external') Sep 03 18:28:17 saruman systemd[1]: Starting Network Manager Script Dispatcher Service... Sep 03 18:28:17 saruman systemd[1]: Started Network Manager Script Dispatcher Service. Sep 03 18:28:21 saruman NetworkManager[1016]: <info> [1693762101.3075] device (enp6s0): carrier: link connected Sep 03 18:28:21 saruman NetworkManager[1016]: <info> [1693762101.3076] device (enp6s0): state change: unavailable -> disconnected (reason 'carrier-changed', sys-iface-state: 'managed') Sep 03 18:28:21 saruman NetworkManager[1016]: <info> [1693762101.3080] policy: auto-activating connection 'Wired connection 1' (f6634f16-77ca-34f7-846a-8c41e15a8ad1) Sep 03 18:28:21 saruman NetworkManager[1016]: <info> [1693762101.3082] device (enp6s0): Activation: starting connection 'Wired connection 1' (f6634f16-77ca-34f7-846a-8c41e15a8ad1) Sep 03 18:28:21 saruman NetworkManager[1016]: <info> [1693762101.3082] device (enp6s0): state change: disconnected -> prepare (reason 'none', sys-iface-state: 'managed') Sep 03 18:28:21 saruman NetworkManager[1016]: <info> [1693762101.3083] manager: NetworkManager state is now CONNECTING Sep 03 18:28:21 saruman kernel: igc 0000:06:00.0 enp6s0: NIC Link is Up 1000 Mbps Full Duplex, Flow Control: RX Sep 03 18:28:21 saruman kernel: IPv6: ADDRCONF(NETDEV_CHANGE): enp6s0: link becomes ready Sep 03 18:28:21 saruman NetworkManager[1016]: <info> [1693762101.3506] device (enp6s0): state change: prepare -> config (reason 'none', sys-iface-state: 'managed') Sep 03 18:28:21 saruman NetworkManager[1016]: <info> [1693762101.3512] device (enp6s0): state change: config -> ip-config (reason 'none', sys-iface-state: 'managed') Sep 03 18:28:21 saruman NetworkManager[1016]: <info> [1693762101.3515] policy: set 'Wired connection 1' (enp6s0) as default for IPv4 routing and DNS Sep 03 18:28:21 saruman avahi-daemon[989]: Joining mDNS multicast group on interface enp6s0.IPv4 with address 192.168.1.239. Sep 03 18:28:21 saruman avahi-daemon[989]: New relevant interface enp6s0.IPv4 for mDNS. Sep 03 18:28:21 saruman avahi-daemon[989]: Registering new address record for 192.168.1.239 on enp6s0.IPv4. Sep 03 18:28:22 saruman systemd[1]: systemd-rfkill.service: Deactivated successfully. Sep 03 18:28:23 saruman NetworkManager[1016]: <info> [1693762103.3544] device (enp6s0): state change: ip-config -> ip-check (reason 'none', sys-iface-state: 'managed') Sep 03 18:28:23 saruman NetworkManager[1016]: <info> [1693762103.3553] device (enp6s0): state change: ip-check -> secondaries (reason 'none', sys-iface-state: 'managed') Sep 03 18:28:23 saruman NetworkManager[1016]: <info> [1693762103.3554] device (enp6s0): state change: secondaries -> activated (reason 'none', sys-iface-state: 'managed') Sep 03 18:28:23 saruman NetworkManager[1016]: <info> [1693762103.3555] manager: NetworkManager state is now CONNECTED_SITE Sep 03 18:28:23 saruman NetworkManager[1016]: <info> [1693762103.3556] device (enp6s0): Activation: successful, device activated. Sep 03 18:28:27 saruman NetworkManager[1016]: <info> [1693762107.3532] device (enp6s0): state change: activated -> unavailable (reason 'carrier-changed', sys-iface-state: 'managed') Sep 03 18:28:27 saruman avahi-daemon[989]: Withdrawing address record for 192.168.1.239 on enp6s0. Sep 03 18:28:27 saruman avahi-daemon[989]: Leaving mDNS multicast group on interface enp6s0.IPv4 with address 192.168.1.239. Sep 03 18:28:27 saruman avahi-daemon[989]: Interface enp6s0.IPv4 no longer relevant for mDNS. Sep 03 18:28:27 saruman NetworkManager[1016]: <info> [1693762107.5266] manager: NetworkManager state is now CONNECTED_LOCAL Sep 03 18:28:27 saruman NetworkManager[1016]: <info> [1693762107.5267] manager: NetworkManager state is now DISCONNECTED Sep 03 18:28:27 saruman systemd[1]: NetworkManager-dispatcher.service: Deactivated successfully. As mentioned previously, CONFIG_PROVE_LOCKING=y and I'm seeing splats during boot, notably RTNL assertion failed at net/core/dev.c (2877) and suspicious RCU usage. Cheers James
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c index ebff0e04045d..9b0d4becfcfc 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -6600,7 +6600,7 @@ static void igc_deliver_wake_packet(struct net_device *netdev) netif_rx(skb); } -static int __maybe_unused igc_resume(struct device *dev) +static int __maybe_unused __igc_resume(struct device *dev, bool rpm) { struct pci_dev *pdev = to_pci_dev(dev); struct net_device *netdev = pci_get_drvdata(pdev); @@ -6642,20 +6642,27 @@ static int __maybe_unused igc_resume(struct device *dev) wr32(IGC_WUS, ~0); - rtnl_lock(); + if (!rpm) + rtnl_lock(); if (!err && netif_running(netdev)) err = __igc_open(netdev, true); if (!err) netif_device_attach(netdev); - rtnl_unlock(); + if (!rpm) + rtnl_unlock(); return err; } static int __maybe_unused igc_runtime_resume(struct device *dev) { - return igc_resume(dev); + return __igc_resume(dev, true); +} + +static int __maybe_unused igc_resume(struct device *dev) +{ + return __igc_resume(dev, false); } static int __maybe_unused igc_suspend(struct device *dev) @@ -6719,7 +6726,7 @@ static pci_ers_result_t igc_io_error_detected(struct pci_dev *pdev, * @pdev: Pointer to PCI device * * Restart the card from scratch, as if from a cold-boot. Implementation - * resembles the first-half of the igc_resume routine. + * resembles the first-half of the __igc_resume routine. **/ static pci_ers_result_t igc_io_slot_reset(struct pci_dev *pdev) { @@ -6758,7 +6765,7 @@ static pci_ers_result_t igc_io_slot_reset(struct pci_dev *pdev) * * This callback is called when the error recovery driver tells us that * its OK to resume normal operation. Implementation resembles the - * second-half of the igc_resume routine. + * second-half of the __igc_resume routine. */ static void igc_io_resume(struct pci_dev *pdev) {
It was reported a RTNL deadlock in the igc driver that was causing problems during suspend/resume. The solution is similar to commit ac8c58f5b535 ("igb: fix deadlock caused by taking RTNL in RPM resume path"). Reported-by: James Hogan <jhogan@kernel.org> Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com> --- Sorry for the noise earlier, my kernel config didn't have runtime PM enabled. drivers/net/ethernet/intel/igc/igc_main.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)