ioctl: rework nvme_io commands

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

@@ -133,7 +133,6 @@ LIBNVME_2_0 {
 		nvme_init_logging;
 		nvme_insert_tls_key;
 		nvme_insert_tls_key_versioned;
-		nvme_io;
 		nvme_io_passthru64;
 		nvme_io_passthru;
 		nvme_ipaddrs_eq;

libnvme/src/nvme/api-types.h

@@ -38,68 +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_io_args - Arguments for NVMe I/O commands
- * @slba:	Starting logical block
- * @storage_tag: This filed specifies Variable Sized Expected Logical Block
- *		Storage Tag (ELBST) or Logical Block Storage Tag (LBST)
- * @result:	The command completion result from CQE dword0
- * @data:	Pointer to user address of the data buffer
- * @metadata:	Pointer to user address of the metadata buffer
- * @args_size:	Size of &struct nvme_io_args
- * @timeout:	Timeout in ms
- * @nsid:	Namespace ID
- * @data_len:	Length of user buffer, @data, in bytes
- * @metadata_len:Length of user buffer, @metadata, in bytes
- * @nlb:	Number of logical blocks to send (0's based value)
- * @control:	Command control flags, see &enum nvme_io_control_flags.
- * @apptag:	This field specifies the Application Tag Mask expected value.
- *		Used only if the namespace is formatted to use end-to-end
- *		protection information.
- * @appmask:	This field specifies the Application Tag expected value. Used
- *		only if the namespace is formatted to use end-to-end protection
- *		information.
- * @reftag:	This field specifies the variable sized Expected Initial
- *		Logical Block Reference Tag (EILBRT) or Initial Logical Block
- *		Reference Tag (ILBRT). Used only if the namespace is formatted
- *		to use end-to-end protection information.
- * @dspec:	Directive specific value
- * @dsm:	Data set management attributes, see &enum nvme_io_dsm_flags
- * @rsvd1:	Reserved
- * @reftag_u64:	This field specifies the variable sized Expected Initial
- *		Logical Block Reference Tag (EILBRT) or Initial Logical Block
- *		Reference Tag (ILBRT). It is the 8 byte version required for
- *		enhanced protection information.  Used only if the namespace is
- *		formatted to use end-to-end protection information.
- * @sts:	Storage tag size in bits, set by namespace Extended LBA Format
- * @pif:	Protection information format, determines how variable sized
- *		storage_tag and reftag are put into dwords 2, 3, and 14. Set by
- *		namespace Extended LBA Format.
- */
-struct nvme_io_args {
-	__u64 slba;
-	__u64 storage_tag;
-	__u32 *result;
-	void *data;
-	void *metadata;
-	int args_size;
-	__u32 timeout;
-	__u32 nsid;
-	__u32 reftag;
-	__u32 data_len;
-	__u32 metadata_len;
-	__u16 nlb;
-	__u16 control;
-	__u16 apptag;
-	__u16 appmask;
-	__u16 dspec;
-	__u8 dsm;
-	__u8 rsvd1[1];
-	__u64 reftag_u64;
-	__u8 sts;
-	__u8 pif;
-};
-
 /**
  * struct nvme_copy_args - Arguments for the NVMe Copy command
  * @sdlba:	Start destination LBA

libnvme/src/nvme/ioctl.c

@@ -656,84 +656,6 @@ int nvme_io_passthru(struct nvme_transport_handle *hdl, __u8 opcode, __u8 flags,
 			     timeout_ms, result);
 }
 
-static int nvme_set_var_size_tags(__u32 *cmd_dw2, __u32 *cmd_dw3, __u32 *cmd_dw14,
-		__u8 pif, __u8 sts, __u64 reftag, __u64 storage_tag)
-{
-	__u32 cdw2 = 0, cdw3 = 0, cdw14;
-
-	switch (pif) {
-	case NVME_NVM_PIF_16B_GUARD:
-		cdw14 = reftag & 0xffffffff;
-		cdw14 |= ((storage_tag << (32 - sts)) & 0xffffffff);
-		break;
-	case NVME_NVM_PIF_32B_GUARD:
-		cdw14 = reftag & 0xffffffff;
-		cdw3 = reftag >> 32;
-		cdw14 |= ((storage_tag << (80 - sts)) & 0xffff0000);
-		if (sts >= 48)
-			cdw3 |= ((storage_tag >> (sts - 48)) & 0xffffffff);
-		else
-			cdw3 |= ((storage_tag << (48 - sts)) & 0xffffffff);
-		cdw2 = (storage_tag >> (sts - 16)) & 0xffff;
-		break;
-	case NVME_NVM_PIF_64B_GUARD:
-		cdw14 = reftag & 0xffffffff;
-		cdw3 = (reftag >> 32) & 0xffff;
-		cdw14 |= ((storage_tag << (48 - sts)) & 0xffffffff);
-		if (sts >= 16)
-			cdw3 |= ((storage_tag >> (sts - 16)) & 0xffff);
-		else
-			cdw3 |= ((storage_tag << (16 - sts)) & 0xffff);
-		break;
-	default:
-		perror("Unsupported Protection Information Format");
-		return -EINVAL;
-	}
-
-	*cmd_dw2 = cdw2;
-	*cmd_dw3 = cdw3;
-	*cmd_dw14 = cdw14;
-	return 0;
-}
-
-int nvme_io(struct nvme_transport_handle *hdl, struct nvme_io_args *args, __u8 opcode)
-{
-	__u32 cdw2, cdw3, cdw10, cdw11, cdw12, cdw13, cdw14, cdw15;
-
-	cdw10 = args->slba & 0xffffffff;
-	cdw11 = args->slba >> 32;
-	cdw12 = args->nlb | (args->control << 16);
-	cdw13 = args->dsm | (args->dspec << 16);
-	cdw15 = args->apptag | (args->appmask << 16);
-
-	if (nvme_set_var_size_tags(&cdw2, &cdw3, &cdw14,
-				args->pif,
-				args->sts,
-				args->reftag_u64,
-				args->storage_tag))
-		return -EINVAL;
-
-	struct nvme_passthru_cmd cmd = {
-		.opcode		= opcode,
-		.nsid		= args->nsid,
-		.cdw2		= cdw2,
-		.cdw3		= cdw3,
-		.cdw10		= cdw10,
-		.cdw11		= cdw11,
-		.cdw12		= cdw12,
-		.cdw13		= cdw13,
-		.cdw14		= cdw14,
-		.cdw15		= cdw15,
-		.data_len	= args->data_len,
-		.metadata_len	= args->metadata_len,
-		.addr		= (__u64)(uintptr_t)args->data,
-		.metadata	= (__u64)(uintptr_t)args->metadata,
-		.timeout_ms	= args->timeout,
-	};
-
-	return nvme_submit_io_passthru(hdl, &cmd, args->result);
-}
-
 int nvme_copy(struct nvme_transport_handle *hdl, struct nvme_copy_args *args)
 {
 	__u32 cdw3, cdw12, cdw14, data_len;