Use argument structure for nvme_set_property() and nvme_get_property()

Use an argument structure instead of passing all arguments one by one.
This allows for a future expansion of the argument list without having
to change the library ABI.

Signed-off-by: Hannes Reinecke <[email protected]>

Author: hreinecke

src/nvme/ioctl.c

@@ -1417,37 +1417,40 @@ int nvme_lockdown(struct nvme_lockdown_args *args)
 	return nvme_submit_admin_passthru(args->fd, &cmd, args->result);
 }
 
-int nvme_set_property(int fd, int offset, __u64 value,
-		      __u32 timeout, __u32 *result)
+int nvme_set_property(struct nvme_set_property_args *args)
 {
-	__u32 cdw10 = nvme_is_64bit_reg(offset);
+	__u32 cdw10 = nvme_is_64bit_reg(args->offset);
 
 	struct nvme_passthru_cmd cmd = {
 		.opcode		= nvme_admin_fabrics,
 		.nsid		= nvme_fabrics_type_property_set,
 		.cdw10		= cdw10,
-		.cdw11		= offset,
-		.cdw12		= value & 0xffffffff,
-		.cdw13		= value >> 32,
-		.timeout_ms	= timeout,
+		.cdw11		= args->offset,
+		.cdw12		= args->value & 0xffffffff,
+		.cdw13		= args->value >> 32,
+		.timeout_ms	= args->timeout,
 	};
 
-	return nvme_submit_admin_passthru(fd, &cmd, result);
+	if (args->args_size < sizeof(*args))
+		return -EINVAL;
+	return nvme_submit_admin_passthru(args->fd, &cmd, args->result);
 }
 
-int nvme_get_property(int fd, int offset, __u64 *value, __u32 timeout)
+int nvme_get_property(struct nvme_get_property_args *args)
 {
-	__u32 cdw10 = nvme_is_64bit_reg(offset);
+	__u32 cdw10 = nvme_is_64bit_reg(args->offset);
 
 	struct nvme_passthru_cmd64 cmd = {
 		.opcode		= nvme_admin_fabrics,
 		.nsid		= nvme_fabrics_type_property_get,
 		.cdw10		= cdw10,
-		.cdw11		= offset,
-		.timeout_ms	= timeout,
+		.cdw11		= args->offset,
+		.timeout_ms	= args->timeout,
 	};
 
-	return nvme_submit_admin_passthru64(fd, &cmd, value);
+	if (args->args_size < sizeof(*args))
+		return -EINVAL;
+	return nvme_submit_admin_passthru64(args->fd, &cmd, args->value);
 }
 
 int nvme_sanitize_nvm(int fd, enum nvme_sanitize_sanact sanact, bool ause,

src/nvme/ioctl.h

@@ -3381,36 +3381,60 @@ struct nvme_lockdown_args {
 int nvme_lockdown(struct nvme_lockdown_args *args);
 
 /**
- * nvme_set_property() - Set controller property
+ * nvme_set_property_args - Arguments for NVMe Set Property command
  * @fd:		File descriptor of nvme device
  * @offset:	Property offset from the base to set
  * @value:	The value to set the property
  * @timeout:	Timeout in ms
  * @result:	The command completion result from CQE dword0
+ */
+struct nvme_set_property_args {
+	int args_size;
+	int fd;
+	int offset;
+	__u64 value;
+	__u32 timeout;
+	__u32 *result;
+};
+
+/**
+ * nvme_set_property() - Set controller property
+ * @args:	&struct nvme_set_property_args argument structure
  *
  * This is an NVMe-over-Fabrics specific command, not applicable to PCIe. These
  * properties align to the PCI MMIO controller registers.
  *
  * Return: The nvme command status if a response was received (see
  * &enum nvme_status_field) or -1 with errno set otherwise.
  */
-int nvme_set_property(int fd, int offset, __u64 value,
-		      __u32 timeout, __u32 *result);
+int nvme_set_property(struct nvme_set_property_args *args);
 
 /**
- * nvme_get_property() - Get a controller property
+ * nvme_get_property_args - Arguments for NVMe Get Property command
  * @fd:		File descriptor of nvme device
  * @offset:	Property offset from the base to retrieve
  * @value:	Where the property's value will be stored on success
  * @timeout:	Timeout in ms
+ */
+struct nvme_get_property_args {
+	int args_size;
+	int fd;
+	int offset;
+	__u64 *value;
+	__u32 timeout;
+};
+
+/**
+ * nvme_get_property() - Get a controller property
+ * @args:	&struct nvme_get_propert_args argument structure
  *
  * This is an NVMe-over-Fabrics specific command, not applicable to PCIe. These
  * properties align to the PCI MMIO controller registers.
  *
  * Return: The nvme command status if a response was received (see
  * &enum nvme_status_field) or -1 with errno set otherwise.
  */
-int nvme_get_property(int fd, int offset, __u64 *value, __u32 timeout);
+int nvme_get_property(struct nvme_get_property_args *args);
 
 /**
  * nvme_sanitize_nvm() - Start a sanitize operation