Commit a8c953cd authored by Changpeng Liu's avatar Changpeng Liu
Browse files

nvmf/vfio-user: print return value for failed memory register/unregister 



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


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarThanos Makatos <thanos.makatos@nutanix.com>
Reviewed-by: default avatarDong Yi <dongx.yi@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarJohn Levon <levon@movementarian.org>
parent 07f06329

lib/nvmf/vfio_user.c

+17 −11
Original line number Diff line number Diff line
@@ -1450,11 +1450,14 @@ memory_region_add_cb(vfu_ctx_t *vfu_ctx, vfu_dma_info_t *info) 
	/* VFIO_DMA_MAP_FLAG_READ | VFIO_DMA_MAP_FLAG_WRITE are enabled when registering to VFIO, here we also

	 * check the protection bits before registering.

	 */

	if ((info->prot == (PROT_WRITE | PROT_READ)) &&

	    (spdk_mem_register(info->mapping.iov_base, info->mapping.iov_len))) {

		SPDK_ERRLOG("Memory region register %#lx-%#lx failed\n",

	if (info->prot == (PROT_WRITE | PROT_READ)) {

		ret = spdk_mem_register(info->mapping.iov_base, info->mapping.iov_len);

		if (ret) {

			SPDK_ERRLOG("Memory region register %#lx-%#lx failed, ret=%d\n",

				    (uint64_t)(uintptr_t)info->mapping.iov_base,

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

				    (uint64_t)(uintptr_t)info->mapping.iov_base + info->mapping.iov_len,

				    ret);

		}

	}



	for (i = 0; i < NVMF_VFIO_USER_DEFAULT_MAX_QPAIRS_PER_CTRLR; i++) {
@@ -1484,7 +1487,7 @@ memory_region_remove_cb(vfu_ctx_t *vfu_ctx, vfu_dma_info_t *info) 
	struct nvmf_vfio_user_ctrlr *ctrlr;

	struct nvmf_vfio_user_qpair *qpair;

	void *map_start, *map_end;

	int i;

	int i, ret;



	if (!info->vaddr) {

		return 0;
@@ -1508,11 +1511,14 @@ memory_region_remove_cb(vfu_ctx_t *vfu_ctx, vfu_dma_info_t *info) 
		      (uintptr_t)info->mapping.iov_base,

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



	if ((info->prot == (PROT_WRITE | PROT_READ)) &&

	    (spdk_mem_unregister(info->mapping.iov_base, info->mapping.iov_len))) {

		SPDK_ERRLOG("Memory region unregister %#lx-%#lx failed\n",

	if (info->prot == (PROT_WRITE | PROT_READ)) {

		ret = spdk_mem_unregister(info->mapping.iov_base, info->mapping.iov_len);

		if (ret) {

			SPDK_ERRLOG("Memory region unregister %#lx-%#lx failed, ret=%d\n",

				    (uint64_t)(uintptr_t)info->mapping.iov_base,

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

				    (uint64_t)(uintptr_t)info->mapping.iov_base + info->mapping.iov_len,

				    ret);

		}

	}



	map_start = info->mapping.iov_base;