net/ena: use napi_complete_done() return value

BugLink: http://bugs.launchpad.net/bugs/1701575
Do not unamsk interrupts if we are in busy poll mode.

Signed-off-by: Netanel Belgazal <netanel@annapurnalabs.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit b1669c9f5ac9d50651889e22e4a82f1b34af32d3)
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>

diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index 203b6b1a690c36012c80565c384014bb4e5be2c4..fca8d51d0f91ee707c7b684dac66d6f9782f8d46 100644 (file)
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -1130,26 +1130,40 @@ static int ena_io_poll(struct napi_struct *napi, int budget)
        tx_work_done = ena_clean_tx_irq(tx_ring, tx_budget);
        rx_work_done = ena_clean_rx_irq(rx_ring, napi, budget);
 
-       if ((budget > rx_work_done) && (tx_budget > tx_work_done)) {
-               napi_complete_done(napi, rx_work_done);
+       /* If the device is about to reset or down, avoid unmask
+        * the interrupt and return 0 so NAPI won't reschedule
+        */
+       if (unlikely(!test_bit(ENA_FLAG_DEV_UP, &tx_ring->adapter->flags) ||
+                    test_bit(ENA_FLAG_TRIGGER_RESET, &tx_ring->adapter->flags))) {
+               napi_complete_done(napi, 0);
+               ret = 0;
 
+       } else if ((budget > rx_work_done) && (tx_budget > tx_work_done)) {
                napi_comp_call = 1;
-               /* Tx and Rx share the same interrupt vector */
-               if (ena_com_get_adaptive_moderation_enabled(rx_ring->ena_dev))
-                       ena_adjust_intr_moderation(rx_ring, tx_ring);
 
-               /* Update intr register: rx intr delay, tx intr delay and
-                * interrupt unmask
+               /* Update numa and unmask the interrupt only when schedule
+                * from the interrupt context (vs from sk_busy_loop)
                 */
-               ena_com_update_intr_reg(&intr_reg,
-                                       rx_ring->smoothed_interval,
-                                       tx_ring->smoothed_interval,
-                                       true);
+               if (napi_complete_done(napi, rx_work_done)) {
+                       /* Tx and Rx share the same interrupt vector */
+                       if (ena_com_get_adaptive_moderation_enabled(rx_ring->ena_dev))
+                               ena_adjust_intr_moderation(rx_ring, tx_ring);
+
+                       /* Update intr register: rx intr delay,
+                        * tx intr delay and interrupt unmask
+                        */
+                       ena_com_update_intr_reg(&intr_reg,
+                                               rx_ring->smoothed_interval,
+                                               tx_ring->smoothed_interval,
+                                               true);
+
+                       /* It is a shared MSI-X.
+                        * Tx and Rx CQ have pointer to it.
+                        * So we use one of them to reach the intr reg
+                        */
+                       ena_com_unmask_intr(rx_ring->ena_com_io_cq, &intr_reg);
+               }
 
-               /* It is a shared MSI-X. Tx and Rx CQ have pointer to it.
-                * So we use one of them to reach the intr reg
-                */
-               ena_com_unmask_intr(rx_ring->ena_com_io_cq, &intr_reg);
 
                ena_update_ring_numa_node(tx_ring, rx_ring);