Skip to contentSkip to conversation

qla2xxx: Return EBUSY on fcport deletion

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

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 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.

---

v2: rebased on mkp/staging

 drivers/scsi/qla2xxx/qla_nvme.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_nvme.c +4 -1
index 2cd9bd288910..fded1e3bc9e0 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 -ENODEV;
 
 	vha = fcport->vha;
Signature · 1 line
2.16.4
#1 lore raw
Quoted 23 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.

---

v2: rebased on mkp/staging

 drivers/scsi/qla2xxx/qla_nvme.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_nvme.c +0 -0
index 2cd9bd288910..fded1e3bc9e0 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 -ENODEV;
 
 	vha = fcport->vha;

Please move up the "(!qpair || !fcport)" check; you can avoid the qpair/fcport check in the first "if" condition, then.

Regards,
-Arun