[NET]: Fix interrupt semaphore corruption in Intel drivers.
Several of the Intel ethernet drivers keep an atomic counter used to manage when to actually hit the hardware with a disable or an enable. The way the net_rx_work() breakout logic works during a pending napi_disable() is that it simply unschedules the poll even if it still has work. This can potentially leave interrupts disabled, but that is OK because all of the drivers are about to disable interrupts anyways in all such code paths that do a napi_disable(). Unfortunately, this trips up the semaphore used here in the Intel drivers. If you hit this case, when you try to bring the interface back up it won't enable interrupts. A reload of the driver module fixes it of course. So what we do is make sure all the sequences now go: napi_disable(); atomic_set(&adapter->irq_sem, 0); *_irq_disable(); which makes sure the counter is always in the correct state. Reported by Robert Olsson. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
6725033fa2
commit
49d85c502e
|
@ -632,6 +632,7 @@ e1000_down(struct e1000_adapter *adapter)
|
||||||
|
|
||||||
#ifdef CONFIG_E1000_NAPI
|
#ifdef CONFIG_E1000_NAPI
|
||||||
napi_disable(&adapter->napi);
|
napi_disable(&adapter->napi);
|
||||||
|
atomic_set(&adapter->irq_sem, 0);
|
||||||
#endif
|
#endif
|
||||||
e1000_irq_disable(adapter);
|
e1000_irq_disable(adapter);
|
||||||
|
|
||||||
|
|
|
@ -2183,6 +2183,7 @@ void e1000e_down(struct e1000_adapter *adapter)
|
||||||
msleep(10);
|
msleep(10);
|
||||||
|
|
||||||
napi_disable(&adapter->napi);
|
napi_disable(&adapter->napi);
|
||||||
|
atomic_set(&adapter->irq_sem, 0);
|
||||||
e1000_irq_disable(adapter);
|
e1000_irq_disable(adapter);
|
||||||
|
|
||||||
del_timer_sync(&adapter->watchdog_timer);
|
del_timer_sync(&adapter->watchdog_timer);
|
||||||
|
|
|
@ -296,6 +296,11 @@ ixgb_down(struct ixgb_adapter *adapter, boolean_t kill_watchdog)
|
||||||
{
|
{
|
||||||
struct net_device *netdev = adapter->netdev;
|
struct net_device *netdev = adapter->netdev;
|
||||||
|
|
||||||
|
#ifdef CONFIG_IXGB_NAPI
|
||||||
|
napi_disable(&adapter->napi);
|
||||||
|
atomic_set(&adapter->irq_sem, 0);
|
||||||
|
#endif
|
||||||
|
|
||||||
ixgb_irq_disable(adapter);
|
ixgb_irq_disable(adapter);
|
||||||
free_irq(adapter->pdev->irq, netdev);
|
free_irq(adapter->pdev->irq, netdev);
|
||||||
|
|
||||||
|
@ -304,9 +309,7 @@ ixgb_down(struct ixgb_adapter *adapter, boolean_t kill_watchdog)
|
||||||
|
|
||||||
if(kill_watchdog)
|
if(kill_watchdog)
|
||||||
del_timer_sync(&adapter->watchdog_timer);
|
del_timer_sync(&adapter->watchdog_timer);
|
||||||
#ifdef CONFIG_IXGB_NAPI
|
|
||||||
napi_disable(&adapter->napi);
|
|
||||||
#endif
|
|
||||||
adapter->link_speed = 0;
|
adapter->link_speed = 0;
|
||||||
adapter->link_duplex = 0;
|
adapter->link_duplex = 0;
|
||||||
netif_carrier_off(netdev);
|
netif_carrier_off(netdev);
|
||||||
|
|
|
@ -1409,9 +1409,11 @@ void ixgbe_down(struct ixgbe_adapter *adapter)
|
||||||
IXGBE_WRITE_FLUSH(&adapter->hw);
|
IXGBE_WRITE_FLUSH(&adapter->hw);
|
||||||
msleep(10);
|
msleep(10);
|
||||||
|
|
||||||
|
napi_disable(&adapter->napi);
|
||||||
|
atomic_set(&adapter->irq_sem, 0);
|
||||||
|
|
||||||
ixgbe_irq_disable(adapter);
|
ixgbe_irq_disable(adapter);
|
||||||
|
|
||||||
napi_disable(&adapter->napi);
|
|
||||||
del_timer_sync(&adapter->watchdog_timer);
|
del_timer_sync(&adapter->watchdog_timer);
|
||||||
|
|
||||||
netif_carrier_off(netdev);
|
netif_carrier_off(netdev);
|
||||||
|
|
Loading…
Reference in New Issue