]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
i40e: Invoke softirqs after napi_reschedule
authorBenjamin Poirier <bpoirier@suse.com>
Fri, 13 Jan 2017 01:04:14 +0000 (17:04 -0800)
committerJack Vogel <jack.vogel@oracle.com>
Sat, 10 Jun 2017 01:57:02 +0000 (18:57 -0700)
The following message is logged from time to time when using i40e:
NOHZ: local_softirq_pending 08

i40e may schedule napi from a workqueue. Afterwards, softirqs are not run
in a deterministic time frame. The problem is the same as what was
described in commit ec13ee80145c ("virtio_net: invoke softirqs after
__napi_schedule") and this patch applies the same fix to i40e.

Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Orabug: 26132523
(cherry picked from commit 83a0c6e589017ce737720b9e05e2fa3fe4f7b860)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
Reviewed-by: Brian Maly <brian.maly@oracle.com>
drivers/net/ethernet/intel/i40e/i40e_main.c

index 88cb6e157e0396e63d89eb5ed127e1b97048e5fa..48be69929e53947920492e2a5174e19af6f42faf 100644 (file)
@@ -4649,8 +4649,10 @@ static void i40e_detect_recover_hung_queue(int q_idx, struct i40e_vsi *vsi)
         */
        if ((!tx_pending_hw) && i40e_get_tx_pending(tx_ring, true) &&
            (!(val & I40E_PFINT_DYN_CTLN_INTENA_MASK))) {
+               local_bh_disable();
                if (napi_reschedule(&tx_ring->q_vector->napi))
                        tx_ring->tx_stats.tx_lost_interrupt++;
+               local_bh_enable();
        }
 }