lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 3 Dec 2020 08:29:24 -0500 From: Sasha Levin <sashal@...nel.org> To: linux-kernel@...r.kernel.org, stable@...r.kernel.org Cc: Lijun Pan <ljp@...ux.ibm.com>, Brian King <brking@...ux.vnet.ibm.com>, Dany Madden <drt@...ux.ibm.com>, Jakub Kicinski <kuba@...nel.org>, Sasha Levin <sashal@...nel.org>, linuxppc-dev@...ts.ozlabs.org, netdev@...r.kernel.org Subject: [PATCH AUTOSEL 5.4 12/23] ibmvnic: skip tx timeout reset while in resetting From: Lijun Pan <ljp@...ux.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@...ux.vnet.ibm.com> Signed-off-by: Lijun Pan <ljp@...ux.ibm.com> Reviewed-by: Dany Madden <drt@...ux.ibm.com> Signed-off-by: Jakub Kicinski <kuba@...nel.org> Signed-off-by: Sasha Levin <sashal@...nel.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 e53994ca3142c..af1d9d2150616 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -2266,6 +2266,12 @@ static void ibmvnic_tx_timeout(struct net_device *dev) { 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
Powered by blists - more mailing lists