Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b4deef5 authored by Nicholas Bellinger's avatar Nicholas Bellinger
Browse files

target: Enforce hw_max_sectors for SCF_SCSI_DATA_SG_IO_CDB 



Instead of depending upon a max_sectors value that may be set via
configfs based upon original HW queue limitations, go ahead and convert to using
the hw_max_sectors reported by the backend device in order to determine when
to reject an I/O's who's sector count exceeds what is supported by the backend
with a single se_cmd descriptor.

It addresses a potential case where se_dev_attrib.max_sectors for IBLOCK
backends has already been set via queue_max_sectors() to something small
like max_sectors=32 (LVM, DRBD may do this), resulting typically sized
SCF_SCSI_DATA_SG_IO_CDB to be incorrectly rejected with invalid_cdb_field
in transport_generic_cmd_sequencer().

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Roland Dreier <roland@purestorage.com>
Cc: Andy Grover <agrover@redhat.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent d5dc28eb

drivers/target/target_core_transport.c

+15 −6
Original line number Diff line number Diff line
@@ -2973,13 +2973,22 @@ static int transport_generic_cmd_sequencer( 
		cmd->data_length = size;

	}



	if (cmd->se_cmd_flags & SCF_SCSI_DATA_SG_IO_CDB &&

	    (sectors > dev->se_sub_dev->se_dev_attrib.fabric_max_sectors ||

	     sectors > dev->se_sub_dev->se_dev_attrib.max_sectors)) {

		printk_ratelimited(KERN_ERR "SCSI OP %02xh with too big sectors %u\n",

				   cdb[0], sectors);

	if (cmd->se_cmd_flags & SCF_SCSI_DATA_SG_IO_CDB) {

		if (sectors > su_dev->se_dev_attrib.fabric_max_sectors) {

			printk_ratelimited(KERN_ERR "SCSI OP %02xh with too"

				" big sectors %u exceeds fabric_max_sectors:"

				" %u\n", cdb[0], sectors,

				su_dev->se_dev_attrib.fabric_max_sectors);

			goto out_invalid_cdb_field;

		}

		if (sectors > su_dev->se_dev_attrib.hw_max_sectors) {

			printk_ratelimited(KERN_ERR "SCSI OP %02xh with too"

				" big sectors %u exceeds backend hw_max_sectors:"

				" %u\n", cdb[0], sectors,

				su_dev->se_dev_attrib.hw_max_sectors);

			goto out_invalid_cdb_field;

		}

	}



	/* reject any command that we don't have a handler for */

	if (!(passthrough || cmd->execute_cmd ||