libnvme/cmds: change copy desc format elbatm and elbat to big-endian

Since the format elbt values are set as big-endian then follow it.

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

Author: ikegami-t

libnvme/src/nvme/cmds.h

@@ -5272,8 +5272,10 @@ nvme_init_copy_range_f0(struct nvme_copy_range_f0 *copy, __u16 *nlbs,
 		copy[i].slba = htole64(slbas[i]);
 		nvme_init_copy_range_elbt(copy[i].elbt, (__u8 *)&elbts[i],
 					  sizeof(elbts[i]));
-		copy[i].elbatm = htole16(elbatms[i]);
-		copy[i].elbat = htole16(elbats[i]);
+		nvme_init_copy_range_elbt(copy[i].elbatm, (__u8 *)&elbatms[i],
+					  sizeof(copy[i].elbatm));
+		nvme_init_copy_range_elbt(copy[i].elbat, (__u8 *)&elbats[i],
+					  sizeof(copy[i].elbat));
 	}
 }
 
@@ -5299,10 +5301,12 @@ nvme_init_copy_range_f1(struct nvme_copy_range_f1 *copy, __u16 *nlbs,
 	for (i = 0; i < nr; i++) {
 		copy[i].nlb = htole16(nlbs[i]);
 		copy[i].slba = htole64(slbas[i]);
-		copy[i].elbatm = htole16(elbatms[i]);
-		copy[i].elbat = htole16(elbats[i]);
 		nvme_init_copy_range_elbt(&copy[i].elbt[2], (__u8 *)&eilbrts[i],
 					  sizeof(eilbrts[i]));
+		nvme_init_copy_range_elbt(copy[i].elbatm, (__u8 *)&elbatms[i],
+					  sizeof(copy[i].elbatm));
+		nvme_init_copy_range_elbt(copy[i].elbat, (__u8 *)&elbats[i],
+					  sizeof(copy[i].elbat));
 	}
 }
 
@@ -5333,8 +5337,10 @@ nvme_init_copy_range_f2(struct nvme_copy_range_f2 *copy,
 		copy[i].sopt = htole16(sopts[i]);
 		nvme_init_copy_range_elbt(copy[i].elbt, (__u8 *)&elbts[i],
 					  sizeof(elbts[i]));
-		copy[i].elbatm = htole16(elbatms[i]);
-		copy[i].elbat = htole16(elbats[i]);
+		nvme_init_copy_range_elbt(copy[i].elbatm, (__u8 *)&elbatms[i],
+					  sizeof(copy[i].elbatm));
+		nvme_init_copy_range_elbt(copy[i].elbat, (__u8 *)&elbats[i],
+					  sizeof(copy[i].elbat));
 	}
 }
 
@@ -5365,10 +5371,12 @@ nvme_init_copy_range_f3(struct nvme_copy_range_f3 *copy, __u32 *snsids,
 		copy[i].nlb = htole16(nlbs[i]);
 		copy[i].slba = htole64(slbas[i]);
 		copy[i].sopt = htole16(sopts[i]);
-		copy[i].elbatm = htole16(elbatms[i]);
-		copy[i].elbat = htole16(elbats[i]);
 		nvme_init_copy_range_elbt(&copy[i].elbt[2], (__u8 *)&eilbrts[i],
 					  sizeof(eilbrts[i]));
+		nvme_init_copy_range_elbt(copy[i].elbatm, (__u8 *)&elbatms[i],
+					  sizeof(copy[i].elbatm));
+		nvme_init_copy_range_elbt(copy[i].elbat, (__u8 *)&elbats[i],
+					  sizeof(copy[i].elbat));
 	}
 }
 

libnvme/src/nvme/types.h

@@ -6458,8 +6458,8 @@ struct nvme_copy_range_f0 {
 	__le16			cev;
 	__u8			rsvd22[2];
 	__u8			elbt[4];
-	__le16			elbat;
-	__le16			elbatm;
+	__u8			elbat[2];
+	__u8			elbatm[2];
 };
 
 /**
@@ -6485,8 +6485,8 @@ struct nvme_copy_range_f1 {
 	__le16			cev;
 	__u8			rsvd22[4];
 	__u8			elbt[10];
-	__le16			elbat;
-	__le16			elbatm;
+	__u8			elbat[2];
+	__u8			elbatm[2];
 };
 
 /**
@@ -6522,8 +6522,8 @@ struct nvme_copy_range_f2 {
 	__le16			cev;
 	__le16			sopt;
 	__u8			elbt[4];
-	__le16			elbat;
-	__le16			elbatm;
+	__u8			elbat[2];
+	__u8			elbatm[2];
 };
 
 /**
@@ -6553,8 +6553,8 @@ struct nvme_copy_range_f3 {
 	__le16			sopt;
 	__u8			rsvd24[2];
 	__u8			elbt[10];
-	__le16			elbat;
-	__le16			elbatm;
+	__u8			elbat[2];
+	__u8			elbatm[2];
 };
 
 /**

libnvme/test/ioctl/misc.c

@@ -995,11 +995,11 @@ static void test_copy(void)
 	__u32 elbats[TEST_COPY_NR] = { 0x111, 0x222, 0x333 };
 	__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, 0, 0x10, 0, 0x11, 1, 0xff, 1,
+		0xa, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x10, 0, 1, 0x11, 1, 0xff,
 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x20, 0, 0, 0, 0,
-		0xb, 0, 0, 0, 0, 0, 0, 0, 0x20, 0, 0, 0, 0x22, 2, 0xff, 3,
+		0xb, 0, 0, 0, 0, 0, 0, 0, 0x20, 0, 0, 0, 2, 0x22, 3, 0xff,
 		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x40, 0, 0x30, 0, 0,
-		0xc, 0, 0, 0, 0, 0, 0, 0, 0x40, 0, 0, 0, 0x33, 3, 0xff, 3
+		0xc, 0, 0, 0, 0, 0, 0, 0, 0x40, 0, 0, 0, 3, 0x33, 3, 0xff
 	};
 
 	_cleanup_free_ struct nvme_copy_range_f0 *copy = NULL;