ioctl: nvme_zns_mgmt_recv use nvme_passthru_cmd directly

Drop struct nvme_zns_mgmt_recv_args.

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

Author: ikegami-t

src/libnvme.map

@@ -357,7 +357,6 @@ LIBNVME_2_0 {
 		nvme_uuid_to_string;
 		nvme_virtual_mgmt;
 		nvme_zns_append;
-		nvme_zns_mgmt_recv;
 		nvmf_add_ctrl;
 		nvmf_adrfam_str;
 		nvmf_cms_str;

src/nvme/api-types.h

@@ -318,32 +318,6 @@ struct nvme_virtual_mgmt_args {
 	__u16 nr;
 };
 
-/**
- * struct nvme_zns_mgmt_recv_args - Arguments for the NVMe ZNS Management Receive command
- * @slba:	Starting logical block address
- * @result:	The command completion result from CQE dword0
- * @data:	Userspace address of the data
- * @args_size:	Size of &struct nvme_zns_mgmt_recv_args
- * @timeout:	timeout in ms
- * @nsid:	Namespace ID
- * @zra:	zone receive action
- * @data_len:	Length of @data
- * @zrasf:	Zone receive action specific field
- * @zras_feat:	Zone receive action specific features
- */
-struct nvme_zns_mgmt_recv_args {
-	__u64 slba;
-	__u32 *result;
-	void *data;
-	int args_size;
-	__u32 timeout;
-	__u32 nsid;
-	enum nvme_zns_recv_action zra;
-	__u32 data_len;
-	__u16 zrasf;
-	bool zras_feat;
-};
-
 /**
  * struct nvme_zns_append_args - Arguments for the NVMe ZNS Append command
  * @zslba:	Zone start logical block address

src/nvme/ioctl.c

@@ -1344,33 +1344,6 @@ int nvme_io_passthru(nvme_link_t l, __u8 opcode, __u8 flags, __u16 rsvd,
 			     timeout_ms, result);
 }
 
-int nvme_zns_mgmt_recv(nvme_link_t l, struct nvme_zns_mgmt_recv_args *args)
-{
-	__u32 cdw10 = args->slba & 0xffffffff;
-	__u32 cdw11 = args->slba >> 32;
-	__u32 cdw12 = (args->data_len >> 2) - 1;
-	__u32 cdw13 = NVME_SET(args->zra, ZNS_MGMT_RECV_ZRA) |
-			NVME_SET(args->zrasf, ZNS_MGMT_RECV_ZRASF) |
-			NVME_SET(args->zras_feat, ZNS_MGMT_RECV_ZRAS_FEAT);
-
-	struct nvme_passthru_cmd cmd = {
-		.opcode		= nvme_zns_cmd_mgmt_recv,
-		.nsid		= args->nsid,
-		.cdw10		= cdw10,
-		.cdw11		= cdw11,
-		.cdw12		= cdw12,
-		.cdw13		= cdw13,
-		.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_io_passthru(l, &cmd, args->result);
-}
-
 int nvme_zns_append(nvme_link_t l, struct nvme_zns_append_args *args)
 {
 	const size_t size_v1 = sizeof_args(struct nvme_zns_append_args, lbatm, __u64);

src/nvme/ioctl.h

@@ -4847,12 +4847,41 @@ static inline int nvme_zns_mgmt_send(nvme_link_t l, __u32 nsid, __u64 slba,
 /**
  * nvme_zns_mgmt_recv() - ZNS management receive command
  * @l:		Link handle
- * @args:	&struct nvme_zns_mgmt_recv_args argument structure
+ * @nsid:	Namespace ID
+ * @slba:	Starting logical block address
+ * @zra:	zone receive action
+ * @zrasf:	Zone receive action specific field
+ * @zras_feat:	Zone receive action specific features
+ * @data:	Userspace address of the data
+ * @data_len:	Length of @data
+ * @result:	The command completion result from CQE dword0
  *
  * 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_zns_mgmt_recv(nvme_link_t l, struct nvme_zns_mgmt_recv_args *args);
+static inline int nvme_zns_mgmt_recv(nvme_link_t l, __u32 nsid, __u64 slba,
+				     enum nvme_zns_recv_action zra, __u16 zrasf, bool zras_feat,
+				     void *data, __u32 data_len, __u32 *result)
+{
+	__u32 cdw10 = slba & 0xffffffff;
+	__u32 cdw11 = slba >> 32;
+	__u32 cdw12 = (data_len >> 2) - 1;
+	__u32 cdw13 = NVME_SET(zra, ZNS_MGMT_RECV_ZRA) | NVME_SET(zrasf, ZNS_MGMT_RECV_ZRASF) |
+		      NVME_SET(zras_feat, ZNS_MGMT_RECV_ZRAS_FEAT);
+
+	struct nvme_passthru_cmd cmd = {
+		.opcode		= nvme_zns_cmd_mgmt_recv,
+		.nsid		= nsid,
+		.addr		= (__u64)(uintptr_t)data,
+		.data_len	= data_len,
+		.cdw10		= cdw10,
+		.cdw11		= cdw11,
+		.cdw12		= cdw12,
+		.cdw13		= cdw13,
+	};
+
+	return nvme_submit_io_passthru(l, &cmd, result);
+}
 
 /**
  * nvme_zns_report_zones() - Return the list of zones
@@ -4864,33 +4893,18 @@ int nvme_zns_mgmt_recv(nvme_link_t l, struct nvme_zns_mgmt_recv_args *args);
  * @partial:	Partial report requested
  * @data_len:	Length of the data buffer
  * @data:	Userspace address of the report zones data
- * @timeout:	timeout in ms
  * @result:	The command completion result from CQE dword0
  *
  * Return: 0 on success, the nvme command status if a response was
  * received (see &enum nvme_status_field) or a negative error otherwise.
  */
 static inline int nvme_zns_report_zones(nvme_link_t l, __u32 nsid, __u64 slba,
-			  enum nvme_zns_report_options opts,
-			  bool extended, bool partial,
-			  __u32 data_len, void *data,
-			  __u32 timeout, __u32 *result)
+					enum nvme_zns_report_options opts, bool extended,
+					bool partial, __u32 data_len, void *data, __u32 *result)
 {
-	struct nvme_zns_mgmt_recv_args args = {
-		.slba = slba,
-		.result = result,
-		.data = data,
-		.args_size = sizeof(args),
-		.timeout = timeout,
-		.nsid = nsid,
-		.zra = extended ? NVME_ZNS_ZRA_EXTENDED_REPORT_ZONES :
-		NVME_ZNS_ZRA_REPORT_ZONES,
-		.data_len = data_len,
-		.zrasf = (__u16)opts,
-		.zras_feat = partial,
-	};
-
-	return nvme_zns_mgmt_recv(l, &args);
+	return nvme_zns_mgmt_recv(l, nsid, slba, extended ? NVME_ZNS_ZRA_EXTENDED_REPORT_ZONES :
+				  NVME_ZNS_ZRA_REPORT_ZONES, (__u16)opts, partial, data, data_len,
+				  result);
 }
 
 /**

test/ioctl/zns.c

@@ -58,12 +58,12 @@ static void test_zns_append(void)
 
 static void test_zns_report_zones(void)
 {
+	enum nvme_zns_report_options opts = NVME_ZNS_ZRAS_REPORT_CLOSED;
 	__u8 expected_data[8], data[8] = {};
-	__u32 result = 0;
-	uint32_t timeout = 1234;
 	bool extended = true;
 	bool partial = true;
-	enum nvme_zns_report_options opts = NVME_ZNS_ZRAS_REPORT_CLOSED;
+	__u32 result = 0;
+	int err;
 
 	struct mock_cmd mock_io_cmd = {
 		.opcode = nvme_zns_cmd_mgmt_recv,
@@ -75,16 +75,12 @@ static void test_zns_report_zones(void)
 			 (!!partial << 16),
 		.data_len = sizeof(expected_data),
 		.out_data = &expected_data,
-		.timeout_ms = timeout,
 	};
 
-	int err;
-
 	arbitrary(&expected_data, sizeof(expected_data));
 	set_mock_io_cmds(&mock_io_cmd, 1);
-	err = nvme_zns_report_zones(test_link, TEST_NSID, TEST_SLBA, opts,
-				    extended, partial, sizeof(data), &data,
-				    timeout, &result);
+	err = nvme_zns_report_zones(test_link, TEST_NSID, TEST_SLBA, opts, extended, partial,
+				    sizeof(data), &data, &result);
 	end_mock_cmds();
 	check(err == 0, "returned error %d", err);
 	check(result == 0, "returned result %u", result);
@@ -123,40 +119,26 @@ static void test_zns_mgmt_send(void)
 
 static void test_zns_mgmt_recv(void)
 {
+	enum nvme_zns_recv_action zra = NVME_ZNS_ZRA_REPORT_ZONES;
 	__u8 expected_data[8], data[8] = {};
+	__u16 zrasf = (__u16)NVME_ZNS_ZRAS_REPORT_ALL;
+	bool zras_feat = false;
 	__u32 result = 0;
-	uint32_t timeout = 1234;
-	bool partial = false;
-
-	struct nvme_zns_mgmt_recv_args args = {
-		.slba = 0,
-		.result = &result,
-		.data = data,
-		.args_size = sizeof(args),
-		.timeout = timeout,
-		.nsid = TEST_NSID,
-		.zra = NVME_ZNS_ZRA_REPORT_ZONES,
-		.data_len = sizeof(data),
-		.zrasf = (__u16)NVME_ZNS_ZRAS_REPORT_ALL,
-		.zras_feat = partial,
-	};
+	int err;
 
 	struct mock_cmd mock_io_cmd = {
 		.opcode = nvme_zns_cmd_mgmt_recv,
 		.nsid = TEST_NSID,
 		.cdw12 = (sizeof(expected_data) >> 2) - 1,
-		.cdw13 = (!!args.zra << 0) | ((__u16)args.zrasf << 8) |
-			 (!!args.zras_feat << 16),
+		.cdw13 = (!!zra << 0) | ((__u16)zrasf << 8) | (!!zras_feat << 16),
 		.data_len = sizeof(expected_data),
 		.out_data = &expected_data,
-		.timeout_ms = timeout,
 	};
 
-	int err;
-
 	arbitrary(&expected_data, sizeof(expected_data));
 	set_mock_io_cmds(&mock_io_cmd, 1);
-	err = nvme_zns_mgmt_recv(test_link, &args);
+	err = nvme_zns_mgmt_recv(test_link, TEST_NSID, 0, zra, zrasf, zras_feat, data, sizeof(data),
+				 &result);
 	end_mock_cmds();
 	check(err == 0, "returned error %d", err);
 	check(result == 0, "returned result %u", result);