ioctl: rework nvme_virtual_mgmt command

Replace the struct args approach by providing init function for
initializing the passthru commands. This reduces the dependency between
callside and library.

Signed-off-by: Daniel Wagner <wagi@kernel.org>

Author: igaw

src/libnvme.map

@@ -293,7 +293,6 @@ LIBNVME_2_0 {
 		nvme_uuid_from_string;
 		nvme_uuid_random;
 		nvme_uuid_to_string;
-		nvme_virtual_mgmt;
 		nvme_zns_append;
 		nvme_zns_mgmt_recv;
 		nvme_zns_mgmt_send;

src/nvme/api-types.h

@@ -38,27 +38,6 @@ struct nvme_global_ctx *nvme_create_global_ctx(FILE *fp, int log_level);
  */
 void nvme_free_global_ctx(struct nvme_global_ctx *ctx);
 
-/**
- * struct nvme_virtual_mgmt_args - Arguments for the NVMe Virtualization
- *			    resource management command
- * @args_size:	Size of &struct nvme_virtual_mgmt_args
- * @result:	If successful, the CQE dword0
- * @timeout:	Timeout in ms
- * @act:	Virtual resource action, see &enum nvme_virt_mgmt_act
- * @rt:		Resource type to modify, see &enum nvme_virt_mgmt_rt
- * @cntlid:	Controller id for which resources are bing modified
- * @nr:		Number of resources being allocated or assigned
- */
-struct nvme_virtual_mgmt_args {
-	__u32 *result;
-	int args_size;
-	__u32 timeout;
-	enum nvme_virt_mgmt_act act;
-	enum nvme_virt_mgmt_rt rt;
-	__u16 cntlid;
-	__u16 nr;
-};
-
 /**
  * struct nvme_io_args - Arguments for NVMe I/O commands
  * @slba:	Starting logical block

src/nvme/ioctl.c

@@ -621,26 +621,6 @@ int nvme_get_ana_log_atomic(struct nvme_transport_handle *hdl, bool rae, bool rg
 	return -EAGAIN;
 }
 
-int nvme_virtual_mgmt(struct nvme_transport_handle *hdl, struct nvme_virtual_mgmt_args *args)
-{
-	__u32 cdw10 = NVME_SET(args->act, VIRT_MGMT_CDW10_ACT) |
-			NVME_SET(args->rt, VIRT_MGMT_CDW10_RT) |
-			NVME_SET(args->cntlid, VIRT_MGMT_CDW10_CNTLID);
-	__u32 cdw11 = NVME_SET(args->nr, VIRT_MGMT_CDW11_NR);
-
-	struct nvme_passthru_cmd cmd = {
-		.opcode		= nvme_admin_virtual_mgmt,
-		.cdw10		= cdw10,
-		.cdw11		= cdw11,
-		.timeout_ms	= args->timeout,
-	};
-
-	if (args->args_size < sizeof(*args))
-		return -EINVAL;
-
-	return nvme_submit_admin_passthru(hdl, &cmd, args->result);
-}
-
 int nvme_submit_io_passthru64(struct nvme_transport_handle *hdl, struct nvme_passthru_cmd64 *cmd,
 			      __u64 *result)
 {

src/nvme/ioctl.h

@@ -4197,22 +4197,37 @@ nvme_init_dev_self_test(struct nvme_passthru_cmd *cmd, __u32 nsid,
 }
 
 /**
- * nvme_virtual_mgmt() - Virtualization resource management
- * @hdl:	Transport handle
- * @args:	&struct nvme_virtual_mgmt_args argument structure
- *
- * The Virtualization Management command is supported by primary controllers
- * that support the Virtualization Enhancements capability. This command is
- * used for several functions:
- *
- *	- Modifying Flexible Resource allocation for the primary controller
- *	- Assigning Flexible Resources for secondary controllers
- *	- Setting the Online and Offline state for secondary controllers
+ * nvme_init_virtual_mgmt() - Initialize passthru command for
+ * Virtualization Resource Management
+ * @cmd:	Passthru command to use
+ * @act:	Virtual resource action, see &enum nvme_virt_mgmt_act
+ * @rt:		Resource type to modify, see &enum nvme_virt_mgmt_rt
+ * @cntlid:	Controller id for which resources are bing modified
+ * @nr:		Number of resources being allocated or assigned
  *
- * Return: 0 on success, the nvme command status if a response was
- * received (see &enum nvme_status_field) or a negative error otherwise.
+ * Initializes the passthru command buffer for the Virtualization
+ * Management command.
  */
-int nvme_virtual_mgmt(struct nvme_transport_handle *hdl, struct nvme_virtual_mgmt_args *args);
+static inline void
+nvme_init_virtual_mgmt(struct nvme_passthru_cmd *cmd,
+		enum nvme_virt_mgmt_act act, enum nvme_virt_mgmt_rt rt,
+		__u16 cntlid, __u16 nr)
+{
+	memset(cmd, 0, sizeof(*cmd));
+	cmd->opcode = nvme_admin_virtual_mgmt;
+	cmd->cdw10 = NVME_FIELD_ENCODE(act,
+			NVME_VIRT_MGMT_CDW10_ACT_SHIFT,
+			NVME_VIRT_MGMT_CDW10_ACT_MASK) |
+		     NVME_FIELD_ENCODE(rt,
+			NVME_VIRT_MGMT_CDW10_RT_SHIFT,
+			NVME_VIRT_MGMT_CDW10_RT_MASK) |
+		     NVME_FIELD_ENCODE(cntlid,
+			NVME_VIRT_MGMT_CDW10_CNTLID_SHIFT,
+			NVME_VIRT_MGMT_CDW10_CNTLID_MASK);
+	cmd->cdw11 = NVME_FIELD_ENCODE(nr,
+			NVME_VIRT_MGMT_CDW11_NR_SHIFT,
+			NVME_VIRT_MGMT_CDW11_NR_MASK);
+}
 
 /**
  * nvme_flush() - Send an nvme flush command

test/ioctl/misc.c

@@ -726,28 +726,23 @@ static void test_dev_self_test(void)
 
 static void test_virtual_mgmt(void)
 {
+	enum nvme_virt_mgmt_act act = NVME_VIRT_MGMT_ACT_ASSIGN_SEC_CTRL;
+	enum nvme_virt_mgmt_rt rt = NVME_VIRT_MGMT_RT_VI_RESOURCE;
 	__u32 expected_result = 0x45, result = 0;
-
-	struct nvme_virtual_mgmt_args args = {
-		.result = &result,
-		.args_size = sizeof(args),
-		.act = NVME_VIRT_MGMT_ACT_ASSIGN_SEC_CTRL,
-		.rt = NVME_VIRT_MGMT_RT_VI_RESOURCE,
-		.cntlid = 0x0,
-		.nr = 0xff,
-	};
-
+	__u16 cntlid = 0x0;
+	__u16 nr = 0xff;
 	struct mock_cmd mock_admin_cmd = {
 		.opcode = nvme_admin_virtual_mgmt,
-		.cdw10 = args.act | (args.rt << 8) | (args.cntlid << 16),
-		.cdw11 = args.nr,
+		.cdw10 = act | (rt << 8) | (cntlid << 16),
+		.cdw11 = nr,
 		.result = expected_result,
 	};
-
+	struct nvme_passthru_cmd cmd;
 	int err;
 
 	set_mock_admin_cmds(&mock_admin_cmd, 1);
-	err = nvme_virtual_mgmt(test_hdl, &args);
+	nvme_init_virtual_mgmt(&cmd, act, rt, cntlid, nr);
+	err = nvme_submit_admin_passthru(test_hdl, &cmd, &result);
 	end_mock_cmds();
 	check(err == 0, "returned error %d", err);
 	check(result == expected_result, "wrong result");