vfio: Fix 128 bit handling
Upcoming VFIO on SPAPR PPC64 support will initialize the IOMMU memory region with UINT64_MAX (2^64 bytes) size so int128_get64() will assert. The patch takes care of this check. The existing type1 IOMMU code is not expected to map all 64 bits of RAM so the patch does not touch that part. Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
parent
12e1129b80
commit
7532d3cbf1
|
@ -2392,6 +2392,7 @@ static void vfio_listener_region_add(MemoryListener *listener,
|
|||
VFIOContainer *container = container_of(listener, VFIOContainer,
|
||||
iommu_data.type1.listener);
|
||||
hwaddr iova, end;
|
||||
Int128 llend;
|
||||
void *vaddr;
|
||||
int ret;
|
||||
|
||||
|
@ -2412,13 +2413,15 @@ static void vfio_listener_region_add(MemoryListener *listener,
|
|||
}
|
||||
|
||||
iova = TARGET_PAGE_ALIGN(section->offset_within_address_space);
|
||||
end = (section->offset_within_address_space + int128_get64(section->size)) &
|
||||
TARGET_PAGE_MASK;
|
||||
llend = int128_make64(section->offset_within_address_space);
|
||||
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;
|
||||
}
|
||||
|
||||
end = int128_get64(llend);
|
||||
vaddr = memory_region_get_ram_ptr(section->mr) +
|
||||
section->offset_within_region +
|
||||
(iova - section->offset_within_address_space);
|
||||
|
|
Loading…
Reference in a new issue