From patchwork Thu Oct 6 09:50:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 678806 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 3sqSrl3qD8z9s2Q for ; Thu, 6 Oct 2016 21:03:03 +1100 (AEDT) Received: from localhost ([::1]:54405 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bs5Vz-0007oY-FA for incoming@patchwork.ozlabs.org; Thu, 06 Oct 2016 06:02:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bs5Kg-00078d-3w for qemu-devel@nongnu.org; Thu, 06 Oct 2016 05:51:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bs5Ke-0007Ic-VT for qemu-devel@nongnu.org; Thu, 06 Oct 2016 05:51:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44844) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bs5Kb-0007HB-2K; Thu, 06 Oct 2016 05:51:13 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7BC8AE035B; Thu, 6 Oct 2016 09:51:12 +0000 (UTC) Received: from localhost.redhat.com (vpn1-6-233.ams2.redhat.com [10.36.6.233]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u969okS7016130; Thu, 6 Oct 2016 05:51:09 -0400 From: Eric Auger To: eric.auger@redhat.com, eric.auger.pro@gmail.com, peter.maydell@linaro.org, qemu-arm@nongnu.org, qemu-devel@nongnu.org, alex.williamson@redhat.com, pranav.sawargaonkar@gmail.com Date: Thu, 6 Oct 2016 09:50:44 +0000 Message-Id: <1475747444-12552-9-git-send-email-eric.auger@redhat.com> In-Reply-To: <1475747444-12552-1-git-send-email-eric.auger@redhat.com> References: <1475747444-12552-1-git-send-email-eric.auger@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 06 Oct 2016 09:51:12 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC v3 8/8] hw: vfio: common: Adapt vfio_listeners for reserved_iova region X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: diana.craciun@freescale.com, Bharat.Bhushan@freescale.com, drjones@redhat.com, christoffer.dall@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" In case of reserved iova region, let's declare this region to the kernel so that it can use it for IOVA/HPA bindings. Signed-off-by: Eric Auger --- hw/vfio/common.c | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 7d20c33..0018538 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -221,10 +221,8 @@ static int vfio_dma_unmap(VFIOContainer *container, * @iova: base IOVA of the MSI region * @size: size of the MSI IOVA region */ -int vfio_register_msi_iova(VFIOContainer *container, hwaddr iova, - ram_addr_t size); -int vfio_register_msi_iova(VFIOContainer *container, hwaddr iova, - ram_addr_t size) +static int vfio_register_msi_iova(VFIOContainer *container, hwaddr iova, + ram_addr_t size) { int ret; struct vfio_iommu_type1_dma_map map = { @@ -313,6 +311,7 @@ static int vfio_host_win_del(VFIOContainer *container, hwaddr min_iova, static bool vfio_listener_skipped_section(MemoryRegionSection *section) { return (!memory_region_is_ram(section->mr) && + !memory_region_is_reserved_iova(section->mr) && !memory_region_is_iommu(section->mr)) || /* * Sizing an enabled 64-bit BAR can cause spurious mappings to @@ -396,7 +395,7 @@ static void vfio_listener_region_add(MemoryListener *listener, hwaddr iova, end; Int128 llend, llsize; void *vaddr; - int ret; + int ret = -1; VFIOHostDMAWindow *hostwin; bool hostwin_found; @@ -492,27 +491,38 @@ static void vfio_listener_region_add(MemoryListener *listener, return; } - /* Here we assume that memory_region_is_ram(section->mr)==true */ + /* Here we assume that the memory region is ram or reserved iova */ - vaddr = memory_region_get_ram_ptr(section->mr) + - section->offset_within_region + - (iova - section->offset_within_address_space); + if (memory_region_is_ram(section->mr)) { + vaddr = memory_region_get_ram_ptr(section->mr) + + section->offset_within_region + + (iova - section->offset_within_address_space); - trace_vfio_listener_region_add_ram(iova, end, vaddr); + trace_vfio_listener_region_add_ram(iova, end, vaddr); - llsize = int128_sub(llend, int128_make64(iova)); + llsize = int128_sub(llend, int128_make64(iova)); - ret = vfio_dma_map(container, iova, int128_get64(llsize), + ret = vfio_dma_map(container, iova, int128_get64(llsize), vaddr, section->readonly); - if (ret) { - error_report("vfio_dma_map(%p, 0x%"HWADDR_PRIx", " - "0x%"HWADDR_PRIx", %p) = %d (%m)", - container, iova, int128_get64(llsize), vaddr, ret); - goto fail; + if (ret) { + error_report("vfio_dma_map(%p, 0x%"HWADDR_PRIx", " + "0x%"HWADDR_PRIx", %p) = %d (%m)", + container, iova, int128_get64(llsize), vaddr, ret); + goto fail; + } + return; + } else if (memory_region_is_reserved_iova(section->mr)) { + llsize = int128_sub(llend, int128_make64(iova)); + ret = vfio_register_msi_iova(container, iova, int128_get64(llsize)); + if (ret) { + error_report("vfio_register_msi_iova(%p, 0x%"HWADDR_PRIx", " + "0x%"HWADDR_PRIx") = %d (%m)", + container, iova, int128_get64(llsize), ret); + goto fail; + } + return; } - return; - fail: /* * On the initfn path, store the first error in the container so we