[stgt] [PATCH 06/13] spc: fix data-in buffer generation for MOD_SENSE cmd

nezhinsky at gmail.com nezhinsky at gmail.com
Wed Jan 16 10:01:46 CET 2013


From: Alexander Nezhinsky <nezhinsky at gmail.com>

Generate mod_sense data-in directly in the command buffer, building mode pages
one by one while taking into account the allocation length. Set the actual
transfer len correctly.

Signed-off-by: Alexander Nezhinsky <nezhinsky at gmail.com>
---
 usr/spc.c |  106 ++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 56 insertions(+), 50 deletions(-)

diff --git a/usr/spc.c b/usr/spc.c
index 47d2e6e..bf00e07 100644
--- a/usr/spc.c
+++ b/usr/spc.c
@@ -560,43 +560,38 @@ int set_mode_page_changeable_mask(struct scsi_lu *lu, uint8_t pcode,
  * be returned to the initiator
  *
  * Returns number of bytes copied.
+ * Returns remaining alloc length in out-param remain_len
  */
 static int build_mode_page(uint8_t *data, struct mode_pg *pg,
-			   uint8_t pc, uint16_t *alloc_len)
+			   uint32_t *avail_len, uint32_t *remain_len,
+			   uint8_t pc)
 {
-	uint8_t *p;
-	int len, hdr_size = 2;
-	uint8_t *mode_data;
-
-	len = pg->pcode_size;
-	if (*alloc_len >= 2) {
-		if (!pg->subpcode) {
-			data[0] = pg->pcode;
-			data[1] = len;
-		} else {
-			data[0] = pg->pcode | 0x40;
-			data[1] = pg->subpcode;
-			data[2] = len >> 8;
-			data[3] = len & 0xff;
-			hdr_size = 4;
-		}
+	uint8_t hdr[4];
+	uint32_t hdr_size, actual_len;
+	uint8_t *p, *mode_data;
+
+	if (!pg->subpcode) {
+		hdr[0] = pg->pcode;
+		hdr[1] = pg->pcode_size;
+		hdr_size = 2;
+	} else {
+		hdr[0] = pg->pcode | 0x40;
+		hdr[1] = pg->subpcode;
+		hdr[2] = (pg->pcode_size >> 8) & 0xff;
+		hdr[3] = pg->pcode_size & 0xff;
+		hdr_size = 4;
 	}
-	*alloc_len -= min_t(uint16_t, *alloc_len, hdr_size);
+	actual_len = mem_copy_n32(data, hdr, hdr_size,
+				  avail_len, remain_len);
 
 	p = &data[hdr_size];
-	len += hdr_size;
-	if (*alloc_len >= pg->pcode_size) {
-		if (pc == 1)
-			mode_data = pg->mode_data + pg->pcode_size;
-		else
-			mode_data = pg->mode_data;
-
-		memcpy(p, mode_data, pg->pcode_size);
-	}
-
-	*alloc_len -= min_t(uint16_t, *alloc_len, pg->pcode_size);
+	mode_data = pg->mode_data;
+	if (pc == 1)
+		mode_data += pg->pcode_size;
+	actual_len += mem_copy_n32(p, mode_data, pg->pcode_size,
+				   avail_len, remain_len);
 
-	return len;
+	return actual_len;
 }
 
 /**
@@ -608,15 +603,18 @@ static int build_mode_page(uint8_t *data, struct mode_pg *pg,
  */
 int spc_mode_sense(int host_no, struct scsi_cmd *cmd)
 {
-	uint8_t *data = NULL, *scb, mode6, dbd, pcode, subpcode, pctrl;
-	uint16_t alloc_len, len = 0;
+	uint8_t *data = NULL, *scb;
+	uint8_t mode6, dbd, blk_desc_len, pcode, pctrl, subpcode;
 	unsigned char key = ILLEGAL_REQUEST;
 	uint16_t asc = ASC_INVALID_FIELD_IN_CDB;
+	uint32_t alloc_len, avail_len, remain_len, actual_len;
+	uint32_t hdr_len, mod_data_len;
 	struct mode_pg *pg;
 
 	scb = cmd->scb;
 	mode6 = (scb[0] == 0x1a);
 	dbd = scb[1] & 0x8; /* Disable Block Descriptors */
+	blk_desc_len = dbd ? 0 : BLOCK_DESCRIPTOR_LEN;
 	pcode = scb[2] & 0x3f;
 	pctrl = (scb[2] & 0xc0) >> 6;
 	subpcode = scb[3];
@@ -629,50 +627,58 @@ int spc_mode_sense(int host_no, struct scsi_cmd *cmd)
 	data = scsi_get_in_buffer(cmd);
 
 	if (mode6) {
-		alloc_len = scb[4];
-		len = 4;
+		alloc_len = (uint32_t)scb[4];
+		hdr_len = 4;
 	} else {
-		alloc_len = (scb[7] << 8) + scb[8];
-		len = 8;
+		alloc_len = (uint32_t)get_unaligned_be16(&scb[7]);
+		hdr_len = 8;
 	}
 
 	if (scsi_get_in_length(cmd) < alloc_len)
 		goto sense;
 	memset(data, 0, alloc_len);
 
-	alloc_len -= min(alloc_len, len);
+	avail_len = hdr_len;
+	actual_len = min_t(uint32_t, alloc_len, hdr_len);
+	remain_len = alloc_len - actual_len;
 
 	if (!dbd) {
-		if (alloc_len >= BLOCK_DESCRIPTOR_LEN)
-			memcpy(data + len, cmd->dev->mode_block_descriptor,
-			       BLOCK_DESCRIPTOR_LEN);
-		len += BLOCK_DESCRIPTOR_LEN;
-		alloc_len -= min_t(uint16_t, alloc_len, BLOCK_DESCRIPTOR_LEN);
+		actual_len += mem_copy_n32(data + actual_len,
+					   cmd->dev->mode_block_descriptor,
+					   BLOCK_DESCRIPTOR_LEN,
+					   &avail_len, &remain_len);
 	}
 
 	if (pcode == 0x3f) {
 		list_for_each_entry(pg,
 				    &cmd->dev->mode_pages,
 				    mode_pg_siblings) {
-			len += build_mode_page(data + len, pg, pctrl,
-					       &alloc_len);
+			actual_len += build_mode_page(data + actual_len, pg,
+						      &avail_len, &remain_len,
+						      pctrl);
 		}
 	} else {
 		pg = find_mode_page(cmd->dev, pcode, subpcode);
 		if (!pg)
 			goto sense;
-		len += build_mode_page(data + len, pg, pctrl, &alloc_len);
+		actual_len += build_mode_page(data + actual_len, pg,
+					      &avail_len, &remain_len,
+					      pctrl);
 	}
 
 	if (mode6) {
-		data[0] = len - 1;
-		data[3] = dbd ? 0 : BLOCK_DESCRIPTOR_LEN;
+		mod_data_len = avail_len - 1;
+		set_byte_n32(mod_data_len & 0xff, data, 0, alloc_len);
+		set_byte_n32(blk_desc_len, data, 3, alloc_len);
 	} else {
-		*(uint16_t *)(data) = __cpu_to_be16(len - 2);
-		data[7] = dbd ? 0 : BLOCK_DESCRIPTOR_LEN;
+		mod_data_len = avail_len - 2;
+		set_byte_n32((mod_data_len >> 8) & 0xff, data, 0, alloc_len);
+		set_byte_n32(mod_data_len & 0xff, data, 1, alloc_len);
+		set_byte_n32((blk_desc_len >> 8) & 0xff, data, 6, alloc_len);
+		set_byte_n32(blk_desc_len & 0xff, data, 7, alloc_len);
 	}
 
-	scsi_set_in_resid_by_actual(cmd, len);
+	scsi_set_in_resid_by_actual(cmd, actual_len);
 	return SAM_STAT_GOOD;
 sense:
 	scsi_set_in_resid_by_actual(cmd, 0);
-- 
1.7.9.6

--
To unsubscribe from this list: send the line "unsubscribe stgt" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html



More information about the stgt mailing list