e1000e: use disable_hardirq() also for MSIX vectors in e1000_netpoll()

Replace disable_irq() which waits for threaded irq handlers with
disable_hardirq() which waits only for hardirq part.

Fixes: 311191297125 ("e1000: use disable_hardirq() for e1000_netpoll()")
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Acked-by: Cong Wang <xiyou.wangcong@gmail.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Orabug: 26243014
(cherry picked from commit fd8e597ba4afb769a8fb642555a6e0c5349a6ae8)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
Reviewed-by: Ethan Zhao <ethan.zhao@oracle.com>

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 083f095e1cab8591d1180627bd7b12c3c7fa3b84..2e879e70cdbd62d32b690fe48f20de3aecc2a9f0 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -6748,20 +6748,20 @@ static irqreturn_t e1000_intr_msix(int __always_unused irq, void *data)
 
                vector = 0;
                msix_irq = adapter->msix_entries[vector].vector;
-               disable_irq(msix_irq);
-               e1000_intr_msix_rx(msix_irq, netdev);
+               if (disable_hardirq(msix_irq))
+                       e1000_intr_msix_rx(msix_irq, netdev);
                enable_irq(msix_irq);
 
                vector++;
                msix_irq = adapter->msix_entries[vector].vector;
-               disable_irq(msix_irq);
-               e1000_intr_msix_tx(msix_irq, netdev);
+               if (disable_hardirq(msix_irq))
+                       e1000_intr_msix_tx(msix_irq, netdev);
                enable_irq(msix_irq);
 
                vector++;
                msix_irq = adapter->msix_entries[vector].vector;
-               disable_irq(msix_irq);
-               e1000_msix_other(msix_irq, netdev);
+               if (disable_hardirq(msix_irq))
+                       e1000_msix_other(msix_irq, netdev);
                enable_irq(msix_irq);
        }