Commit 464a00c9 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: core: Kill DRIVER_SENSE 

Replace the check for DRIVER_SENSE with a check for
scsi_status_is_check_condition().

Audit all callsites to ensure the SAM status is set correctly. For
backwards compability move the DRIVER_SENSE definition to sg.h, and update
sg, bsg, and scsi_ioctl to set the DRIVER_SENSE driver_status whenever
SAM_STAT_CHECK_CONDITION is present.

[mkp: fix zeroday srp warning]

Link: https://lore.kernel.org/r/20210427083046.31620-10-hare@suse.de


Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>

fix
parent d0672a03

block/bsg.c

+2 −0
Original line number Diff line number Diff line
@@ -97,6 +97,8 @@ static int bsg_scsi_complete_rq(struct request *rq, struct sg_io_v4 *hdr) 
	hdr->device_status = sreq->result & 0xff;

	hdr->transport_status = host_byte(sreq->result);

	hdr->driver_status = driver_byte(sreq->result);

	if (scsi_status_is_check_condition(sreq->result))

		hdr->driver_status = DRIVER_SENSE;

	hdr->info = 0;

	if (hdr->device_status || hdr->transport_status || hdr->driver_status)

		hdr->info |= SG_INFO_CHECK;

block/scsi_ioctl.c

+2 −0
Original line number Diff line number Diff line
@@ -257,6 +257,8 @@ static int blk_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr, 
	hdr->msg_status = msg_byte(req->result);

	hdr->host_status = host_byte(req->result);

	hdr->driver_status = driver_byte(req->result);

	if (scsi_status_is_check_condition(hdr->status))

		hdr->driver_status = DRIVER_SENSE;

	hdr->info = 0;

	if (hdr->masked_status || hdr->host_status || hdr->driver_status)

		hdr->info |= SG_INFO_CHECK;

drivers/ata/libata-scsi.c

+3 −10
Original line number Diff line number Diff line
@@ -411,13 +411,12 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg) 
		rc = cmd_result;

		goto error;

	}

	if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */

	if (scsi_sense_valid(&sshdr)) {/* sense data available */

		u8 *desc = sensebuf + 8;

		cmd_result &= ~(0xFF<<24); /* DRIVER_SENSE is not an error */



		/* If we set cc then ATA pass-through will cause a

		 * check condition even if no error. Filter that. */

		if (cmd_result & SAM_STAT_CHECK_CONDITION) {

		if (scsi_status_is_check_condition(cmd_result)) {

			if (sshdr.sense_key == RECOVERED_ERROR &&

			    sshdr.asc == 0 && sshdr.ascq == 0x1d)

				cmd_result &= ~SAM_STAT_CHECK_CONDITION;
@@ -496,9 +495,8 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg) 
		rc = cmd_result;

		goto error;

	}

	if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */

	if (scsi_sense_valid(&sshdr)) {/* sense data available */

		u8 *desc = sensebuf + 8;

		cmd_result &= ~(0xFF<<24); /* DRIVER_SENSE is not an error */



		/* If we set cc then ATA pass-through will cause a

		 * check condition even if no error. Filter that. */
@@ -864,8 +862,6 @@ static void ata_gen_passthru_sense(struct ata_queued_cmd *qc) 


	memset(sb, 0, SCSI_SENSE_BUFFERSIZE);



	cmd->result = (DRIVER_SENSE << 24) | SAM_STAT_CHECK_CONDITION;



	/*

	 * Use ata_to_sense_error() to map status register bits

	 * onto sense key, asc & ascq.
@@ -962,8 +958,6 @@ static void ata_gen_ata_sense(struct ata_queued_cmd *qc) 


	memset(sb, 0, SCSI_SENSE_BUFFERSIZE);



	cmd->result = (DRIVER_SENSE << 24) | SAM_STAT_CHECK_CONDITION;



	if (ata_dev_disabled(dev)) {

		/* Device disabled after error recovery */

		/* LOGICAL UNIT NOT READY, HARD RESET REQUIRED */
@@ -4201,7 +4195,6 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd) 


	case REQUEST_SENSE:

		ata_scsi_set_sense(dev, cmd, 0, 0, 0);

		cmd->result = (DRIVER_SENSE << 24);

		break;



	/* if we reach this, then writeback caching is disabled,

drivers/scsi/NCR5380.c

+1 −1
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ static void complete_cmd(struct Scsi_Host *instance, 
			scsi_eh_restore_cmnd(cmd, &hostdata->ses);

		} else {

			scsi_eh_restore_cmnd(cmd, &hostdata->ses);

			set_driver_byte(cmd, DRIVER_SENSE);

			set_status_byte(cmd, SAM_STAT_CHECK_CONDITION);

		}

		hostdata->sensing = NULL;

	}

drivers/scsi/advansys.c

+0 −2
Original line number Diff line number Diff line
@@ -5964,7 +5964,6 @@ static void adv_isr_callback(ADV_DVC_VAR *adv_dvc_varp, ADV_SCSI_REQ_Q *scsiqp) 
				ASC_DBG(2, "SAM_STAT_CHECK_CONDITION\n");

				ASC_DBG_PRT_SENSE(2, scp->sense_buffer,

						  SCSI_SENSE_BUFFERSIZE);

				set_driver_byte(scp, DRIVER_SENSE);

			}

			break;
@@ -6715,7 +6714,6 @@ static void asc_isr_callback(ASC_DVC_VAR *asc_dvc_varp, ASC_QDONE_INFO *qdonep) 
				ASC_DBG(2, "SAM_STAT_CHECK_CONDITION\n");

				ASC_DBG_PRT_SENSE(2, scp->sense_buffer,

						  SCSI_SENSE_BUFFERSIZE);

				set_driver_byte(scp, DRIVER_SENSE);

			}

			break;