[PATCH] qla2xxx: Return EBUSY on fcport deletion
From: Daniel Wagner
Date: Mon Oct 12 2020 - 05:11:06 EST
When the fcport is about to be deleted we should return EBUSY instead
of ENODEV. Only for EBUSY the request will be requeued in a multipath
setup.
Also in case we have a valid qpair but the firmware has not yet
started return EBUSY to avoid dropping the request.
Signed-off-by: Daniel Wagner <dwagner@xxxxxxx>
---
Hi,
During port bounce and fail tests we observed that requests get
dropped on a failing path because the driver returned ENODEV and thus
the multipath code didn't requeue the request.
The tests were done with only the 'fcport && fcport->deleted' condition
but Hannes suggested we might as well do the same for 'qpair &&
!qpair->fw_started'.
Thanks,
Daniel
drivers/scsi/qla2xxx/qla_nvme.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c
index 5cc1bbb1ed74..db8b802b147c 100644
--- a/drivers/scsi/qla2xxx/qla_nvme.c
+++ b/drivers/scsi/qla2xxx/qla_nvme.c
@@ -555,8 +555,11 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport,
fcport = qla_rport->fcport;
- if (!qpair || !fcport || (qpair && !qpair->fw_started) ||
+ if ((qpair && !qpair->fw_started) ||
(fcport && fcport->deleted))
+ return -EBUSY;
+
+ if (!qpair || !fcport)
return rval;
vha = fcport->vha;
--
2.16.4