Commit 275c5dec authored by Changpeng Liu's avatar Changpeng Liu Committed by Tomasz Zawadzki
Browse files

nvmf/vfio-user: apply new DMA add/remove APIs 



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


Community-CI: Broadcom CI
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatar <dongx.yi@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent addfab01

lib/nvmf/vfio_user.c

+31 −10
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ map_one(vfu_ctx_t *ctx, uint64_t addr, uint64_t len, dma_sg_t *sg, struct iovec 
	assert(sg != NULL);

	assert(iov != NULL);



	ret = vfu_addr_to_sg(ctx, addr, len, sg, 1, PROT_READ | PROT_WRITE);

	ret = vfu_addr_to_sg(ctx, (void *)(uintptr_t)addr, len, sg, 1, PROT_READ | PROT_WRITE);

	if (ret != 1) {

		return NULL;

	}
@@ -1066,21 +1066,30 @@ unmap_admin_queue(struct nvmf_vfio_user_ctrlr *ctrlr) 
}



static void

memory_region_add_cb(vfu_ctx_t *vfu_ctx, uint64_t iova, uint64_t len, uint32_t prot)

memory_region_add_cb(vfu_ctx_t *vfu_ctx, vfu_dma_info_t *info)

{

	struct nvmf_vfio_user_endpoint *endpoint = vfu_get_private(vfu_ctx);

	struct nvmf_vfio_user_ctrlr *ctrlr;

	struct nvmf_vfio_user_qpair *qpair;

	int i, ret;



	if (!info->vaddr || ((uintptr_t)info->mapping.iov_base & MASK_2MB) ||

	    (info->mapping.iov_len & MASK_2MB)) {

		SPDK_ERRLOG("Invalid memory region vaddr %p, IOVA %#lx-%#lx\n", info->vaddr,

			    (uintptr_t)info->mapping.iov_base,

			    (uintptr_t)info->mapping.iov_base + info->mapping.iov_len);

		return;

	}



	assert(endpoint != NULL);

	if (endpoint->ctrlr == NULL) {

		return;

	}

	ctrlr = endpoint->ctrlr;



	SPDK_DEBUGLOG(nvmf_vfio, "%s: map IOVA %#lx-%#lx\n",

		      ctrlr_id(ctrlr), iova, iova + len);

	SPDK_DEBUGLOG(nvmf_vfio, "%s: map IOVA %#lx-%#lx\n", ctrlr_id(ctrlr),

		      (uintptr_t)info->mapping.iov_base,

		      (uintptr_t)info->mapping.iov_base + info->mapping.iov_len);



	for (i = 0; i < NVMF_VFIO_USER_DEFAULT_MAX_QPAIRS_PER_CTRLR; i++) {

		qpair = ctrlr->qp[i];
@@ -1121,31 +1130,43 @@ memory_region_add_cb(vfu_ctx_t *vfu_ctx, uint64_t iova, uint64_t len, uint32_t p 
}



static int

memory_region_remove_cb(vfu_ctx_t *vfu_ctx, uint64_t iova, uint64_t len)

memory_region_remove_cb(vfu_ctx_t *vfu_ctx, vfu_dma_info_t *info)

{



	struct nvmf_vfio_user_endpoint *endpoint = vfu_get_private(vfu_ctx);

	struct nvmf_vfio_user_ctrlr *ctrlr;

	struct nvmf_vfio_user_qpair *qpair;

	void *map_start, *map_end;

	int i;



	if (!info->vaddr || ((uintptr_t)info->mapping.iov_base & MASK_2MB) ||

	    (info->mapping.iov_len & MASK_2MB)) {

		SPDK_ERRLOG("Invalid memory region vaddr %p, IOVA %#lx-%#lx\n", info->vaddr,

			    (uintptr_t)info->mapping.iov_base,

			    (uintptr_t)info->mapping.iov_base + info->mapping.iov_len);

		return 0;

	}



	assert(endpoint != NULL);

	if (endpoint->ctrlr == NULL) {

		return 0;

	}

	ctrlr = endpoint->ctrlr;



	SPDK_DEBUGLOG(nvmf_vfio, "%s: unmap IOVA %#lx-%#lx\n",

		      ctrlr_id(ctrlr), iova, iova + len);

	SPDK_DEBUGLOG(nvmf_vfio, "%s: unmap IOVA %#lx-%#lx\n", ctrlr_id(ctrlr),

		      (uintptr_t)info->mapping.iov_base,

		      (uintptr_t)info->mapping.iov_base + info->mapping.iov_len);



	map_start = info->mapping.iov_base;

	map_end = info->mapping.iov_base + info->mapping.iov_len;

	for (i = 0; i < NVMF_VFIO_USER_DEFAULT_MAX_QPAIRS_PER_CTRLR; i++) {

		qpair = ctrlr->qp[i];

		if (qpair == NULL) {

			continue;

		}



		if ((qpair->cq.sg.dma_addr >= iova && qpair->cq.sg.dma_addr < iova + len) ||

		    (qpair->sq.sg.dma_addr >= iova && qpair->sq.sg.dma_addr < iova + len)) {

		if ((qpair->cq.addr >= map_start && qpair->cq.addr < map_end) ||

		    (qpair->sq.addr >= map_start && qpair->sq.addr < map_end)) {

			unmap_qp(qpair);

			qpair->state = VFIO_USER_QPAIR_INACTIVE;

		}
@@ -1469,7 +1490,7 @@ vfio_user_dev_info_fill(struct nvmf_vfio_user_endpoint *endpoint) 
		return ret;

	}



	ret = vfu_setup_device_dma_cb(vfu_ctx, memory_region_add_cb, memory_region_remove_cb);

	ret = vfu_setup_device_dma(vfu_ctx, memory_region_add_cb, memory_region_remove_cb);

	if (ret < 0) {

		SPDK_ERRLOG("vfu_ctx %p failed to setup dma callback\n", vfu_ctx);

		return ret;

libvfio-user @ ba6abc4c

Compare 1194d541 to ba6abc4c
Original line number Diff line number Diff line 
Subproject commit 1194d54124f0bb5b8b53bbd7700f1ac8574478ee
 
Subproject commit ba6abc4ce1d01d7253d044f2ec59c4b484d098b9