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

Commit a85d667e authored by Bart Van Assche's avatar Bart Van Assche Committed by Nicholas Bellinger
Browse files

target: Use {get,put}_unaligned_be*() instead of open coding these functions 



Introduce the function get_unaligned_be24(). Use {get,put}_unaligned_be*()
where appropriate. This patch does not change any functionality.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Cc: Andy Grover <agrover@redhat.com>
Cc: David Disseldorp <ddiss@suse.de>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent f2b72d6a

drivers/target/target_core_alua.c

+4 −4
Original line number Diff line number Diff line
@@ -205,8 +205,8 @@ target_emulate_report_target_port_groups(struct se_cmd *cmd) 
		/*

		 * TARGET PORT GROUP

		 */

		buf[off++] = ((tg_pt_gp->tg_pt_gp_id >> 8) & 0xff);

		buf[off++] = (tg_pt_gp->tg_pt_gp_id & 0xff);

		put_unaligned_be16(tg_pt_gp->tg_pt_gp_id, &buf[off]);

		off += 2;



		off++; /* Skip over Reserved */

		/*
@@ -235,8 +235,8 @@ target_emulate_report_target_port_groups(struct se_cmd *cmd) 
			/*

			 * Set RELATIVE TARGET PORT IDENTIFIER

			 */

			buf[off++] = ((lun->lun_rtpi >> 8) & 0xff);

			buf[off++] = (lun->lun_rtpi & 0xff);

			put_unaligned_be16(lun->lun_rtpi, &buf[off]);

			off += 2;

			rd_len += 4;

		}

		spin_unlock(&tg_pt_gp->tg_pt_gp_lock);

drivers/target/target_core_device.c

+4 −4
Original line number Diff line number Diff line
@@ -1091,19 +1091,19 @@ passthrough_parse_cdb(struct se_cmd *cmd, 
	      TRANSPORT_FLAG_PASSTHROUGH_PGR)) {

		if (cdb[0] == PERSISTENT_RESERVE_IN) {

			cmd->execute_cmd = target_scsi3_emulate_pr_in;

			size = (cdb[7] << 8) + cdb[8];

			size = get_unaligned_be16(&cdb[7]);

			return target_cmd_size_check(cmd, size);

		}

		if (cdb[0] == PERSISTENT_RESERVE_OUT) {

			cmd->execute_cmd = target_scsi3_emulate_pr_out;

			size = (cdb[7] << 8) + cdb[8];

			size = get_unaligned_be16(&cdb[7]);

			return target_cmd_size_check(cmd, size);

		}



		if (cdb[0] == RELEASE || cdb[0] == RELEASE_10) {

			cmd->execute_cmd = target_scsi2_reservation_release;

			if (cdb[0] == RELEASE_10)

				size = (cdb[7] << 8) | cdb[8];

				size = get_unaligned_be16(&cdb[7]);

			else

				size = cmd->data_length;

			return target_cmd_size_check(cmd, size);
@@ -1111,7 +1111,7 @@ passthrough_parse_cdb(struct se_cmd *cmd, 
		if (cdb[0] == RESERVE || cdb[0] == RESERVE_10) {

			cmd->execute_cmd = target_scsi2_reservation_reserve;

			if (cdb[0] == RESERVE_10)

				size = (cdb[7] << 8) | cdb[8];

				size = get_unaligned_be16(&cdb[7]);

			else

				size = cmd->data_length;

			return target_cmd_size_check(cmd, size);

drivers/target/target_core_fabric_lib.c

+3 −3
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/ctype.h>

#include <linux/spinlock.h>

#include <linux/export.h>

#include <asm/unaligned.h>



#include <scsi/scsi_proto.h>
@@ -216,8 +217,7 @@ static int iscsi_get_pr_transport_id( 
	if (padding != 0)

		len += padding;



	buf[2] = ((len >> 8) & 0xff);

	buf[3] = (len & 0xff);

	put_unaligned_be16(len, &buf[2]);

	/*

	 * Increment value for total payload + header length for

	 * full status descriptor
@@ -306,7 +306,7 @@ static char *iscsi_parse_pr_out_transport_id( 
	 */

	if (out_tid_len) {

		/* The shift works thanks to integer promotion rules */

		add_len = (buf[2] << 8) | buf[3];

		add_len = get_unaligned_be16(&buf[2]);



		tid_len = strlen(&buf[4]);

		tid_len += 4; /* Add four bytes for iSCSI Transport ID header */

drivers/target/target_core_pr.c

+20 −79
Original line number Diff line number Diff line
@@ -1562,10 +1562,7 @@ core_scsi3_decode_spec_i_port( 
	 * first extract TransportID Parameter Data Length, and make sure

	 * the value matches up to the SCSI expected data transfer length.

	 */

	tpdl = (buf[24] & 0xff) << 24;

	tpdl |= (buf[25] & 0xff) << 16;

	tpdl |= (buf[26] & 0xff) << 8;

	tpdl |= buf[27] & 0xff;

	tpdl = get_unaligned_be32(&buf[24]);



	if ((tpdl + 28) != cmd->data_length) {

		pr_err("SPC-3 PR: Illegal tpdl: %u + 28 byte header"
@@ -3221,12 +3218,8 @@ core_scsi3_emulate_pro_register_and_move(struct se_cmd *cmd, u64 res_key, 
		goto out_put_pr_reg;

	}



	rtpi = (buf[18] & 0xff) << 8;

	rtpi |= buf[19] & 0xff;

	tid_len = (buf[20] & 0xff) << 24;

	tid_len |= (buf[21] & 0xff) << 16;

	tid_len |= (buf[22] & 0xff) << 8;

	tid_len |= buf[23] & 0xff;

	rtpi = get_unaligned_be16(&buf[18]);

	tid_len = get_unaligned_be32(&buf[20]);

	transport_kunmap_data_sg(cmd);

	buf = NULL;
@@ -3552,16 +3545,6 @@ core_scsi3_emulate_pro_register_and_move(struct se_cmd *cmd, u64 res_key, 
	return ret;

}



static unsigned long long core_scsi3_extract_reservation_key(unsigned char *cdb)

{

	unsigned int __v1, __v2;



	__v1 = (cdb[0] << 24) | (cdb[1] << 16) | (cdb[2] << 8) | cdb[3];

	__v2 = (cdb[4] << 24) | (cdb[5] << 16) | (cdb[6] << 8) | cdb[7];



	return ((unsigned long long)__v2) | (unsigned long long)__v1 << 32;

}



/*

 * See spc4r17 section 6.14 Table 170

 */
@@ -3619,8 +3602,8 @@ target_scsi3_emulate_pr_out(struct se_cmd *cmd) 
	/*

	 * From PERSISTENT_RESERVE_OUT parameter list (payload)

	 */

	res_key = core_scsi3_extract_reservation_key(&buf[0]);

	sa_res_key = core_scsi3_extract_reservation_key(&buf[8]);

	res_key = get_unaligned_be64(&buf[0]);

	sa_res_key = get_unaligned_be64(&buf[8]);

	/*

	 * REGISTER_AND_MOVE uses a different SA parameter list containing

	 * SCSI TransportIDs.
@@ -3734,10 +3717,7 @@ core_scsi3_pri_read_keys(struct se_cmd *cmd) 
	if (!buf)

		return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;



	buf[0] = ((dev->t10_pr.pr_generation >> 24) & 0xff);

	buf[1] = ((dev->t10_pr.pr_generation >> 16) & 0xff);

	buf[2] = ((dev->t10_pr.pr_generation >> 8) & 0xff);

	buf[3] = (dev->t10_pr.pr_generation & 0xff);

	put_unaligned_be32(dev->t10_pr.pr_generation, buf);



	spin_lock(&dev->t10_pr.registration_lock);

	list_for_each_entry(pr_reg, &dev->t10_pr.registration_list,
@@ -3749,23 +3729,13 @@ core_scsi3_pri_read_keys(struct se_cmd *cmd) 
		if ((add_len + 8) > (cmd->data_length - 8))

			break;



		buf[off++] = ((pr_reg->pr_res_key >> 56) & 0xff);

		buf[off++] = ((pr_reg->pr_res_key >> 48) & 0xff);

		buf[off++] = ((pr_reg->pr_res_key >> 40) & 0xff);

		buf[off++] = ((pr_reg->pr_res_key >> 32) & 0xff);

		buf[off++] = ((pr_reg->pr_res_key >> 24) & 0xff);

		buf[off++] = ((pr_reg->pr_res_key >> 16) & 0xff);

		buf[off++] = ((pr_reg->pr_res_key >> 8) & 0xff);

		buf[off++] = (pr_reg->pr_res_key & 0xff);



		put_unaligned_be64(pr_reg->pr_res_key, &buf[off]);

		off += 8;

		add_len += 8;

	}

	spin_unlock(&dev->t10_pr.registration_lock);



	buf[4] = ((add_len >> 24) & 0xff);

	buf[5] = ((add_len >> 16) & 0xff);

	buf[6] = ((add_len >> 8) & 0xff);

	buf[7] = (add_len & 0xff);

	put_unaligned_be32(add_len, &buf[4]);



	transport_kunmap_data_sg(cmd);
@@ -3796,10 +3766,7 @@ core_scsi3_pri_read_reservation(struct se_cmd *cmd) 
	if (!buf)

		return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;



	buf[0] = ((dev->t10_pr.pr_generation >> 24) & 0xff);

	buf[1] = ((dev->t10_pr.pr_generation >> 16) & 0xff);

	buf[2] = ((dev->t10_pr.pr_generation >> 8) & 0xff);

	buf[3] = (dev->t10_pr.pr_generation & 0xff);

	put_unaligned_be32(dev->t10_pr.pr_generation, &buf[0]);



	spin_lock(&dev->dev_reservation_lock);

	pr_reg = dev->dev_pr_res_holder;
@@ -3807,10 +3774,7 @@ core_scsi3_pri_read_reservation(struct se_cmd *cmd) 
		/*

		 * Set the hardcoded Additional Length

		 */

		buf[4] = ((add_len >> 24) & 0xff);

		buf[5] = ((add_len >> 16) & 0xff);

		buf[6] = ((add_len >> 8) & 0xff);

		buf[7] = (add_len & 0xff);

		put_unaligned_be32(add_len, &buf[4]);



		if (cmd->data_length < 22)

			goto err;
@@ -3837,14 +3801,7 @@ core_scsi3_pri_read_reservation(struct se_cmd *cmd) 
		else

			pr_res_key = pr_reg->pr_res_key;



		buf[8] = ((pr_res_key >> 56) & 0xff);

		buf[9] = ((pr_res_key >> 48) & 0xff);

		buf[10] = ((pr_res_key >> 40) & 0xff);

		buf[11] = ((pr_res_key >> 32) & 0xff);

		buf[12] = ((pr_res_key >> 24) & 0xff);

		buf[13] = ((pr_res_key >> 16) & 0xff);

		buf[14] = ((pr_res_key >> 8) & 0xff);

		buf[15] = (pr_res_key & 0xff);

		put_unaligned_be64(pr_res_key, &buf[8]);

		/*

		 * Set the SCOPE and TYPE

		 */
@@ -3882,8 +3839,7 @@ core_scsi3_pri_report_capabilities(struct se_cmd *cmd) 
	if (!buf)

		return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;



	buf[0] = ((add_len >> 8) & 0xff);

	buf[1] = (add_len & 0xff);

	put_unaligned_be16(add_len, &buf[0]);

	buf[2] |= 0x10; /* CRH: Compatible Reservation Hanlding bit. */

	buf[2] |= 0x08; /* SIP_C: Specify Initiator Ports Capable bit */

	buf[2] |= 0x04; /* ATP_C: All Target Ports Capable bit */
@@ -3947,10 +3903,7 @@ core_scsi3_pri_read_full_status(struct se_cmd *cmd) 
	if (!buf)

		return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;



	buf[0] = ((dev->t10_pr.pr_generation >> 24) & 0xff);

	buf[1] = ((dev->t10_pr.pr_generation >> 16) & 0xff);

	buf[2] = ((dev->t10_pr.pr_generation >> 8) & 0xff);

	buf[3] = (dev->t10_pr.pr_generation & 0xff);

	put_unaligned_be32(dev->t10_pr.pr_generation, &buf[0]);



	spin_lock(&dev->dev_reservation_lock);

	if (dev->dev_pr_res_holder) {
@@ -3992,14 +3945,8 @@ core_scsi3_pri_read_full_status(struct se_cmd *cmd) 
		/*

		 * Set RESERVATION KEY

		 */

		buf[off++] = ((pr_reg->pr_res_key >> 56) & 0xff);

		buf[off++] = ((pr_reg->pr_res_key >> 48) & 0xff);

		buf[off++] = ((pr_reg->pr_res_key >> 40) & 0xff);

		buf[off++] = ((pr_reg->pr_res_key >> 32) & 0xff);

		buf[off++] = ((pr_reg->pr_res_key >> 24) & 0xff);

		buf[off++] = ((pr_reg->pr_res_key >> 16) & 0xff);

		buf[off++] = ((pr_reg->pr_res_key >> 8) & 0xff);

		buf[off++] = (pr_reg->pr_res_key & 0xff);

		put_unaligned_be64(pr_reg->pr_res_key, &buf[off]);

		off += 8;

		off += 4; /* Skip Over Reserved area */



		/*
@@ -4041,8 +3988,8 @@ core_scsi3_pri_read_full_status(struct se_cmd *cmd) 
		if (!pr_reg->pr_reg_all_tg_pt) {

			u16 sep_rtpi = pr_reg->tg_pt_sep_rtpi;



			buf[off++] = ((sep_rtpi >> 8) & 0xff);

			buf[off++] = (sep_rtpi & 0xff);

			put_unaligned_be16(sep_rtpi, &buf[off]);

			off += 2;

		} else

			off += 2; /* Skip over RELATIVE TARGET PORT IDENTIFIER */
@@ -4062,10 +4009,7 @@ core_scsi3_pri_read_full_status(struct se_cmd *cmd) 
		/*

		 * Set the ADDITIONAL DESCRIPTOR LENGTH

		 */

		buf[off++] = ((desc_len >> 24) & 0xff);

		buf[off++] = ((desc_len >> 16) & 0xff);

		buf[off++] = ((desc_len >> 8) & 0xff);

		buf[off++] = (desc_len & 0xff);

		put_unaligned_be32(desc_len, &buf[off]);

		/*

		 * Size of full desctipor header minus TransportID

		 * containing $FABRIC_MOD specific) initiator device/port
@@ -4082,10 +4026,7 @@ core_scsi3_pri_read_full_status(struct se_cmd *cmd) 
	/*

	 * Set ADDITIONAL_LENGTH

	 */

	buf[4] = ((add_len >> 24) & 0xff);

	buf[5] = ((add_len >> 16) & 0xff);

	buf[6] = ((add_len >> 8) & 0xff);

	buf[7] = (add_len & 0xff);

	put_unaligned_be32(add_len, &buf[4]);



	transport_kunmap_data_sg(cmd);

drivers/target/target_core_pscsi.c

+8 −12
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static void pscsi_tape_read_blocksize(struct se_device *dev, 
	/*

	 * If MODE_SENSE still returns zero, set the default value to 1024.

	 */

	sdev->sector_size = (buf[9] << 16) | (buf[10] << 8) | (buf[11]);

	sdev->sector_size = get_unaligned_be24(&buf[9]);

out_free:

	if (!sdev->sector_size)

		sdev->sector_size = 1024;
@@ -209,8 +209,7 @@ pscsi_get_inquiry_vpd_serial(struct scsi_device *sdev, struct t10_wwn *wwn) 
	cdb[0] = INQUIRY;

	cdb[1] = 0x01; /* Query VPD */

	cdb[2] = 0x80; /* Unit Serial Number */

	cdb[3] = (INQUIRY_VPD_SERIAL_LEN >> 8) & 0xff;

	cdb[4] = (INQUIRY_VPD_SERIAL_LEN & 0xff);

	put_unaligned_be16(INQUIRY_VPD_SERIAL_LEN, &cdb[3]);



	ret = scsi_execute_req(sdev, cdb, DMA_FROM_DEVICE, buf,

			      INQUIRY_VPD_SERIAL_LEN, NULL, HZ, 1, NULL);
@@ -245,8 +244,7 @@ pscsi_get_inquiry_vpd_device_ident(struct scsi_device *sdev, 
	cdb[0] = INQUIRY;

	cdb[1] = 0x01; /* Query VPD */

	cdb[2] = 0x83; /* Device Identifier */

	cdb[3] = (INQUIRY_VPD_DEVICE_IDENTIFIER_LEN >> 8) & 0xff;

	cdb[4] = (INQUIRY_VPD_DEVICE_IDENTIFIER_LEN & 0xff);

	put_unaligned_be16(INQUIRY_VPD_DEVICE_IDENTIFIER_LEN, &cdb[3]);



	ret = scsi_execute_req(sdev, cdb, DMA_FROM_DEVICE, buf,

			      INQUIRY_VPD_DEVICE_IDENTIFIER_LEN,
@@ -254,7 +252,7 @@ pscsi_get_inquiry_vpd_device_ident(struct scsi_device *sdev, 
	if (ret)

		goto out;



	page_len = (buf[2] << 8) | buf[3];

	page_len = get_unaligned_be16(&buf[2]);

	while (page_len > 0) {

		/* Grab a pointer to the Identification descriptor */

		page_83 = &buf[off];
@@ -669,19 +667,17 @@ static void pscsi_transport_complete(struct se_cmd *cmd, struct scatterlist *sg, 
		}



		if (cdb[0] == MODE_SELECT)

			bdl = (buf[3]);

			bdl = buf[3];

		else

			bdl = (buf[6] << 8) | (buf[7]);

			bdl = get_unaligned_be16(&buf[6]);



		if (!bdl)

			goto after_mode_select;



		if (cdb[0] == MODE_SELECT)

			blocksize = (buf[9] << 16) | (buf[10] << 8) |

					(buf[11]);

			blocksize = get_unaligned_be24(&buf[9]);

		else

			blocksize = (buf[13] << 16) | (buf[14] << 8) |

					(buf[15]);

			blocksize = get_unaligned_be24(&buf[13]);



		sd->sector_size = blocksize;

	}