Commit ef66a1ea authored by Sukadev Bhattiprolu's avatar Sukadev Bhattiprolu Committed by Jakub Kicinski
Browse files

ibmvnic: Clear failover_pending if unable to schedule 



Normally we clear the failover_pending flag when processing the reset.
But if we are unable to schedule a failover reset we must clear the
flag ourselves. We could fail to schedule the reset if we are in PROBING
state (eg: when booting via kexec) or because we could not allocate memory.

Thanks to Cris Forno for helping isolate the problem and for testing.

Fixes: 1d850493 ("powerpc/vnic: Extend "failover pending" window")
Signed-off-by: default avatarSukadev Bhattiprolu <sukadev@linux.ibm.com>
Tested-by: default avatarCristobal Forno <cforno12@linux.ibm.com>
Link: https://lore.kernel.org/r/20210203050802.680772-1-sukadev@linux.ibm.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2da4b24b

drivers/net/ethernet/ibm/ibmvnic.c

+16 −1
Original line number Diff line number Diff line
@@ -4918,7 +4918,22 @@ static void ibmvnic_handle_crq(union ibmvnic_crq *crq, 
				complete(&adapter->init_done);

				adapter->init_done_rc = -EIO;

			}

			ibmvnic_reset(adapter, VNIC_RESET_FAILOVER);

			rc = ibmvnic_reset(adapter, VNIC_RESET_FAILOVER);

			if (rc && rc != -EBUSY) {

				/* We were unable to schedule the failover

				 * reset either because the adapter was still

				 * probing (eg: during kexec) or we could not

				 * allocate memory. Clear the failover_pending

				 * flag since no one else will. We ignore

				 * EBUSY because it means either FAILOVER reset

				 * is already scheduled or the adapter is

				 * being removed.

				 */

				netdev_err(netdev,

					   "Error %ld scheduling failover reset\n",

					   rc);

				adapter->failover_pending = false;

			}

			break;

		case IBMVNIC_CRQ_INIT_COMPLETE:

			dev_info(dev, "Partner initialization complete\n");