vfio/common: remove spurious warning on vfio_listener_region_del
PATCH 1/1 vfio/common: remove spurious warning on vfio_listener_region_del
851d6d1a0f ("vfio/common: remove spurious tpm-crb-cmd misalignment warning") removed the warning on vfio_listener_region_add() path.
However the same warning also hits on region_del path. Let's remove it and reword the dynamic trace as this can be called on both map and unmap path.
Signed-off-by Eric Auger <[email protected]>
--- hw/vfio/common.c | 10 +++++++++- hw/vfio/trace-events | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-)
hw/vfio/common.c +9 -1
@@ -1145,7 +1145,15 @@ static void vfio_listener_region_del(MemoryListener *listener,if (unlikely ((section->offset_within_address_space & ~qemu_real_host_page_mask ()) != (section->offset_within_region & ~qemu_real_host_page_mask ()))) { -error_report ("%s received unaligned region" , __func__); +if (!vfio_known_safe_misalignment (section)) { +error_report ("%s received unaligned region %s iova=0x%" PRIx64 +" offset_within_region=0x%" PRIx64 +" qemu_real_host_page_size=0x%" PRIxPTR, + __func__,memory_region_name (section->mr), + section->offset_within_address_space, + section->offset_within_region, +qemu_real_host_page_size ()); + }return ; }
hw/vfio/trace-events +1 -1
@@ -100,7 +100,7 @@ vfio_listener_region_add_skip(uint64_t start, uint64_t end) "SKIPPING region_add vfio_spapr_group_attach(int groupfd, int tablefd) "Attached groupfd %d to liobn fd %d" vfio_listener_region_add_iommu(uint64_t start, uint64_t end) "region_add [iommu] 0x%"PRIx64" - 0x%"PRIx64 vfio_listener_region_add_ram(uint64_t iova_start, uint64_t iova_end, void *vaddr) "region_add [ram] 0x%"PRIx64" - 0x%"PRIx64" [%p]" -vfio_known_safe_misalignment(const char *name, uint64_t iova, uint64_t offset_within_region, uintptr_t page_size) "Region \"%s\" iova=0x%"PRIx64" offset_within_region=0x%"PRIx64" qemu_real_host_page_size=0x%"PRIxPTR ": cannot be mapped for DMA" +vfio_known_safe_misalignment(const char *name, uint64_t iova, uint64_t offset_within_region, uintptr_t page_size) "Region \"%s\" iova=0x%"PRIx64" offset_within_region=0x%"PRIx64" qemu_real_host_page_size=0x%"PRIxPTR vfio_listener_region_add_no_dma_map(const char *name, uint64_t iova, uint64_t size, uint64_t page_size) "Region \"%s\" 0x%"PRIx64" size=0x%"PRIx64" is not aligned to 0x%"PRIx64" and cannot be mapped for DMA" vfio_listener_region_del_skip(uint64_t start, uint64_t end) "SKIPPING region_del 0x%"PRIx64" - 0x%"PRIx64 vfio_listener_region_del(uint64_t start, uint64_t end) "region_del 0x%"PRIx64" - 0x%"PRIx64
Signature · 1 line
2.30.1
Quoted 7 lines · Eric Auger
851d6d1a0f("vfio/common: remove spurious tpm-crb-cmd misalignment warning") removed the warning onvfio_listener_region_add()path.However the same warning also hits on
region_delpath. Let's remove it and reword the dynamic trace as this can be called on both map and unmap path.
Quoted 5 lines
Signed-off-by Eric Auger <[email protected]>--- hw/vfio/common.c | 10 +++++++++- hw/vfio/trace-events | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-)
Reviewed-by Cornelia Huck <[email protected]>