Since commit ac8c58f5b535 ("igb: fix deadlock caused by taking RTNL in RPM resume path") __igb_resume() doesn't take RTNL for runtime resume, but __igb_open() still calls netif_set_real_num_{tx,rx}_queues(), which require it. An asynchronous runtime resume (e.g. after the link comes back) then triggers "RTNL: assertion failed". Skip them when resuming. The counts are set again on every regular open, which happens under RTNL; the only case left out is a fallback from MSI-X to MSI during a resume, which leaves the stack with more queues than the device uses until the next open. Tested with the 82576 emulated by QEMU. Fixes: ac8c58f5b535 ("igb: fix deadlock caused by taking RTNL in RPM resume path") Cc: stable@vger.kernel.org Closes: https://bugzilla.ipfire.org/show_bug.cgi?id=13562 Signed-off-by: Antonio Quartulli --- v2: - keep setting the queue counts in __igb_open() after igb_request_irq(), only skipping them on runtime resume: setting them in igb_open() before the device was resumed broke the MSI-X to MSI fallback and XDP setup on a runtime suspended device (Sashiko) - drop the reference to igc, which has the same ordering problem Note: igc sets the queue counts in igc_open() before igc_request_irq(), which can fall back to MSI, since 6f31d6b643a3 ("igc: Refactor runtime power management flow"). We didn't have igc hardware to test a fix with, so no igc patch is sent for now. drivers/net/ethernet/intel/igb/igb_main.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 78f0786..4447546 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -4178,16 +4178,20 @@ static int __igb_open(struct net_device *netdev, bool resuming) if (err) goto err_req_irq; - /* Notify the stack of the actual queue counts. */ - err = netif_set_real_num_tx_queues(adapter->netdev, - adapter->num_tx_queues); - if (err) - goto err_set_queues; + /* Notify the stack of the actual queue counts. This needs RTNL, + * which isn't held when resuming from runtime suspend. + */ + if (!resuming) { + err = netif_set_real_num_tx_queues(adapter->netdev, + adapter->num_tx_queues); + if (err) + goto err_set_queues; - err = netif_set_real_num_rx_queues(adapter->netdev, - adapter->num_rx_queues); - if (err) - goto err_set_queues; + err = netif_set_real_num_rx_queues(adapter->netdev, + adapter->num_rx_queues); + if (err) + goto err_set_queues; + } /* From here on the code is the same as igb_up() */ clear_bit(__IGB_DOWN, &adapter->state); -- 2.56.0