Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

scsi: core: Fix passthrough retry counter handling

Passthrough users will set the scsi_cmnd->allowed value and were expecting
up to $allowed retries. The problem is that before:

commit 6aded12b10e0 ("scsi: core: Remove struct scsi_request")

we used to set the retries on the scsi_request then copy them over to
scsi_cmnd->allowed in scsi_setup_scsi_cmnd. With that patch we now set
scsi_cmnd->allowed to 0 in scsi_prepare_cmd and overwrite what the
passthrough user set.

This moves the allowed initialization to after the blk_rq_is_passthrough()
check so it's only done for the non-passthrough path where the ULD
init_command will normally set an allowed value it prefers.

Link: https://lore.kernel.org/r/20220812011206.9157-1-michael.christie@oracle.com
Fixes: 6aded12b10e0 ("scsi: core: Remove struct scsi_request")
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Mike Christie <michael.christie@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Mike Christie and committed by
Martin K. Petersen
fac8e558 8f2c9642

+2 -1
+2 -1
drivers/scsi/scsi_lib.c
··· 1548 1548 scsi_init_command(sdev, cmd); 1549 1549 1550 1550 cmd->eh_eflags = 0; 1551 - cmd->allowed = 0; 1552 1551 cmd->prot_type = 0; 1553 1552 cmd->prot_flags = 0; 1554 1553 cmd->submitter = 0; ··· 1598 1599 return ret; 1599 1600 } 1600 1601 1602 + /* Usually overridden by the ULP */ 1603 + cmd->allowed = 0; 1601 1604 memset(cmd->cmnd, 0, sizeof(cmd->cmnd)); 1602 1605 return scsi_cmd_to_driver(cmd)->init_command(cmd); 1603 1606 }