ioctl: rework nvme_lm_track_send 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

@@ -141,7 +141,6 @@ LIBNVME_2_0 {
 		nvme_lm_migration_recv;
 		nvme_lm_migration_send;
 		nvme_lm_set_features_ctrl_data_queue;
-		nvme_lm_track_send;
 		nvme_lookup_ctrl;
 		nvme_lookup_host;
 		nvme_lookup_key;

libnvme/src/nvme/api-types.h

@@ -143,24 +143,6 @@ struct nvme_copy_args {
 	__u64 ilbrt_u64;
 };
 
-/**
- * struct nvme_lm_track_send_args - Arguments for the Track Send command
- * @result:	Set on completion to the command's CQE DWORD 0 controller response
- * @args_size:	Length of structure
- * @timeout:	Timeout in ms
- * @mos:	Management Operation Specific (MOS): This field is specific to the SEL type
- * @cdqid:	Controller Data Queue ID (CDQID)
- * @sel:	Select (SEL): This field specifies the type of management operation to perform
- */
-struct nvme_lm_track_send_args {
-	__u32	*result;
-	int	args_size;
-	__u32	timeout;
-	__u16	mos;
-	__u16	cdqid;
-	__u8	sel;
-};
-
 /**
  * struct nvme_lm_migration_send_args - Arguments for the Migration Send command
  * @offset:	Offset: This field specifies the offset, in bytes, within the data available to be

libnvme/src/nvme/ioctl.c

@@ -772,24 +772,6 @@ 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_track_send(struct nvme_transport_handle *hdl, struct nvme_lm_track_send_args *args)
-{
-	__u32 cdw10 = NVME_SET(args->sel, LM_TRACK_SEND_SEL) |
-		      NVME_SET(args->mos, LM_TRACK_SEND_MOS);
-
-	struct nvme_passthru_cmd cmd = {
-		.opcode = nvme_admin_track_send,
-		.cdw10 = cdw10,
-		.cdw11 = args->cdqid,
-		.timeout_ms = args->timeout,
-	};
-
-	if (args->args_size < sizeof(*args))
-		return -EINVAL;
-
-	return nvme_submit_admin_passthru(hdl, &cmd, args->result);
-}
-
 int nvme_lm_migration_send(struct nvme_transport_handle *hdl, struct nvme_lm_migration_send_args *args)
 {
 	__u32 cdw10 = NVME_SET(args->sel, LM_MIGRATION_SEND_SEL) |

libnvme/src/nvme/ioctl.h

@@ -5138,14 +5138,32 @@ nvme_init_lm_cdq_delete(struct nvme_passthru_cmd *cmd,
 }
 
 /**
- * nvme_lm_track_send() - Track Send command
- * @hdl:	Transport handle
- * @args:	&struct nvme_lm_track_send_args argument structure
+ * nvme_init_lm_track_send() - Initialize passthru command for
+ * Track Send command
+ * @cmd:	Passthru command to use
+ * @sel:	Select (SEL): This field specifies the type of
+ *		management operation to perform
+ * @mos:	Management Operation Specific (MOS): This field
+ *		is specific to the SEL type
+ * @cdqid:	Controller Data Queue ID (CDQID)
  *
- * 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 Track Send command.
  */
-int nvme_lm_track_send(struct nvme_transport_handle *hdl, struct nvme_lm_track_send_args *args);
+static inline void
+nvme_init_lm_track_send(struct nvme_passthru_cmd *cmd,
+		__u8 sel, __u16 mos, __u16 cdqid)
+{
+
+	memset(cmd, 0, sizeof(*cmd));
+	cmd->opcode = nvme_admin_track_send;
+	cmd->cdw10 = NVME_FIELD_ENCODE(sel,
+			NVME_LM_TRACK_SEND_SEL_SHIFT,
+			NVME_LM_TRACK_SEND_SEL_MASK) |
+		     NVME_FIELD_ENCODE(mos,
+			NVME_LM_TRACK_SEND_MOS_SHIFT,
+			NVME_LM_TRACK_SEND_MOS_MASK);
+	cmd->cdw11 = cdqid;
+}
 
 /**
  * nvme_lm_migration_send() - Migration Send command

libnvme/test/ioctl/misc.c

@@ -1377,25 +1377,21 @@ static void test_lm_cdq_delete(void)
 
 static void test_lm_track_send(void)
 {
+	__u8 sel = NVME_LM_SEL_DELETE_CDQ;
+	__u16 cdqid = 0x3;
 	__u32 result = 0;
-	struct nvme_lm_track_send_args args = {
-		.result = 0,
-		.args_size = sizeof(args),
-		.mos = 0x1,
-		.cdqid = 0x3,
-		.sel = NVME_LM_SEL_DELETE_CDQ,
-	};
-
+	__u16 mos = 0x1;
 	struct mock_cmd mock_admin_cmd = {
 		.opcode = nvme_admin_track_send,
-		.cdw10 = args.sel | (args.mos << 16),
-		.cdw11 = args.cdqid,
+		.cdw10 = sel | (mos << 16),
+		.cdw11 = cdqid,
 	};
-
+	struct nvme_passthru_cmd cmd;
 	int err;
 
 	set_mock_admin_cmds(&mock_admin_cmd, 1);
-	err = nvme_lm_track_send(test_hdl, &args);
+	nvme_init_lm_track_send(&cmd, sel, mos, cdqid);
+	err = nvme_submit_admin_passthru(test_hdl, &cmd, &result);
 	end_mock_cmds();
 	check(err == 0, "returned error %d", err);
 	check(result == 0, "returned result %u", result);