ioctl: nvme_dim_send use nvme_passthru_cmd directly

Drop struct nvme_dim_args.

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

Author: ikegami-t

src/libnvme.map

@@ -61,7 +61,6 @@ LIBNVME_2_0 {
 		nvme_default_host;
 		nvme_describe_key_serial;
 		nvme_dev_self_test;
-		nvme_dim_send;
 		nvme_directive_recv;
 		nvme_directive_send;
 		nvme_directive_send_id_endir;

src/nvme/api-types.h

@@ -318,24 +318,6 @@ struct nvme_virtual_mgmt_args {
 	__u16 nr;
 };
 
-/**
- * struct nvme_dim_args - Arguments for the Discovery Information Management (DIM) command
- * @result:	Set on completion to the command's CQE DWORD 0 controller response.
- * @data:	Pointer to the DIM data
- * @args_size:	Length of the structure
- * @timeout:	Timeout in ms
- * @data_len:	Length of @data
- * @tas:	Task field of the Command Dword 10 (cdw10)
- */
-struct nvme_dim_args {
-	__u32	*result;
-	void	*data;
-	int	args_size;
-	__u32	timeout;
-	__u32	data_len;
-	__u8	tas;
-};
-
 /**
  * struct nvme_lm_cdq_args - Arguments for Controller Data Queue (CDQ) command
  * @result:	Set on completion to the command's CQE DWORD 0 controller response

src/nvme/fabrics.c

@@ -1601,13 +1601,6 @@ static int nvmf_dim(nvme_ctrl_t c, enum nvmf_dim_tas tas, __u8 trtype,
 	__u32 tel;
 	int ret;
 
-	struct nvme_dim_args args = {
-		.args_size = sizeof(args),
-		.result = result,
-		.timeout = NVME_DEFAULT_IOCTL_TIMEOUT,
-		.tas = tas
-	};
-
 	if (!c->s) {
 		nvme_msg(r, LOG_ERR,
 			 "%s: failed to perform DIM. subsystem undefined.\n",
@@ -1673,9 +1666,7 @@ static int nvmf_dim(nvme_ctrl_t c, enum nvmf_dim_tas tas, __u8 trtype,
 	die = &dim->die->extended;
 	nvmf_fill_die(die, c->s->h, tel, trtype, adrfam, reg_addr, tsas);
 
-	args.data_len = tdl;
-	args.data = dim;
-	return nvme_dim_send(nvme_ctrl_get_link(c), &args);
+	return nvme_dim_send(nvme_ctrl_get_link(c), tas, dim, tdl, result);
 }
 
 /**

src/nvme/ioctl.c

@@ -1344,25 +1344,6 @@ int nvme_io_passthru(nvme_link_t l, __u8 opcode, __u8 flags, __u16 rsvd,
 			     timeout_ms, result);
 }
 
-int nvme_dim_send(nvme_link_t l, struct nvme_dim_args *args)
-{
-	__u32 cdw10 = NVME_SET(args->tas, DIM_TAS);
-
-	struct nvme_passthru_cmd  cmd = {
-		.opcode     = nvme_admin_discovery_info_mgmt,
-		.cdw10      = cdw10,
-		.addr       = (__u64)(uintptr_t)args->data,
-		.data_len   = args->data_len,
-		.timeout_ms = args->timeout,
-	};
-
-	if (args->args_size < sizeof(*args))
-		return -EINVAL;
-
-	return nvme_submit_admin_passthru(l, &cmd, args->result);
-}
-
-
 int nvme_lm_cdq(nvme_link_t l, struct nvme_lm_cdq_args *args)
 {
 	const size_t size_v1 = sizeof_args(struct nvme_lm_cdq_args, sz_u8, __u64);

src/nvme/ioctl.h

@@ -4959,12 +4959,27 @@ static inline int nvme_zns_append(nvme_link_t l, __u32 nsid, __u64 zslba, __u16
 /**
  * nvme_dim_send - Send a Discovery Information Management (DIM) command
  * @l:		Link handle
- * @args:	&struct nvme_dim_args argument structure
+ * @tas:	Task field of the Command Dword 10 (cdw10)
+ * @data:	Pointer to the DIM data
+ * @data_len:	Length of @data
+ * @result:	Set on completion to the command's CQE DWORD 0 controller response.
  *
  * 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_dim_send(nvme_link_t l, struct nvme_dim_args *args);
+static inline int nvme_dim_send(nvme_link_t l, __u8 tas, void *data, __u32 data_len, __u32 *result)
+{
+	__u32 cdw10 = NVME_SET(tas, DIM_TAS);
+
+	struct nvme_passthru_cmd  cmd = {
+		.opcode     = nvme_admin_discovery_info_mgmt,
+		.addr       = (__u64)(uintptr_t)data,
+		.data_len   = data_len,
+		.cdw10      = cdw10,
+	};
+
+	return nvme_submit_admin_passthru(l, &cmd, result);
+}
 
 /**
  * nvme_lm_cdq() - Controller Data Queue - Controller Data Queue command

test/ioctl/misc.c

@@ -1313,29 +1313,23 @@ static void test_fdp_reclaim_unit_handle_update(void)
 
 static void test_dim_send(void)
 {
-	__u32 result = 0;
 	__u8 expected_data[8], data[8] = {};
-	struct nvme_dim_args args = {
-		.result = 0,
-		.data = &data,
-		.args_size = sizeof(args),
-		.data_len = sizeof(data),
-		.tas = 0xf,
-	};
+	__u32 data_len = sizeof(data);
+	__u32 result = 0;
+	__u8 tas = 0xf;
+	int err;
 
 	struct mock_cmd mock_admin_cmd = {
 		.opcode = nvme_admin_discovery_info_mgmt,
-		.cdw10 = args.tas,
-		.data_len = args.data_len,
+		.cdw10 = tas,
+		.data_len = data_len,
 		.in_data = &expected_data,
 	};
 
-	int err;
-
 	arbitrary(&expected_data, sizeof(expected_data));
 	memcpy(&data, &expected_data, sizeof(expected_data));
 	set_mock_admin_cmds(&mock_admin_cmd, 1);
-	err = nvme_dim_send(test_link, &args);
+	err = nvme_dim_send(test_link, tas, &data, data_len, NULL);
 	end_mock_cmds();
 	check(err == 0, "returned error %d", err);
 	check(result == 0, "returned result %u", result);