Commit 82a95325 authored by Changpeng Liu's avatar Changpeng Liu Committed by Jim Harris
Browse files

nvmf/vfio-user: break bar0 access into 2 functions 



With the new added property access API, we can send a internal
property access request to NVMf library, and we can use
it to reset controller.

Change-Id: Iee8b1146d9eb31bc98a9b297e5c635e43e6fdb12
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10952


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarDong Yi <dongx.yi@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent d1c2027d

lib/nvmf/vfio_user.c

+43 −34
Original line number Diff line number Diff line
@@ -1967,53 +1967,25 @@ handle_dbl_access(struct nvmf_vfio_user_ctrlr *ctrlr, uint32_t *buf, 
	return 0;

}



static ssize_t

access_bar0_fn(vfu_ctx_t *vfu_ctx, char *buf, size_t count, loff_t pos,

static size_t

vfio_user_property_access(struct nvmf_vfio_user_ctrlr *vu_ctrlr,

			  char *buf, size_t count, loff_t pos,

			  bool is_write)

{

	struct nvmf_vfio_user_endpoint *endpoint = vfu_get_private(vfu_ctx);

	struct nvmf_vfio_user_ctrlr *ctrlr;

	struct nvmf_vfio_user_req *req;

	const struct spdk_nvmf_registers *regs;

	int ret;



	ctrlr = endpoint->ctrlr;

	if (endpoint->need_async_destroy || !ctrlr) {

		errno = EIO;

		return -1;

	}



	SPDK_DEBUGLOG(nvmf_vfio,

		      "%s: bar0 %s ctrlr: %p, count=%zu, pos=%"PRIX64"\n",

		      endpoint_id(endpoint), is_write ? "write" : "read",

		      ctrlr, count, pos);



	if (pos >= NVME_DOORBELLS_OFFSET) {

		/*

		 * The fact that the doorbells can be memory mapped doesn't mean

		 * that the client (VFIO in QEMU) is obliged to memory map them,

		 * it might still elect to access them via regular read/write;

		 * we might also have had disable_mappable_bar0 set.

		 */

		ret = handle_dbl_access(ctrlr, (uint32_t *)buf, count,

					pos, is_write);

		if (ret == 0) {

			return count;

		}

		return ret;

	}



	/* Construct a Fabric Property Get/Set command and send it */

	req = get_nvmf_vfio_user_req(ctrlr->sqs[0]);

	req = get_nvmf_vfio_user_req(vu_ctrlr->sqs[0]);

	if (req == NULL) {

		errno = ENOBUFS;

		return -1;

	}

	regs = spdk_nvmf_ctrlr_get_regs(ctrlr->ctrlr);

	regs = spdk_nvmf_ctrlr_get_regs(vu_ctrlr->ctrlr);

	req->cc.raw = regs->cc.raw;



	req->cb_fn = nvmf_vfio_user_prop_req_rsp;

	req->cb_arg = ctrlr->sqs[0];

	req->cb_arg = vu_ctrlr->sqs[0];

	req->req.cmd->prop_set_cmd.opcode = SPDK_NVME_OPC_FABRIC;

	req->req.cmd->prop_set_cmd.cid = 0;

	req->req.cmd->prop_set_cmd.attrib.size = (count / 4) - 1;
@@ -2037,6 +2009,43 @@ access_bar0_fn(vfu_ctx_t *vfu_ctx, char *buf, size_t count, loff_t pos, 
	return count;

}



static ssize_t

access_bar0_fn(vfu_ctx_t *vfu_ctx, char *buf, size_t count, loff_t pos,

	       bool is_write)

{

	struct nvmf_vfio_user_endpoint *endpoint = vfu_get_private(vfu_ctx);

	struct nvmf_vfio_user_ctrlr *ctrlr;

	int ret;



	ctrlr = endpoint->ctrlr;

	if (endpoint->need_async_destroy || !ctrlr) {

		errno = EIO;

		return -1;

	}



	SPDK_DEBUGLOG(nvmf_vfio,

		      "%s: bar0 %s ctrlr: %p, count=%zu, pos=%"PRIX64"\n",

		      endpoint_id(endpoint), is_write ? "write" : "read",

		      ctrlr, count, pos);



	if (pos >= NVME_DOORBELLS_OFFSET) {

		/*

		 * The fact that the doorbells can be memory mapped doesn't mean

		 * that the client (VFIO in QEMU) is obliged to memory map them,

		 * it might still elect to access them via regular read/write;

		 * we might also have had disable_mappable_bar0 set.

		 */

		ret = handle_dbl_access(ctrlr, (uint32_t *)buf, count,

					pos, is_write);

		if (ret == 0) {

			return count;

		}

		return ret;

	}



	return vfio_user_property_access(ctrlr, buf, count, pos, is_write);

}



static ssize_t

access_pci_config(vfu_ctx_t *vfu_ctx, char *buf, size_t count, loff_t offset,

		  bool is_write)