From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38200) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNc64-0002zh-T0 for qemu-devel@nongnu.org; Wed, 12 Mar 2014 01:53:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNc5t-0005Jq-GJ for qemu-devel@nongnu.org; Wed, 12 Mar 2014 01:52:56 -0400 Received: from e23smtp08.au.ibm.com ([202.81.31.141]:45431) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNc5s-0005Hq-Gw for qemu-devel@nongnu.org; Wed, 12 Mar 2014 01:52:45 -0400 Received: from /spool/local by e23smtp08.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 12 Mar 2014 15:52:37 +1000 From: Alexey Kardashevskiy Date: Wed, 12 Mar 2014 16:52:22 +1100 Message-Id: <1394603550-11556-4-git-send-email-aik@ozlabs.ru> In-Reply-To: <1394603550-11556-1-git-send-email-aik@ozlabs.ru> References: <1394603550-11556-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH v5 03/11] vfio: Fix 128 bit handling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex Williamson Cc: Alexey Kardashevskiy , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Alexander Graf 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 --- Changes: v3: * 64bit @end is calculated from 128-bit @llend instead of repeating the same calculation steps v2: * used new function int128_exts64() --- hw/misc/vfio.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c index c2c688c..029a100 100644 --- a/hw/misc/vfio.c +++ b/hw/misc/vfio.c @@ -2251,6 +2251,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; @@ -2271,13 +2272,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); -- 1.8.4.rc4