ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vfio: Fix 128 bit handling when deleting region 

7532d3cbf "vfio: Fix 128 bit handling" added support for 64bit IOMMU
memory regions when those are added to VFIO address space; however
removing code cannot cope with these as int128_get64() will fail on
1<<64.

This copies 128bit handling from region_add() to region_del().

Since the only machine type which is actually going to use 64bit IOMMU
is pseries and it never really removes them (instead it will dynamically
add/remove subregions), this should cause no behavioral change.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
Alexey Kardashevskiy 2016-05-26 09:43:22 -06:00 committed by Alex Williamson
parent 0eb7342417
commit 7a057b4fb9
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/vfio/common.c
View File

@ -433,6 +433,7 @@ static void vfio_listener_region_del(MemoryListener *listener,
{ {
VFIOContainer *container = container_of(listener, VFIOContainer, listener); VFIOContainer *container = container_of(listener, VFIOContainer, listener);
hwaddr iova, end; hwaddr iova, end;
Int128 llend, llsize;
int ret; int ret;
if (vfio_listener_skipped_section(section)) { if (vfio_listener_skipped_section(section)) {
@ -471,21 +472,25 @@ static void vfio_listener_region_del(MemoryListener *listener,
} }
iova = TARGET_PAGE_ALIGN(section->offset_within_address_space); iova = TARGET_PAGE_ALIGN(section->offset_within_address_space);
end = (section->offset_within_address_space + int128_get64(section->size)) & llend = int128_make64(section->offset_within_address_space);
TARGET_PAGE_MASK; llend = int128_add(llend, section->size);
llend = int128_and(llend, int128_exts64(TARGET_PAGE_MASK));
if (iova >= end) { if (int128_ge(int128_make64(iova), llend)) {
return; return;
} }
end = int128_get64(int128_sub(llend, int128_one()));
trace_vfio_listener_region_del(iova, end - 1); llsize = int128_sub(llend, int128_make64(iova));
ret = vfio_dma_unmap(container, iova, end - iova); trace_vfio_listener_region_del(iova, end);
ret = vfio_dma_unmap(container, iova, int128_get64(llsize));
memory_region_unref(section->mr); memory_region_unref(section->mr);
if (ret) { if (ret) {
error_report("vfio_dma_unmap(%p, 0x%"HWADDR_PRIx", " error_report("vfio_dma_unmap(%p, 0x%"HWADDR_PRIx", "
"0x%"HWADDR_PRIx") = %d (%m)", "0x%"HWADDR_PRIx") = %d (%m)",
container, iova, end - iova, ret); container, iova, int128_get64(llsize), ret);
} }
} }