lkml.org 
[lkml]   [2019]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 037/134] ibmveth: Do not process frames after calling napi_reschedule
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

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

    [ Upstream commit e95d22c69b2c130ccce257b84daf283fd82d611e ]

    The IBM virtual ethernet driver's polling function continues
    to process frames after rescheduling NAPI, resulting in a warning
    if it exhausted its budget. Do not restart polling after calling
    napi_reschedule. Instead let frames be processed in the following
    instance.

    Signed-off-by: Thomas Falcon <tlfalcon@linux.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/ibm/ibmveth.c | 2 --
    1 file changed, 2 deletions(-)

    diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
    index 427a6674d237b..f0301b1ff56cb 100644
    --- a/drivers/net/ethernet/ibm/ibmveth.c
    +++ b/drivers/net/ethernet/ibm/ibmveth.c
    @@ -1085,7 +1085,6 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)
    int frames_processed = 0;
    unsigned long lpar_rc;

    -restart_poll:
    while (frames_processed < budget) {
    if (!ibmveth_rxq_pending_buffer(adapter))
    break;
    @@ -1154,7 +1153,6 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)
    napi_reschedule(napi)) {
    lpar_rc = h_vio_signal(adapter->vdev->unit_address,
    VIO_IRQ_DISABLE);
    - goto restart_poll;
    }
    }

    --
    2.19.1


    \
     
     \ /
      Last update: 2019-03-22 14:21    [W:3.257 / U:0.376 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site