Skip to contentSkip to conversation

qla2xxx: Return EBUSY on fcport deletion

PATCH Superseded Daniel Wagner 2 participants 3 messages Oct 12, 2020

Subsystems (2)

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qla2xxx: Return EBUSY on fcport deletion

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.

---
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(-)
drivers/scsi/qla2xxx/qla_nvme.c +4 -1
index 5cc1bbb1ed74..db8b802b147c 100644
@@ -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;
Signature · 1 line
2.16.4
#1 lore raw
Quoted 33 lines · Daniel Wagner

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.

---
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(-)
drivers/scsi/qla2xxx/qla_nvme.c +0 -0
index 5cc1bbb1ed74..db8b802b147c 100644
@@ -555,8 +555,11 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport,
 
 	fcport = qla_rport->fcport;

drivers/scsi/qla2xxx/qla_nvme.c static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport, · line 565

Quoted 10 lines
drivers/scsi/qla2xxx/qla_nvme.c +4 -1
 
-	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;

This does not appear to be cut against the latest for-next/staging; "rval" is not used there for the initial set of returns.

Anyway, returning EBUSY is the right way to go.

Regards,
-Arun

#2 lore raw
Quoted 2 lines · Arun Easi

This does not appear to be cut against the latest for-next/staging; "rval" is not used there for the initial set of returns.

Indeed, forgot to use staging. It's against queue. Let me update it.

Quoted 1 line

Anyway, returning EBUSY is the right way to go.

Thanks for the confirmation.

Daniel