ioctl: nvme_dsm use nvme_passthru_cmd directly

Drop struct nvme_dsm_args.

Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>

Author: ikegami-t

src/libnvme.map

@@ -67,7 +67,6 @@ LIBNVME_2_0 {
 		nvme_directive_send;
 		nvme_directive_send_id_endir;
 		nvme_disconnect_ctrl;
-		nvme_dsm;
 		nvme_dump_config;
 		nvme_dump_tree;
 		nvme_errno_to_string;

src/nvme/api-types.h

@@ -449,26 +449,6 @@ struct nvme_io_args {
 	__u8 pif;
 };
 
-/**
- * struct nvme_dsm_args - Arguments for the NVMe Dataset Management command
- * @result:	The command completion result from CQE dword0
- * @dsm:	The data set management attributes
- * @args_size:	Size of &struct nvme_dsm_args
- * @timeout:	Timeout in ms
- * @nsid:	Namespace identifier
- * @attrs:	DSM attributes, see &enum nvme_dsm_attributes
- * @nr_ranges:	Number of block ranges in the data set management attributes
- */
-struct nvme_dsm_args {
-	__u32 *result;
-	struct nvme_dsm_range *dsm;
-	int args_size;
-	__u32 timeout;
-	__u32 nsid;
-	__u32 attrs;
-	__u16 nr_ranges;
-};
-
 /**
  * struct nvme_copy_args - Arguments for the NVMe Copy command
  * @sdlba:	Start destination LBA

src/nvme/ioctl.c

@@ -1751,24 +1751,6 @@ int nvme_io(nvme_link_t l, struct nvme_io_args *args, __u8 opcode)
 	return nvme_submit_io_passthru(l, &cmd, args->result);
 }
 
-int nvme_dsm(nvme_link_t l, struct nvme_dsm_args *args)
-{
-	struct nvme_passthru_cmd cmd = {
-		.opcode		= nvme_cmd_dsm,
-		.nsid		= args->nsid,
-		.addr		= (__u64)(uintptr_t)args->dsm,
-		.data_len	= args->nr_ranges * sizeof(*args->dsm),
-		.cdw10		= args->nr_ranges - 1,
-		.cdw11		= args->attrs,
-		.timeout_ms	= args->timeout,
-	};
-
-	if (args->args_size < sizeof(*args))
-		return -EINVAL;
-
-	return nvme_submit_io_passthru(l, &cmd, args->result);
-}
-
 int nvme_copy(nvme_link_t l, struct nvme_copy_args *args)
 {
 	const size_t size_v1 = sizeof_args(struct nvme_copy_args, format, __u64);

src/nvme/ioctl.h

@@ -327,6 +327,14 @@ enum nvme_cmd_dword_fields {
 	NVME_ZNS_MGMT_RECV_ZRAS_FEAT_MASK			= 0x1,
 	NVME_DIM_TAS_SHIFT					= 0,
 	NVME_DIM_TAS_MASK					= 0xF,
+	NVME_DSM_CDW10_NR_SHIFT					= 0,
+	NVME_DSM_CDW10_NR_MASK					= 0xff,
+	NVME_DSM_CDW11_IDR_SHIFT				= 0,
+	NVME_DSM_CDW11_IDR_MASK					= 0x1,
+	NVME_DSM_CDW11_IDW_SHIFT				= 1,
+	NVME_DSM_CDW11_IDW_MASK					= 0x1,
+	NVME_DSM_CDW11_AD_SHIFT					= 2,
+	NVME_DSM_CDW11_AD_MASK					= 0x1,
 };
 
 /**
@@ -3800,7 +3808,10 @@ static inline int nvme_verify(nvme_link_t l, struct nvme_io_args *args)
 /**
  * nvme_dsm() - Send an nvme data set management command
  * @l:		Link handle
- * @args:	&struct nvme_dsm_args argument structure
+ * @dsm:	The data set management attributes
+ * @nr_ranges:	Number of block ranges in the data set management attributes
+ * @attrs:	DSM attributes, see &enum nvme_dsm_attributes
+ * @nsid:	Namespace identifier
  *
  * The Dataset Management command is used by the host to indicate attributes
  * for ranges of logical blocks. This includes attributes like frequency that
@@ -3811,7 +3822,23 @@ static inline int nvme_verify(nvme_link_t l, struct nvme_io_args *args)
  * Return: 0 on success, the nvme command status if a response was
  * received (see &enum nvme_status_field) or a negative error otherwise.
  */
-int nvme_dsm(nvme_link_t l, struct nvme_dsm_args *args);
+static inline int nvme_dsm(nvme_link_t l, struct nvme_dsm_range *dsm, __u16 nr_ranges, __u32 attrs,
+			   __u32 nsid, __u32 *result)
+{
+	__u32 cdw10 = NVME_SET(nr_ranges - 1, DSM_CDW10_NR);
+	__u32 cdw11 = attrs;
+
+	struct nvme_passthru_cmd cmd = {
+		.opcode		= nvme_cmd_dsm,
+		.nsid		= nsid,
+		.addr		= (__u64)(uintptr_t)dsm,
+		.data_len	= nr_ranges * sizeof(*dsm),
+		.cdw10		= cdw10,
+		.cdw11		= cdw11,
+	};
+
+	return nvme_submit_io_passthru(l, &cmd, result);
+}
 
 /**
  * nvme_copy() - Copy command

test/ioctl/misc.c

@@ -1109,29 +1109,20 @@ static void test_dsm(void)
 	dsm = malloc(dsm_size);
 	check(dsm, "dsm: ENOMEM");
 
-	struct nvme_dsm_args args = {
-		.result = &result,
-		.dsm = dsm,
-		.args_size = sizeof(args),
-		.nsid = TEST_NSID,
-		.attrs = NVME_DSMGMT_AD,
-		.nr_ranges = nr_ranges,
-	};
-
 	struct mock_cmd mock_io_cmd = {
 		.opcode = nvme_cmd_dsm,
 		.nsid = TEST_NSID,
-		.cdw10 = args.nr_ranges - 1,
-		.cdw11 = args.attrs,
+		.cdw10 = nr_ranges - 1,
+		.cdw11 = NVME_DSMGMT_AD,
 		.data_len = dsm_size,
-		.in_data = args.dsm,
+		.in_data = dsm,
 	};
 
 	int err;
 
 	arbitrary(dsm, dsm_size);
 	set_mock_io_cmds(&mock_io_cmd, 1);
-	err = nvme_dsm(test_link, &args);
+	err = nvme_dsm(test_link, dsm, nr_ranges, NVME_DSMGMT_AD, TEST_NSID, &result);
 	end_mock_cmds();
 	check(err == 0, "returned error %d", err);
 	check(result == 0, "returned result %u", result);