lkml.org 
[lkml]   [2019]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.20 248/304] ice: Do not enable NAPI on q_vectors that have no rings
    Date
    From: Young Xiao <YangX92@hotmail.com>

    [ Upstream commit eec903769b4ea476591ffff73bb7359f14f38c51 ]

    If ice driver has q_vectors w/ active NAPI that has no rings,
    then this will result in a divide by zero error. To correct it
    I am updating the driver code so that we only support NAPI on
    q_vectors that have 1 or more rings allocated to them.

    See commit 13a8cd191a2b ("i40e: Do not enable NAPI on q_vectors
    that have no rings") for detail.

    Signed-off-by: Young Xiao <YangX92@hotmail.com>
    Acked-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
    Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/intel/ice/ice_main.c | 16 ++++++++++++----
    1 file changed, 12 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
    index 333312a1d595..945000449279 100644
    --- a/drivers/net/ethernet/intel/ice/ice_main.c
    +++ b/drivers/net/ethernet/intel/ice/ice_main.c
    @@ -2563,8 +2563,12 @@ static void ice_napi_enable_all(struct ice_vsi *vsi)
    if (!vsi->netdev)
    return;

    - for (q_idx = 0; q_idx < vsi->num_q_vectors; q_idx++)
    - napi_enable(&vsi->q_vectors[q_idx]->napi);
    + for (q_idx = 0; q_idx < vsi->num_q_vectors; q_idx++) {
    + struct ice_q_vector *q_vector = vsi->q_vectors[q_idx];
    +
    + if (q_vector->rx.ring || q_vector->tx.ring)
    + napi_enable(&q_vector->napi);
    + }
    }

    /**
    @@ -2931,8 +2935,12 @@ static void ice_napi_disable_all(struct ice_vsi *vsi)
    if (!vsi->netdev)
    return;

    - for (q_idx = 0; q_idx < vsi->num_q_vectors; q_idx++)
    - napi_disable(&vsi->q_vectors[q_idx]->napi);
    + for (q_idx = 0; q_idx < vsi->num_q_vectors; q_idx++) {
    + struct ice_q_vector *q_vector = vsi->q_vectors[q_idx];
    +
    + if (q_vector->rx.ring || q_vector->tx.ring)
    + napi_disable(&q_vector->napi);
    + }
    }

    /**
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-01-28 18:34    [W:4.118 / U:0.392 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site