Skip to contentSkip to conversation

qla2xxx: Return EBUSY on fcport deletion

PATCH Applied Daniel Wagner 3 participants 3 messages Oct 14, 2020 – Oct 26, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v4 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 when the firmware has not yet started return EBUSY to avoid dropping the request.

---

v4: updated commit message as suggested by Finn
v3: simplify and changed test logic as suggested by Arun
v2: rebased on mkp/staging

 drivers/scsi/qla2xxx/qla_nvme.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_nvme.c +4 -2
index 2cd9bd288910..1fa457a5736e 100644
@@ -555,10 +555,12 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport,
 
 	fcport = qla_rport->fcport;
 
-	if (!qpair || !fcport || (qpair && !qpair->fw_started) ||
-	    (fcport && fcport->deleted))
+	if (!qpair || !fcport)
 		return -ENODEV;
 
+	if (!qpair->fw_started || fcport->deleted)
+		return -EBUSY;
+
 	vha = fcport->vha;
 
 	if (!(fcport->nvme_flag & NVME_FLAG_REGISTERED))
Signature · 1 line
2.16.4
#1 lore raw
Quoted 31 lines · Daniel Wagner

External Email

----------------------------------------------------------------------
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 when the firmware has not yet started return EBUSY to avoid dropping the request.

---

v4: updated commit message as suggested by Finn
v3: simplify and changed test logic as suggested by Arun
v2: rebased on mkp/staging

 drivers/scsi/qla2xxx/qla_nvme.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_nvme.c +0 -1
index 2cd9bd288910..1fa457a5736e 100644
@@ -555,10 +555,12 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport,
 
 	fcport = qla_rport->fcport;
 
-	if (!qpair || !fcport || (qpair && !qpair->fw_started) ||

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

Quoted 10 lines
drivers/scsi/qla2xxx/qla_nvme.c +4 -1
-	    (fcport && fcport->deleted))
+	if (!qpair || !fcport)
 		return -ENODEV;
 
+	if (!qpair->fw_started || fcport->deleted)
+		return -EBUSY;
+
 	vha = fcport->vha;
 
 	if (!(fcport->nvme_flag & NVME_FLAG_REGISTERED))

Looks good to me.

Regards,
-Arun

#2 lore raw
In reply to Daniel Wagner

Daniel,

Quoted 6 lines

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 when the firmware has not yet started return EBUSY to avoid dropping the request.

Applied to 5.10/scsi-fixes, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering