Commit 29f46e1c authored by Changpeng Liu's avatar Changpeng Liu Committed by Tomasz Zawadzki
Browse files

libvfio-user: update submodule 



Also use debug log when the memory region isn't 2MiB aligned,
The QEMU may only use one page for a memory region, we are sure
these memory regions will not be used as NVMe data buffers.

Previously libvfio-user will help us to round up these memory
regions to 2MiB alignment, and it doesn't do it anymore, this
isn't an error case so change it to debug log.

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


Community-CI: Broadcom CI
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 836565ed

lib/nvmf/vfio_user.c

+6 −6
Original line number Diff line number Diff line
@@ -1080,7 +1080,7 @@ memory_region_add_cb(vfu_ctx_t *vfu_ctx, vfu_dma_info_t *info) 


	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,

		SPDK_DEBUGLOG(nvmf_vfio, "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;
@@ -1156,7 +1156,7 @@ memory_region_remove_cb(vfu_ctx_t *vfu_ctx, vfu_dma_info_t *info) 


	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,

		SPDK_DEBUGLOG(nvmf_vfio, "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;

libvfio-user @ 3acb9747

Compare ba6abc4c to 3acb9747
Original line number Diff line number Diff line 
Subproject commit ba6abc4ce1d01d7253d044f2ec59c4b484d098b9
 
Subproject commit 3acb97477f261bf11c866b5764deabe693607bc3