Commit eea6ef37 authored by Mike Christie's avatar Mike Christie Committed by Martin K. Petersen
Browse files

scsi: sd: Have pr commands retry UAs 



It's common to get a UA when doing PR commands. It could be due to a target
restarting, transport level relogin or other PR commands like a release
causing it. The upper layers don't get the sense and in some cases have no
idea if it's a SCSI device, so this has the sd layer retry.

Signed-off-by: default avatarMike Christie <michael.christie@oracle.com>
Link: https://lore.kernel.org/r/20240123002220.129141-15-michael.christie@oracle.com


Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 8d24677e

drivers/scsi/sd.c

+28 −0
Original line number Diff line number Diff line
@@ -1800,8 +1800,22 @@ static int sd_pr_in_command(struct block_device *bdev, u8 sa, 
	struct scsi_device *sdev = sdkp->device;

	struct scsi_sense_hdr sshdr;

	u8 cmd[10] = { PERSISTENT_RESERVE_IN, sa };

	struct scsi_failure failure_defs[] = {

		{

			.sense = UNIT_ATTENTION,

			.asc = SCMD_FAILURE_ASC_ANY,

			.ascq = SCMD_FAILURE_ASCQ_ANY,

			.allowed = 5,

			.result = SAM_STAT_CHECK_CONDITION,

		},

		{}

	};

	struct scsi_failures failures = {

		.failure_definitions = failure_defs,

	};

	const struct scsi_exec_args exec_args = {

		.sshdr = &sshdr,

		.failures = &failures,

	};

	int result;
@@ -1888,8 +1902,22 @@ static int sd_pr_out_command(struct block_device *bdev, u8 sa, u64 key, 
	struct scsi_disk *sdkp = scsi_disk(bdev->bd_disk);

	struct scsi_device *sdev = sdkp->device;

	struct scsi_sense_hdr sshdr;

	struct scsi_failure failure_defs[] = {

		{

			.sense = UNIT_ATTENTION,

			.asc = SCMD_FAILURE_ASC_ANY,

			.ascq = SCMD_FAILURE_ASCQ_ANY,

			.allowed = 5,

			.result = SAM_STAT_CHECK_CONDITION,

		},

		{}

	};

	struct scsi_failures failures = {

		.failure_definitions = failure_defs,

	};

	const struct scsi_exec_args exec_args = {

		.sshdr = &sshdr,

		.failures = &failures,

	};

	int result;

	u8 cmd[16] = { 0, };