Message ID | 20220221210545.115283-1-drt@linux.ibm.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 277f2bb14361790a70e4b3c649e794b75a91a597 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net] ibmvnic: schedule failover only if vioctl fails | expand |
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Mon, 21 Feb 2022 15:05:45 -0600 you wrote: > From: Sukadev Bhattiprolu <sukadev@linux.ibm.com> > > If client is unable to initiate a failover reset via H_VIOCTL hcall, then > it should schedule a failover reset as a last resort. Otherwise, there is > no need to do a last resort. > > Fixes: 334c42414729 ("ibmvnic: improve failover sysfs entry") > Reported-by: Cris Forno <cforno12@outlook.com> > Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.ibm.com> > Signed-off-by: Dany Madden <drt@linux.ibm.com> > > [...] Here is the summary with links: - [net] ibmvnic: schedule failover only if vioctl fails https://git.kernel.org/netdev/net/c/277f2bb14361 You are awesome, thank you!
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 29617a86b299..dee05a353dbd 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -5917,10 +5917,14 @@ static ssize_t failover_store(struct device *dev, struct device_attribute *attr, be64_to_cpu(session_token)); rc = plpar_hcall_norets(H_VIOCTL, adapter->vdev->unit_address, H_SESSION_ERR_DETECTED, session_token, 0, 0); - if (rc) + if (rc) { netdev_err(netdev, "H_VIOCTL initiated failover failed, rc %ld\n", rc); + goto last_resort; + } + + return count; last_resort: netdev_dbg(netdev, "Trying to send CRQ_CMD, the last resort\n");