lkml.org 
[lkml]   [2018]   [Oct]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 168/168] ixgbe: check return value of napi_complete_done()
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Song Liu <songliubraving@fb.com>

    commit 4233cfe6ec4683497d7318f55ce7617e97f2e610 upstream.

    The NIC driver should only enable interrupts when napi_complete_done()
    returns true. This patch adds the check for ixgbe.

    Cc: stable@vger.kernel.org # 4.10+
    Suggested-by: Eric Dumazet <edumazet@google.com>
    Signed-off-by: Song Liu <songliubraving@fb.com>
    Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 12 +++++++-----
    1 file changed, 7 insertions(+), 5 deletions(-)

    --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
    +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
    @@ -3196,11 +3196,13 @@ int ixgbe_poll(struct napi_struct *napi,
    return budget;

    /* all work done, exit the polling mode */
    - napi_complete_done(napi, work_done);
    - if (adapter->rx_itr_setting & 1)
    - ixgbe_set_itr(q_vector);
    - if (!test_bit(__IXGBE_DOWN, &adapter->state))
    - ixgbe_irq_enable_queues(adapter, BIT_ULL(q_vector->v_idx));
    + if (likely(napi_complete_done(napi, work_done))) {
    + if (adapter->rx_itr_setting & 1)
    + ixgbe_set_itr(q_vector);
    + if (!test_bit(__IXGBE_DOWN, &adapter->state))
    + ixgbe_irq_enable_queues(adapter,
    + BIT_ULL(q_vector->v_idx));
    + }

    return min(work_done, budget - 1);
    }

    \
     
     \ /
      Last update: 2018-10-08 20:55    [W:3.590 / U:0.484 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site