From 29f46e1c85884a4c640663093a924f95131ea2f3 Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Thu, 22 Apr 2021 17:36:35 +0800 Subject: [PATCH] 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: Changpeng Liu Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7545 Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki --- lib/nvmf/vfio_user.c | 12 ++++++------ libvfio-user | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/nvmf/vfio_user.c b/lib/nvmf/vfio_user.c index eaa6cfbd0..aa20e03f9 100644 --- a/lib/nvmf/vfio_user.c +++ b/lib/nvmf/vfio_user.c @@ -1080,9 +1080,9 @@ 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, - (uintptr_t)info->mapping.iov_base, - (uintptr_t)info->mapping.iov_base + info->mapping.iov_len); + 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,9 +1156,9 @@ 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, - (uintptr_t)info->mapping.iov_base, - (uintptr_t)info->mapping.iov_base + info->mapping.iov_len); + 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; } diff --git a/libvfio-user b/libvfio-user index ba6abc4ce..3acb97477 160000 --- a/libvfio-user +++ b/libvfio-user @@ -1 +1 @@ -Subproject commit ba6abc4ce1d01d7253d044f2ec59c4b484d098b9 +Subproject commit 3acb97477f261bf11c866b5764deabe693607bc3