libnvme: rename copy_range and add new fields

Rename to copy_range_f0 and follow NVMe command set spec revision 1.2.

Signed-off-by: Tokunori Ikegami <[email protected]>

Author: ikegami-t

libnvme/src/nvme/cmds.h

@@ -4383,7 +4383,7 @@ nvme_init_copy(struct nvme_passthru_cmd *cmd, __u32 nsid, __u64 sdlba,
 		data_len = nr * sizeof(struct nvme_copy_range_f3);
 		break;
 	default:
-		data_len = nr * sizeof(struct nvme_copy_range);
+		data_len = nr * sizeof(struct nvme_copy_range_f0);
 		break;
 	}
 
@@ -5252,26 +5252,26 @@ nvme_init_copy_range_elbt(__u8 *elbt, __u64 eilbrt)
 }
 
 /**
- * nvme_init_copy_range() - Constructs a copy range structure
+ * nvme_init_copy_range_f0() - Constructs a copy range structure
  * @copy:	Copy range array
  * @nlbs:	Number of logical blocks
  * @slbas:	Starting LBA
- * @eilbrts:	Expected initial logical block reference tag
+ * @elbts:	Expected initial logical block reference tag
  * @elbatms:	Expected logical block application tag mask
  * @elbats:	Expected logical block application tag
  * @nr:		Number of descriptors to construct
  */
 static inline void
-nvme_init_copy_range(struct nvme_copy_range *copy, __u16 *nlbs,
-		__u64 *slbas, __u32 *eilbrts, __u32 *elbatms,
+nvme_init_copy_range_f0(struct nvme_copy_range_f0 *copy, __u16 *nlbs,
+		__u64 *slbas, __u32 *elbts, __u32 *elbatms,
 		__u32 *elbats, __u16 nr)
 {
 	int i;
 
 	for (i = 0; i < nr; i++) {
 		copy[i].nlb = htole16(nlbs[i]);
 		copy[i].slba = htole64(slbas[i]);
-		copy[i].eilbrt = htole32(eilbrts[i]);
+		copy[i].elbt = htole32(elbts[i]);
 		copy[i].elbatm = htole16(elbatms[i]);
 		copy[i].elbat = htole16(elbats[i]);
 	}

libnvme/src/nvme/types.h

@@ -6436,22 +6436,28 @@ struct nvme_dsm_range {
 };
 
 /**
- * struct nvme_copy_range - Copy - Source Range Entries Descriptor Format
+ * struct nvme_copy_range_f0 - Copy - Source Range Entries Descriptor Format 0h
  * @rsvd0:	Reserved
  * @slba:	Starting LBA
  * @nlb:	Number of Logical Blocks
- * @rsvd18:	Reserved
- * @eilbrt:	Expected Initial Logical Block Reference Tag /
+ * @cetype:	Bits 3-0: Command Extension Type
+ * @rsvd19:	Reserved
+ * @cev:	Command Extension Value
+ * @rsvd22:	Reserved
+ * @elbt:	Expected Initial Logical Block Reference Tag /
  *		Expected Logical Block Storage Tag
  * @elbatm:	Expected Logical Block Application Tag Mask
  * @elbat:	Expected Logical Block Application Tag
  */
-struct nvme_copy_range {
+struct nvme_copy_range_f0 {
 	__u8			rsvd0[8];
 	__le64			slba;
 	__le16			nlb;
-	__u8			rsvd18[6];
-	__le32			eilbrt;
+	__u8			cetype;
+	__u8			rsvd19;
+	__le16			cev;
+	__u8			rsvd22[2];
+	__le32			elbt;
 	__le16			elbat;
 	__le16			elbatm;
 };
@@ -6461,7 +6467,10 @@ struct nvme_copy_range {
  * @rsvd0:	Reserved
  * @slba:	Starting LBA
  * @nlb:	Number of Logical Blocks
- * @rsvd18:	Reserved
+ * @cetype:	Bits 3-0: Command Extension Type
+ * @rsvd19:	Reserved
+ * @cev:	Command Extension Value
+ * @rsvd22:	Reserved
  * @elbt:	Expected Initial Logical Block Reference Tag /
  *		Expected Logical Block Storage Tag
  * @elbatm:	Expected Logical Block Application Tag Mask
@@ -6471,7 +6480,10 @@ struct nvme_copy_range_f1 {
 	__u8			rsvd0[8];
 	__le64			slba;
 	__le16			nlb;
-	__u8			rsvd18[8];
+	__u8			cetype;
+	__u8			rsvd19;
+	__le16			cev;
+	__u8			rsvd22[4];
 	__u8			elbt[10];
 	__le16			elbat;
 	__le16			elbatm;
@@ -6491,7 +6503,9 @@ enum nvme_copy_range_sopt {
  * @rsvd4:	Reserved
  * @slba:	Starting LBA
  * @nlb:	Number of Logical Blocks
- * @rsvd18:	Reserved
+ * @cetype:	Bits 3-0: Command Extension Type
+ * @rsvd19:	Reserved
+ * @cev:	Command Extension Value
  * @sopt:	Source Options
  * @eilbrt:	Expected Initial Logical Block Reference Tag /
  *		Expected Logical Block Storage Tag
@@ -6503,7 +6517,9 @@ struct nvme_copy_range_f2 {
 	__u8			rsvd4[4];
 	__le64			slba;
 	__le16			nlb;
-	__u8			rsvd18[4];
+	__u8			cetype;
+	__u8			rsvd19;
+	__le16			cev;
 	__le16			sopt;
 	__le32			eilbrt;
 	__le16			elbat;
@@ -6516,8 +6532,10 @@ struct nvme_copy_range_f2 {
  * @rsvd4:	Reserved
  * @slba:	Starting LBA
  * @nlb:	Number of Logical Blocks
- * @rsvd18:	Reserved
+ * @cetype:	Bits 3-0: Command Extension Type
+ * @rsvd19:	Reserved
  * @sopt:	Source Options
+ * @cev:	Command Extension Value
  * @rsvd24:	Reserved
  * @elbt:	Expected Initial Logical Block Reference Tag /
  *		Expected Logical Block Storage Tag
@@ -6529,7 +6547,9 @@ struct nvme_copy_range_f3 {
 	__u8			rsvd4[4];
 	__le64			slba;
 	__le16			nlb;
-	__u8			rsvd18[4];
+	__u8			cetype;
+	__u8			rsvd19;
+	__le16			cev;
 	__le16			sopt;
 	__u8			rsvd24[2];
 	__u8			elbt[10];

libnvme/test/ioctl/misc.c

@@ -983,7 +983,7 @@ static void test_dsm(void)
 static void test_copy(void)
 {
 	__u16 nr = TEST_COPY_NR, cev = 0, dspec = 0;
-	int copy_size = sizeof(struct nvme_copy_range) * nr, err;
+	int copy_size = sizeof(struct nvme_copy_range_f0) * nr, err;
 	bool prinfor = false, prinfow = false, stcw = false,
 		stcr = false, fua = false, lr = false;
 	__u8 cetype = 0, dtype = 0, desfmt = 0xf;
@@ -993,7 +993,7 @@ static void test_copy(void)
 	__u32 short_pi[TEST_COPY_NR] = { 0x1000, 0x20000000, 0x40000000 };
 	__u32 elbatms[TEST_COPY_NR] = { 0x1ff, 0x3ff, 0x3ff };
 	__u32 elbats[TEST_COPY_NR] = { 0x111, 0x222, 0x333 };
-	__u8 expected_data[sizeof(struct nvme_copy_range) * TEST_COPY_NR] = {
+	__u8 expected_data[sizeof(struct nvme_copy_range_f0) * TEST_COPY_NR] = {
 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0x10, 0, 0, 0, 0, 0, 0,
 		0xa, 0, 0, 0, 0, 0, 0, 0, 0, 0x10, 0, 0, 0x11, 1, 0xff, 1,
 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x20, 0, 0, 0, 0,
@@ -1002,7 +1002,7 @@ static void test_copy(void)
 		0xc, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x40, 0x33, 3, 0xff, 3
 	};
 
-	_cleanup_free_ struct nvme_copy_range *copy = NULL;
+	_cleanup_free_ struct nvme_copy_range_f0 *copy = NULL;
 
 	copy = calloc(1, copy_size);
 	check(copy, "copy: ENOMEM");
@@ -1017,13 +1017,14 @@ static void test_copy(void)
 			 ((dtype & 0xf) << 20) |
 			 ((prinfow & 0xf) << 26) |
 			 ((fua & 0x1) << 30) | ((lr & 0x1) << 31),
-		.data_len = nr * sizeof(struct nvme_copy_range),
+		.data_len = nr * sizeof(struct nvme_copy_range_f0),
 		.in_data = expected_data,
 	};
 	struct nvme_passthru_cmd cmd;
 
 	set_mock_io_cmds(&mock_io_cmd, 1);
-	nvme_init_copy_range(copy, nlbs, slbas, short_pi, elbatms, elbats, nr);
+	nvme_init_copy_range_f0(copy, nlbs, slbas, short_pi, elbatms, elbats,
+				nr);
 	nvme_init_copy(&cmd, TEST_NSID, sdlba, nr, desfmt,
 		prinfor, prinfow, cetype, dtype, stcw, stcr,
 		fua, lr, cev, dspec, (void *)copy);

nvme.c

@@ -7770,7 +7770,7 @@ static int copy_cmd(int argc, char **argv, struct command *acmd, struct plugin *
 	__u32 elbats[256] = { 0 };
 
 	_cleanup_free_ union {
-		struct nvme_copy_range f0[256];
+		struct nvme_copy_range_f0 f0[256];
 		struct nvme_copy_range_f1 f1[256];
 		struct nvme_copy_range_f2 f2[256];
 		struct nvme_copy_range_f3 f3[256];
@@ -7922,8 +7922,8 @@ static int copy_cmd(int argc, char **argv, struct command *acmd, struct plugin *
 					eilbrts.long_pi, elbatms, elbats, nr);
 		break;
 	default:
-		nvme_init_copy_range(copy->f0, nlbs, slbas, eilbrts.short_pi,
-				     elbatms, elbats, nr);
+		nvme_init_copy_range_f0(copy->f0, nlbs, slbas, eilbrts.short_pi,
+					elbatms, elbats, nr);
 		break;
 	}