Skip to contentSkip to conversation

lpfc: Return DID_TRANSPORT_DISRUPTED instead of DID_REQUEUE

PATCH Applied Hannes Reinecke 3 participants 3 messages Aug 24, 2022 – Sep 1, 2022

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

PATCH 1/1 lpfc: Return DID_TRANSPORT_DISRUPTED instead of DID_REQUEUE

When the driver hits on an internal error condition returning DID_REQUEUE will cause I/O to be retried on the same ITL nexus. This will inhibit multipathing, resulting in endless retries even if the error could have been resolved by using a different ITL nexus.
So return DID_TRANSPORT_DISRUPTED to allow for multipath to engage and route I/O to another ITL nexus.

---
 drivers/scsi/lpfc/lpfc_scsi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/lpfc/lpfc_scsi.c +2 -2
index 084c0f9fdc3a..938a5e435943 100644
@@ -4272,7 +4272,7 @@ lpfc_fcp_io_cmd_wqe_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pwqeIn,
 		    lpfc_cmd->result == IOERR_ABORT_REQUESTED ||
 		    lpfc_cmd->result == IOERR_RPI_SUSPENDED ||
 		    lpfc_cmd->result == IOERR_SLER_CMD_RCV_FAILURE) {
-			cmd->result = DID_REQUEUE << 16;
+			cmd->result = DID_TRANSPORT_DISRUPTED << 16;
 			break;
 		}
 		if ((lpfc_cmd->result == IOERR_RX_DMA_FAILED ||
@@ -4562,7 +4562,7 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
 			    lpfc_cmd->result == IOERR_NO_RESOURCES ||
 			    lpfc_cmd->result == IOERR_ABORT_REQUESTED ||
 			    lpfc_cmd->result == IOERR_SLER_CMD_RCV_FAILURE) {
-				cmd->result = DID_REQUEUE << 16;
+				cmd->result = DID_TRANSPORT_DISRUPTED << 16;
 				break;
 			}
 			if ((lpfc_cmd->result == IOERR_RX_DMA_FAILED ||
Signature · 1 line
2.35.3
Reviewed-by on v1 1/1
#1 lore raw
Quoted 27 lines · Hannes Reinecke

When the driver hits on an internal error condition returning DID_REQUEUE will cause I/O to be retried on the same ITL nexus. This will inhibit multipathing, resulting in endless retries even if the error could have been resolved by using a different ITL nexus.
So return DID_TRANSPORT_DISRUPTED to allow for multipath to engage and route I/O to another ITL nexus.

---
  drivers/scsi/lpfc/lpfc_scsi.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/lpfc/lpfc_scsi.c +1 -1
index 084c0f9fdc3a..938a5e435943 100644
@@ -4272,7 +4272,7 @@ lpfc_fcp_io_cmd_wqe_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pwqeIn,
  		    lpfc_cmd->result == IOERR_ABORT_REQUESTED ||
  		    lpfc_cmd->result == IOERR_RPI_SUSPENDED ||
  		    lpfc_cmd->result == IOERR_SLER_CMD_RCV_FAILURE) {
-			cmd->result = DID_REQUEUE << 16;
+			cmd->result = DID_TRANSPORT_DISRUPTED << 16;
  			break;
  		}
  		if ((lpfc_cmd->result == IOERR_RX_DMA_FAILED ||

drivers/scsi/lpfc/lpfc_scsi.c lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn, · line 4568

Quoted 8 lines
drivers/scsi/lpfc/lpfc_scsi.c +1 -1
@@ -4562,7 +4562,7 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
  			    lpfc_cmd->result == IOERR_NO_RESOURCES ||
  			    lpfc_cmd->result == IOERR_ABORT_REQUESTED ||
  			    lpfc_cmd->result == IOERR_SLER_CMD_RCV_FAILURE) {
-				cmd->result = DID_REQUEUE << 16;
+				cmd->result = DID_TRANSPORT_DISRUPTED << 16;
  				break;
  			}
  			if ((lpfc_cmd->result == IOERR_RX_DMA_FAILED ||

We need to be careful about the conditions. But I think you handled it well.

Thanks

-- james

#2 lore raw
In reply to Hannes Reinecke
Quoted 9 lines · Hannes Reinecke

When the driver hits on an internal error condition returning DID_REQUEUE will cause I/O to be retried on the same ITL nexus. This will inhibit multipathing, resulting in endless retries even if the error could have been resolved by using a different ITL nexus.
So return DID_TRANSPORT_DISRUPTED to allow for multipath to engage and route I/O to another ITL nexus.

[...]

Applied to 6.0/scsi-fixes, thanks!

[1/1] lpfc: Return DID_TRANSPORT_DISRUPTED instead of DID_REQUEUE

      https://git.kernel.org/mkp/scsi/c/c0a50cd389c3
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering