ioctl: rework nvme_lm_get_features_data_queue 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 <[email protected]>

Author: igaw

libnvme/src/libnvme.map

@@ -137,7 +137,6 @@ LIBNVME_2_0 {
 		nvme_io_passthru64;
 		nvme_io_passthru;
 		nvme_ipaddrs_eq;
-		nvme_lm_get_features_ctrl_data_queue;
 		nvme_lookup_ctrl;
 		nvme_lookup_host;
 		nvme_lookup_key;

libnvme/src/nvme/ioctl.c

@@ -771,17 +771,3 @@ int nvme_copy(struct nvme_transport_handle *hdl, struct nvme_copy_args *args)
 
 	return nvme_submit_io_passthru(hdl, &cmd, args->result);
 }
-
-int nvme_lm_get_features_ctrl_data_queue(struct nvme_transport_handle *hdl, __u16 cdqid,
-					 struct nvme_lm_ctrl_data_queue_fid_data *data,
-					 __u32 *result)
-{
-	struct nvme_passthru_cmd cmd;
-
-	nvme_init_get_features(&cmd, NVME_FEAT_FID_CTRL_DATA_QUEUE, 0);
-	cmd.cdw11 = cdqid;
-	cmd.data_len = sizeof(*data);
-	cmd.addr = (__u64)(uintptr_t)data;
-
-	return nvme_submit_admin_passthru(hdl, &cmd, result);
-}

libnvme/src/nvme/ioctl.h

@@ -5332,18 +5332,27 @@ nvme_init_lm_set_features_ctrl_data_queue(struct nvme_passthru_cmd *cmd,
 }
 
 /**
- * nvme_lm_get_features_ctrl_data_queue - Get Controller Data Queue feature
- * @hdl:	Transport handle
+ * nvme_init_lm_get_features_ctrl_data_queue() - Initialize passthru command for
+ * Get Controller Data Queue feature
+ * @cmd:	Passthru command to use
+ * @sel:	Select which type of attribute to return,
+ *		see &enum nvme_get_features_sel
  * @cdqid:	Controller Data Queue ID (CDQID)
- * @data:	Get Controller Data Queue feature data
- * @result:	The command completions result from CQE dword0
+ * @qfd:	Get Controller Data Queue feature data buffer
  *
- * 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 Get Features command with
+ * FID value %NVME_FEAT_FID_CTRL_DATA_QUEUE.
  */
-int nvme_lm_get_features_ctrl_data_queue(struct nvme_transport_handle *hdl, __u16 cdqid,
-					 struct nvme_lm_ctrl_data_queue_fid_data *data,
-					 __u32 *result);
+static inline void
+nvme_init_lm_get_features_ctrl_data_queue(struct nvme_passthru_cmd *cmd,
+		enum nvme_get_features_sel sel, __u16 cdqid,
+		struct nvme_lm_ctrl_data_queue_fid_data *qfd)
+{
+	nvme_init_get_features(cmd, NVME_FEAT_FID_CTRL_DATA_QUEUE, sel);
+	cmd->data_len = sizeof(*qfd);
+	cmd->addr = (__u64)(uintptr_t)qfd;
+	cmd->cdw11 = cdqid;
+}
 
 /**
  * nvme_identify() - Submit a generic Identify command

libnvme/test/ioctl/features.c

@@ -1594,19 +1594,21 @@ static void test_lm_get_features_ctrl_data_queue(void)
 	struct mock_cmd mock_admin_cmd = {
 		.opcode = nvme_admin_get_features,
 		.nsid = NVME_NSID_NONE,
-		.cdw10 = NVME_FEAT_FID_CTRL_DATA_QUEUE,
+		.cdw10 = TEST_SEL << 8 | NVME_FEAT_FID_CTRL_DATA_QUEUE,
 		.cdw11 = TEST_CDQID,
 		.data_len = sizeof(expected_data),
 		.out_data = &expected_data,
 		.result = TEST_RESULT,
 	};
+	struct nvme_passthru_cmd cmd;
 	uint32_t result = 0;
 	int err;
 
 	arbitrary(&expected_data, sizeof(expected_data));
 	set_mock_admin_cmds(&mock_admin_cmd, 1);
-	err = nvme_lm_get_features_ctrl_data_queue(test_hdl, TEST_CDQID, &data,
-						   &result);
+	nvme_init_lm_get_features_ctrl_data_queue(&cmd, TEST_SEL,
+		TEST_CDQID, &data);
+	err = nvme_submit_admin_passthru(test_hdl, &cmd, &result);
 	end_mock_cmds();
 	check(err == 0, "get features returned error %d, errno %m", err);
 	check(result == TEST_RESULT,