Re: [e1000_netpoll] BUG: sleeping function called from invalid context at kernel/irq/manage.c:110
From: Jeff Kirsher <hidden>
Date: 2016-07-27 21:38:12
Also in:
intel-wired-lan, lkml
On Tue, 2016-07-26 at 11:14 +0200, Eric Dumazet wrote:
quoted hunk ↗ jump to hunk
Could you try this ?diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.cb/drivers/net/ethernet/intel/e1000/e1000_main.c index f42129d09e2c23ba9fdb5cde890d50ecb7166a42..a53c41c4c4f7d1fe52f95a2cab8784a 938b3820b 100644--- a/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c@@ -5257,9 +5257,13 @@ static void e1000_netpoll(struct net_device*netdev) { struct e1000_adapter *adapter = netdev_priv(netdev); - disable_irq(adapter->pdev->irq); - e1000_intr(adapter->pdev->irq, netdev); - enable_irq(adapter->pdev->irq); + if (napi_schedule_prep(&adapter->napi)) { + adapter->total_tx_bytes = 0; + adapter->total_tx_packets = 0; + adapter->total_rx_bytes = 0; + adapter->total_rx_packets = 0; + __napi_schedule(&adapter->napi); + } } #endif
Since this fixes the issue Fengguang saw, will you be submitting a formal patch Eric? (please) I can get this queued up for Dave's net tree as soon as I receive the formal patch.
Attachments
- signature.asc [application/pgp-signature] 819 bytes