Skip to contentSkip to conversation

target: Add support for EXTENDED_COPY copy offload emulation

DISCUSSION Dave Jones 2 participants 2 messages Sep 13, 2013 – Sep 16, 2013 1 message not in the archive SCSI target

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Dave Jones

author
#1 lore raw
Quoted 9 lines · Linux Kernel
Gitweb:     http://git.kernel.org/linus/;a=commit;h=cbf031f425fd0b30ff10ba83b612753189a6bbbf
Commit:     cbf031f425fd0b30ff10ba83b612753189a6bbbf
Parent:     89c12cc925a7d0982dc53b743a42108acc76aef4
Author:     Nicholas Bellinger <[email protected]>
AuthorDate: Tue Aug 20 15:38:55 2013 -0700
Committer:  Nicholas Bellinger <[email protected]>
CommitDate: Tue Sep 10 16:48:43 2013 -0700

target: Add support for EXTENDED_COPY copy offload emulation

...

Quoted 25 lines
(quoted diff) +25 -0
+static int target_xcopy_parse_segdesc_02(struct se_cmd *se_cmd, struct xcopy_op *xop,
+					unsigned char *p)
+{
+	unsigned char *desc = p;
+	int dc = (desc[1] & 0x02);
+	unsigned short desc_len;
+
+	desc_len = get_unaligned_be16(&desc[2]);
+	if (desc_len != 0x18) {
+		pr_err("XCOPY segment desc 0x02: Illegal desc_len:"
+				" %hu\n", desc_len);
+		return -EINVAL;
+	}
+
+	xop->stdi = get_unaligned_be16(&desc[4]);
+	xop->dtdi = get_unaligned_be16(&desc[6]);
+	pr_debug("XCOPY seg desc 0x02: desc_len: %hu stdi: %hu dtdi: %hu, DC: %d\n",
+		desc_len, xop->stdi, xop->dtdi, dc);
+
+	xop->nolb = get_unaligned_be16(&desc[10]);
+	xop->src_lba = get_unaligned_be64(&desc[12]);
+	xop->dst_lba = get_unaligned_be64(&desc[20]);
+	pr_debug("XCOPY seg desc 0x02: nolb: %hu src_lba: %llu dst_lba: %llu\n",
+		xop->nolb, (unsigned long long)xop->src_lba,
+		(unsigned long long)xop->dst_lba);

Review

Quoted 10 lines
(quoted diff) +10 -0
+
+	if (dc != 0) {
+		xop->dbl = (desc[29] << 16) & 0xff;
+		xop->dbl |= (desc[30] << 8) & 0xff;
+		xop->dbl |= desc[31] & 0xff;
+
+		pr_debug("XCOPY seg desc 0x02: DC=1 w/ dbl: %u\n", xop->dbl);
+	}
+	return 0;
+}

Coverity picked up a new warning in this code. It notes that (desc[30] << 8) & 0xff is always zero.

Did you want

xop->dbl = (desc[29] >> 16) & 0xff;

instead maybe ?

The << 16 looks suspect too, though it didn't warn on that.

Dave

#2 lore raw

Hi Dave,

Quoted 52 lines · Dave Jones
Quoted 9 lines · Linux Kernel
Gitweb:     http://git.kernel.org/linus/;a=commit;h=cbf031f425fd0b30ff10ba83b612753189a6bbbf
Commit:     cbf031f425fd0b30ff10ba83b612753189a6bbbf
Parent:     89c12cc925a7d0982dc53b743a42108acc76aef4
Author:     Nicholas Bellinger <[email protected]>
AuthorDate: Tue Aug 20 15:38:55 2013 -0700
Committer:  Nicholas Bellinger <[email protected]>
CommitDate: Tue Sep 10 16:48:43 2013 -0700

target: Add support for EXTENDED_COPY copy offload emulation

...

Quoted 25 lines
(quoted diff) +25 -0
+static int target_xcopy_parse_segdesc_02(struct se_cmd *se_cmd, struct xcopy_op *xop,
+					unsigned char *p)
+{
+	unsigned char *desc = p;
+	int dc = (desc[1] & 0x02);
+	unsigned short desc_len;
+
+	desc_len = get_unaligned_be16(&desc[2]);
+	if (desc_len != 0x18) {
+		pr_err("XCOPY segment desc 0x02: Illegal desc_len:"
+				" %hu\n", desc_len);
+		return -EINVAL;
+	}
+
+	xop->stdi = get_unaligned_be16(&desc[4]);
+	xop->dtdi = get_unaligned_be16(&desc[6]);
+	pr_debug("XCOPY seg desc 0x02: desc_len: %hu stdi: %hu dtdi: %hu, DC: %d\n",
+		desc_len, xop->stdi, xop->dtdi, dc);
+
+	xop->nolb = get_unaligned_be16(&desc[10]);
+	xop->src_lba = get_unaligned_be64(&desc[12]);
+	xop->dst_lba = get_unaligned_be64(&desc[20]);
+	pr_debug("XCOPY seg desc 0x02: nolb: %hu src_lba: %llu dst_lba: %llu\n",
+		xop->nolb, (unsigned long long)xop->src_lba,
+		(unsigned long long)xop->dst_lba);

Review

Quoted 10 lines
(quoted diff) +10 -0
+
+	if (dc != 0) {
+		xop->dbl = (desc[29] << 16) & 0xff;
+		xop->dbl |= (desc[30] << 8) & 0xff;
+		xop->dbl |= desc[31] & 0xff;
+
+		pr_debug("XCOPY seg desc 0x02: DC=1 w/ dbl: %u\n", xop->dbl);
+	}
+	return 0;
+}

Coverity picked up a new warning in this code. It notes that (desc[30] << 8) & 0xff is always zero.

Quoted 6 lines

Did you want

xop->dbl = (desc[29] >> 16) & 0xff;

instead maybe ?

Mmmm, the left shift and bitwise AND are reversed..

Adding the following patch for v3.12-rc target-fixes.

Thanks for reporting!

--nab

drivers/target/target_core_xcopy.c +2 -2
index 4d22e7d..3da4fd1 100644
@@ -298,8 +298,8 @@ static int target_xcopy_parse_segdesc_02(struct se_cmd *se_cmd, struct xcopy_op
                (unsigned long long)xop->dst_lba);
 
        if (dc != 0) {
-               xop->dbl = (desc[29] << 16) & 0xff;
-               xop->dbl |= (desc[30] << 8) & 0xff;
+               xop->dbl = (desc[29] & 0xff) << 16;
+               xop->dbl |= (desc[30] & 0xff) << 8;
                xop->dbl |= desc[31] & 0xff;
 
                pr_debug("XCOPY seg desc 0x02: DC=1 w/ dbl: %u\n", xop->dbl);