Commit c20e41cd authored by John Levon's avatar John Levon Committed by Tomasz Zawadzki
Browse files

nvmf/vfio-user: move map_one() 



This lets us use it more widely.

Signed-off-by: default avatarJohn Levon <john.levon@nutanix.com>
Change-Id: I9c67be19020677fab3eafe05c1e0f91c3d04611d
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12307


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 avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 31db7b13

lib/nvmf/vfio_user.c

+27 −23
Original line number Diff line number Diff line
@@ -561,6 +561,33 @@ self_kick(struct nvmf_vfio_user_ctrlr *ctrlr) 
				    ctrlr);

}



/*

 * Make the given DMA address and length available (locally mapped) via iov.

 */

static void *

map_one(vfu_ctx_t *ctx, uint64_t addr, uint64_t len, dma_sg_t *sg,

	struct iovec *iov, int prot)

{

	int ret;



	assert(ctx != NULL);

	assert(sg != NULL);

	assert(iov != NULL);



	ret = vfu_addr_to_sg(ctx, (void *)(uintptr_t)addr, len, sg, 1, prot);

	if (ret < 0) {

		return NULL;

	}



	ret = vfu_map_sg(ctx, sg, iov, 1, 0);

	if (ret != 0) {

		return NULL;

	}



	assert(iov->iov_base != NULL);

	return iov->iov_base;

}



static int

nvme_cmd_map_prps(void *prv, struct spdk_nvme_cmd *cmd, struct iovec *iovs,

		  uint32_t max_iovcnt, uint32_t len, size_t mps,
@@ -968,29 +995,6 @@ max_queue_size(struct nvmf_vfio_user_ctrlr const *vu_ctrlr) 
	return vu_ctrlr->ctrlr->vcprop.cap.bits.mqes + 1;

}



static void *

map_one(vfu_ctx_t *ctx, uint64_t addr, uint64_t len, dma_sg_t *sg, struct iovec *iov, int prot)

{

	int ret;



	assert(ctx != NULL);

	assert(sg != NULL);

	assert(iov != NULL);



	ret = vfu_addr_to_sg(ctx, (void *)(uintptr_t)addr, len, sg, 1, prot);

	if (ret < 0) {

		return NULL;

	}



	ret = vfu_map_sg(ctx, sg, iov, 1, 0);

	if (ret != 0) {

		return NULL;

	}



	assert(iov->iov_base != NULL);

	return iov->iov_base;

}



static int

map_q(struct nvmf_vfio_user_ctrlr *vu_ctrlr, struct nvme_q_mapping *mapping,

      uint32_t q_size, bool is_cq, bool unmap)