From patchwork Wed Mar 23 20:57:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bandan Das X-Patchwork-Id: 601370 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qVhjQ30sMz9sBm for ; Thu, 24 Mar 2016 07:58:02 +1100 (AEDT) Received: from localhost ([::1]:46059 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aipqq-000659-IZ for incoming@patchwork.ozlabs.org; Wed, 23 Mar 2016 16:58:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54269) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aipqY-0005jM-Jp for qemu-devel@nongnu.org; Wed, 23 Mar 2016 16:57:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aipqU-0003ns-J7 for qemu-devel@nongnu.org; Wed, 23 Mar 2016 16:57:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34021) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aipqU-0003no-DT for qemu-devel@nongnu.org; Wed, 23 Mar 2016 16:57:38 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 4E3517F6B1 for ; Wed, 23 Mar 2016 20:57:37 +0000 (UTC) Received: from aqua (ovpn-113-210.phx2.redhat.com [10.3.113.210]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2NKvZox031526 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 23 Mar 2016 16:57:36 -0400 From: Bandan Das To: qemu-devel@nongnu.org, alex.williamson@redhat.com User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) Date: Wed, 23 Mar 2016 16:57:35 -0400 Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] vfio: convert to 128 bit arithmetic calculations when adding mem regions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org vfio_listener_region_add for a iommu mr results in an overflow assert since vt-d memory region is initialized with UINT64_MAX. Convert calculations to 128 bit arithmetic for such regions and let int128_get64 assert for non iommu regions only. Suggested-by: Alex Williamson Signed-off-by: Bandan Das --- This is v2 of http://patchwork.ozlabs.org/patch/600364/ hw/vfio/common.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index fb588d8..9489ff3 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -323,7 +323,7 @@ static void vfio_listener_region_add(MemoryListener *listener, { VFIOContainer *container = container_of(listener, VFIOContainer, listener); hwaddr iova, end; - Int128 llend; + Int128 llend, endaddr; void *vaddr; int ret; @@ -349,14 +349,15 @@ static void vfio_listener_region_add(MemoryListener *listener, if (int128_ge(int128_make64(iova), llend)) { return; } - end = int128_get64(llend); + endaddr = int128_sub(llend, int128_one()); - if ((iova < container->min_iova) || ((end - 1) > container->max_iova)) { - error_report("vfio: IOMMU container %p can't map guest IOVA region" - " 0x%"HWADDR_PRIx"..0x%"HWADDR_PRIx, - container, iova, end - 1); - ret = -EFAULT; - goto fail; + if ((iova < container->min_iova) || (int128_get64(endaddr) > + container->max_iova)) { + error_report("vfio: IOMMU container %p can't map guest IOVA region" + " 0x%"HWADDR_PRIx"..0x%"HWADDR_PRIx, + container, iova, int128_get64(endaddr)); + ret = -EFAULT; + goto fail; } memory_region_ref(section->mr); @@ -364,7 +365,7 @@ static void vfio_listener_region_add(MemoryListener *listener, if (memory_region_is_iommu(section->mr)) { VFIOGuestIOMMU *giommu; - trace_vfio_listener_region_add_iommu(iova, end - 1); + trace_vfio_listener_region_add_iommu(iova, int128_get64(endaddr)); /* * FIXME: We should do some checking to see if the * capabilities of the host VFIO IOMMU are adequate to model @@ -389,6 +390,8 @@ static void vfio_listener_region_add(MemoryListener *listener, return; } + end = int128_get64(llend); + /* Here we assume that memory_region_is_ram(section->mr)==true */ vaddr = memory_region_get_ram_ptr(section->mr) +