lkml.org 
[lkml]   [2020]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 053/105] ibmvnic: skip tx timeout reset while in resetting
    Date
    From: Lijun Pan <ljp@linux.ibm.com>

    [ Upstream commit 855a631a4c11458a9cef1ab79c1530436aa95fae ]

    Sometimes it takes longer than 5 seconds (watchdog timeout) to complete
    failover, migration, and other resets. In stead of scheduling another
    timeout reset, we wait for the current one to complete.

    Suggested-by: Brian King <brking@linux.vnet.ibm.com>
    Signed-off-by: Lijun Pan <ljp@linux.ibm.com>
    Reviewed-by: Dany Madden <drt@linux.ibm.com>
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/ibm/ibmvnic.c | 6 ++++++
    1 file changed, 6 insertions(+)

    diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
    index a1556673300a0..68aa9930d8187 100644
    --- a/drivers/net/ethernet/ibm/ibmvnic.c
    +++ b/drivers/net/ethernet/ibm/ibmvnic.c
    @@ -2358,6 +2358,12 @@ static void ibmvnic_tx_timeout(struct net_device *dev, unsigned int txqueue)
    {
    struct ibmvnic_adapter *adapter = netdev_priv(dev);

    + if (test_bit(0, &adapter->resetting)) {
    + netdev_err(adapter->netdev,
    + "Adapter is resetting, skip timeout reset\n");
    + return;
    + }
    +
    ibmvnic_reset(adapter, VNIC_RESET_TIMEOUT);
    }

    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-14 19:26    [W:4.232 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site