From: drt <drt@linux.vnet.ibm.com>
To: Lijun Pan <ljp@linux.ibm.com>
Cc: netdev@vger.kernel.org, sukadev@linux.ibm.com, drt@linux.ibm.com,
Brian King <brking@linux.vnet.ibm.com>
Subject: Re: [PATCH net v2 3/3] ibmvnic: skip tx timeout reset while in resetting
Date: Fri, 20 Nov 2020 14:55:52 -0800 [thread overview]
Message-ID: <9065e0c55422e19e8e9417f26cca469a@linux.vnet.ibm.com> (raw)
In-Reply-To: <20201120224013.46891-4-ljp@linux.ibm.com>
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@linux.vnet.ibm.com>
> Signed-off-by: Lijun Pan <ljp@linux.ibm.com>
Reviewed-by: Dany Madden <drt@linux.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);
> }
prev parent reply other threads:[~2020-11-20 22:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-20 22:40 [PATCH net v2 0/3] ibmvnic: fixes in reset path Lijun Pan
2020-11-20 22:40 ` [PATCH net v2 1/3] ibmvnic: fix call_netdevice_notifiers in do_reset Lijun Pan
2020-11-20 22:52 ` drt
2020-11-20 22:40 ` [PATCH net v2 2/3] ibmvnic: notify peers when failover and migration happen Lijun Pan
2020-11-20 22:40 ` [PATCH net v2 3/3] ibmvnic: skip tx timeout reset while in resetting Lijun Pan
2020-11-20 22:55 ` drt [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9065e0c55422e19e8e9417f26cca469a@linux.vnet.ibm.com \
--to=drt@linux.vnet.ibm.com \
--cc=brking@linux.vnet.ibm.com \
--cc=drt@linux.ibm.com \
--cc=ljp@linux.ibm.com \
--cc=netdev@vger.kernel.org \
--cc=sukadev@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).