vfio/listener: Fix translated_addr for non-identity-mapped RAM sections
PATCH 1/1 vfio/listener: Fix translated_addr for non-identity-mapped RAM sections
In vfio_listener_region_del(), when dirty tracking is active and a writable RAM section is deleted, a synthetic IOMMUTLBEntry is built to flush dirty pages. Setting translated_addr to the IOVA (GPA) is only correct for identity-mapped regions where GPA == ram_addr_t.
For RAM sections with GPA far above main RAM (e.g., nested VT-d interrupt remapping table at 58 TB), translated_addr is too large, causing a crash in physical_memory_set_dirty_lebitmap() when indexing beyond the allocated dirty memory blocks array :
bitmap_set_atomic(map=NULL, start=1, nr=1) physical_memory_set_dirty_range(start=0x380004040000, length=4096) physical_memory_set_dirty_lebitmap(start=0x380004040000, pages=3) vfio_container_query_dirty_bitmap(translated_addr=0x380004040000) vfio_legacy_dma_unmap_one(iova=0x380004040000, size=12288) vfio_listener_region_del()
Fix this by setting translated_addr to the ram_addr_t of the section, which is consistent with other vfio dirty tracking code:
translated_addr = memory_region_get_ram_addr(section->mr) +
section->offset_within_region;
--- hw/vfio/listener.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
hw/vfio/listener.c +3 -2
@@ -731,7 +731,7 @@ static void vfio_listener_region_del(MemoryListener *listener, }/* -* Fake an IOTLB entry for writable identity mapping which is needed +* Fake an IOTLB entry for writable RAM sections which is needed * by dirty tracking when switch out of PT domain. In fact, in * unmap_bitmap, only translated_addr field is used to set dirty * bitmap.
@@ -746,7 +746,8 @@ static void vfio_listener_region_del(MemoryListener *listener,if (global_dirty_tracking &&memory_region_is_ram (section->mr) && !section->readonly) { entry.iova = iova; - entry.translated_addr = iova; + entry.translated_addr =memory_region_get_ram_addr (section->mr) + + section->offset_within_region; iotlb = &entry; }
Signature · 1 line
2.54.0
Quoted 23 lines · Cédric Le Goater
In
vfio_listener_region_del(), when dirty tracking is active and a writable RAM section is deleted, a synthetic IOMMUTLBEntry is built to flush dirty pages. Settingtranslated_addrto the IOVA (GPA) is only correct for identity-mapped regions where GPA ==ram_addr_t.For RAM sections with GPA far above main RAM (e.g., nested VT-d interrupt remapping table at 58 TB),
translated_addris too large, causing a crash inphysical_memory_set_dirty_lebitmap()when indexing beyond the allocated dirty memory blocks array :bitmap_set_atomic(map=NULL, start=1, nr=1) physical_memory_set_dirty_range(start=0x380004040000, length=4096) physical_memory_set_dirty_lebitmap(start=0x380004040000, pages=3) vfio_container_query_dirty_bitmap(translated_addr=0x380004040000) vfio_legacy_dma_unmap_one(iova=0x380004040000, size=12288) vfio_listener_region_del()Fix this by setting
translated_addrto theram_addr_tof the section, which is consistent with other vfio dirty tracking code:translated_addr = memory_region_get_ram_addr(section->mr) + section->offset_within_region;
Quoted 6 lines
Cc Zhenzhong Duan <[email protected]>Fixes 6e360c06176c ("vfio/listener: Add missing dirty tracking in region_del")Signed-off-by Cédric Le Goater <[email protected]>--- hw/vfio/listener.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Quoted 27 lines
-----Original Message-----
From: Cédric Le Goater <[email protected]>
Subject: [PATCH] vfio/listener: Fixtranslated_addrfor non-identity-mapped RAM sectionsIn
vfio_listener_region_del(), when dirty tracking is active and a writable RAM section is deleted, a synthetic IOMMUTLBEntry is built to flush dirty pages. Settingtranslated_addrto the IOVA (GPA) is only correct for identity-mapped regions where GPA ==ram_addr_t.For RAM sections with GPA far above main RAM (e.g., nested VT-d interrupt remapping table at 58 TB),
translated_addris too large, causing a crash inphysical_memory_set_dirty_lebitmap()when indexing beyond the allocated dirty memory blocks array :
bitmap_set_atomic(map=NULL, start=1, nr=1)physical_memory_set_dirty_range(start=0x380004040000, length=4096)physical_memory_set_dirty_lebitmap(start=0x380004040000, pages=3)vfio_container_query_dirty_bitmap(translated_addr=0x380004040000)vfio_legacy_dma_unmap_one(iova=0x380004040000, size=12288)vfio_listener_region_del()Fix this by setting
translated_addrto theram_addr_tof the section, which is consistent with other vfio dirty tracking code:
Quoted 6 lines
translated_addr=memory_region_get_ram_addr(section->mr)+section->offset_within_region;Cc Zhenzhong Duan <[email protected]>Fixes 6e360c06176c ("vfio/listener: Add missing dirty tracking in region_del")Signed-off-by Cédric Le Goater <[email protected]>
Verified with below reproduce steps:
1. Start guest with VFIO device in legacy iommu mode, then start dirty rate tracking.
(qemu) calc_dirty_rate -b 60
2. disable VFIO device bar region by clear bit1 in COMMAND register in guest.
# setpci -s 01:00.0 COMMAND=0005
Thanks
Zhenzhong
Quoted 44 lines · Cédric Le Goater
In
vfio_listener_region_del(), when dirty tracking is active and a writable RAM section is deleted, a synthetic IOMMUTLBEntry is built to flush dirty pages. Settingtranslated_addrto the IOVA (GPA) is only correct for identity-mapped regions where GPA ==ram_addr_t.For RAM sections with GPA far above main RAM (e.g., nested VT-d interrupt remapping table at 58 TB),
translated_addris too large, causing a crash inphysical_memory_set_dirty_lebitmap()when indexing beyond the allocated dirty memory blocks array :bitmap_set_atomic(map=NULL, start=1, nr=1) physical_memory_set_dirty_range(start=0x380004040000, length=4096) physical_memory_set_dirty_lebitmap(start=0x380004040000, pages=3) vfio_container_query_dirty_bitmap(translated_addr=0x380004040000) vfio_legacy_dma_unmap_one(iova=0x380004040000, size=12288) vfio_listener_region_del()Fix this by setting
translated_addrto theram_addr_tof the section, which is consistent with other vfio dirty tracking code:translated_addr = memory_region_get_ram_addr(section->mr) + section->offset_within_region;Cc Zhenzhong Duan <[email protected]>Fixes 6e360c06176c ("vfio/listener: Add missing dirty tracking in region_del")Signed-off-by Cédric Le Goater <[email protected]>--- hw/vfio/listener.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)hw/vfio/listener.c +1
-1@@ -731,7 +731,7 @@ static void vfio_listener_region_del(MemoryListener *listener, }/* -* Fake an IOTLB entry for writable identity mapping which is needed +* Fake an IOTLB entry for writable RAM sections which is needed * by dirty tracking when switch out of PT domain. In fact, in * unmap_bitmap, only translated_addr field is used to set dirty * bitmap.
hw/vfio/listener.c static void vfio_listener_region_del(MemoryListener *listener, · line 753
Quoted 9 lines
hw/vfio/listener.c +2
-1@@ -746,7 +746,8 @@ static void vfio_listener_region_del(MemoryListener *listener,if (global_dirty_tracking &&memory_region_is_ram (section->mr) && !section->readonly) { entry.iova = iova; - entry.translated_addr = iova; + entry.translated_addr =memory_region_get_ram_addr (section->mr) + + section->offset_within_region; iotlb = &entry; }
Applied to
https://github.com/legoater/qemu vfio-next
Thanks,
C.