[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <9065e0c55422e19e8e9417f26cca469a@linux.vnet.ibm.com>
Date: Fri, 20 Nov 2020 14:55:52 -0800
From: drt <drt@...ux.vnet.ibm.com>
To: Lijun Pan <ljp@...ux.ibm.com>
Cc: netdev@...r.kernel.org, sukadev@...ux.ibm.com, drt@...ux.ibm.com,
Brian King <brking@...ux.vnet.ibm.com>
Subject: Re: [PATCH net v2 3/3] ibmvnic: skip tx timeout reset while in
resetting
On 2020-11-20 14:40, Lijun Pan wrote:
> 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@...ux.vnet.ibm.com>
> Signed-off-by: Lijun Pan <ljp@...ux.ibm.com>
Reviewed-by: Dany Madden <drt@...ux.ibm.com>
> ---
> v2: no change
>
> 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 9665532a9ed2..2aa40b2f225c 100644
> --- a/drivers/net/ethernet/ibm/ibmvnic.c
> +++ b/drivers/net/ethernet/ibm/ibmvnic.c
> @@ -2356,6 +2356,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);
> }
Powered by blists - more mailing lists