From patchwork Mon Mar 21 07:47:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Kardashevskiy X-Patchwork-Id: 8630041 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 405F49F8A8 for ; Mon, 21 Mar 2016 07:51:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4A5A0202B8 for ; Mon, 21 Mar 2016 07:51:07 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1D7F920274 for ; Mon, 21 Mar 2016 07:51:06 +0000 (UTC) Received: from localhost ([::1]:56075 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahucD-00008M-Cs for patchwork-qemu-devel@patchwork.kernel.org; Mon, 21 Mar 2016 03:51:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35100) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahuZz-0004dA-M4 for qemu-devel@nongnu.org; Mon, 21 Mar 2016 03:48:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ahuZy-0001yD-32 for qemu-devel@nongnu.org; Mon, 21 Mar 2016 03:48:47 -0400 Received: from e23smtp04.au.ibm.com ([202.81.31.146]:53578) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahuZx-0001xN-HU for qemu-devel@nongnu.org; Mon, 21 Mar 2016 03:48:46 -0400 Received: from localhost by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 21 Mar 2016 17:48:43 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp04.au.ibm.com (202.81.31.210) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 21 Mar 2016 17:48:41 +1000 X-IBM-Helo: d23dlp01.au.ibm.com X-IBM-MailFrom: aik@ozlabs.ru X-IBM-RcptTo: qemu-devel@nongnu.org;qemu-ppc@nongnu.org Received: from d23relay07.au.ibm.com (d23relay07.au.ibm.com [9.190.26.37]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id A47702CE8071; Mon, 21 Mar 2016 18:48:38 +1100 (EST) Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay07.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u2L7mU9N56229972; Mon, 21 Mar 2016 18:48:38 +1100 Received: from d23av04.au.ibm.com (localhost [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u2L7m6i8030024; Mon, 21 Mar 2016 18:48:06 +1100 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.192.253.14]) by d23av04.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u2L7m6mr029315; Mon, 21 Mar 2016 18:48:06 +1100 Received: from bran.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) by ozlabs.au.ibm.com (Postfix) with ESMTP id 40F13A03B1; Mon, 21 Mar 2016 18:47:09 +1100 (AEDT) Received: from vpl2.ozlabs.ibm.com (vpl2.ozlabs.ibm.com [10.61.141.27]) by bran.ozlabs.ibm.com (Postfix) with ESMTP id 47A28E39B3; Mon, 21 Mar 2016 18:47:09 +1100 (AEDT) From: Alexey Kardashevskiy To: qemu-devel@nongnu.org Date: Mon, 21 Mar 2016 18:47:03 +1100 Message-Id: <1458546426-26222-16-git-send-email-aik@ozlabs.ru> X-Mailer: git-send-email 2.5.0.rc3 In-Reply-To: <1458546426-26222-1-git-send-email-aik@ozlabs.ru> References: <1458546426-26222-1-git-send-email-aik@ozlabs.ru> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16032107-0013-0000-0000-0000048701F3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 202.81.31.146 Cc: Alexey Kardashevskiy , Alex Williamson , qemu-ppc@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCH qemu v14 15/18] vfio: Add host side IOMMU capabilities 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There are going to be multiple IOMMUs per a container. This moves the single host IOMMU parameter set to a list of VFIOHostIOMMU. This should cause no behavioral change and will be used later by the SPAPR TCE IOMMU v2 which will also add a vfio_host_iommu_del() helper. Signed-off-by: Alexey Kardashevskiy --- hw/vfio/common.c | 65 +++++++++++++++++++++++++++++++++---------- include/hw/vfio/vfio-common.h | 9 ++++-- 2 files changed, 57 insertions(+), 17 deletions(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index a8deb16..b257655 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -29,6 +29,7 @@ #include "exec/memory.h" #include "hw/hw.h" #include "qemu/error-report.h" +#include "qemu/range.h" #include "sysemu/kvm.h" #include "trace.h" @@ -239,6 +240,45 @@ static int vfio_dma_map(VFIOContainer *container, hwaddr iova, return -errno; } +static VFIOHostIOMMU *vfio_host_iommu_lookup(VFIOContainer *container, + hwaddr min_iova, hwaddr max_iova) +{ + VFIOHostIOMMU *hiommu; + + QLIST_FOREACH(hiommu, &container->hiommu_list, hiommu_next) { + if (hiommu->min_iova <= min_iova && max_iova <= hiommu->max_iova) { + return hiommu; + } + } + + return NULL; +} + +static int vfio_host_iommu_add(VFIOContainer *container, + hwaddr min_iova, hwaddr max_iova, + uint64_t iova_pgsizes) +{ + VFIOHostIOMMU *hiommu; + + QLIST_FOREACH(hiommu, &container->hiommu_list, hiommu_next) { + if (ranges_overlap(min_iova, max_iova - min_iova + 1, + hiommu->min_iova, + hiommu->max_iova - hiommu->min_iova + 1)) { + error_report("%s: Overlapped IOMMU are not enabled", __func__); + return -1; + } + } + + hiommu = g_malloc0(sizeof(*hiommu)); + + hiommu->min_iova = min_iova; + hiommu->max_iova = max_iova; + hiommu->iova_pgsizes = iova_pgsizes; + QLIST_INSERT_HEAD(&container->hiommu_list, hiommu, hiommu_next); + + return 0; +} + static bool vfio_listener_skipped_section(MemoryRegionSection *section) { return (!memory_region_is_ram(section->mr) && @@ -352,7 +392,7 @@ static void vfio_listener_region_add(MemoryListener *listener, } end = int128_get64(llend); - if ((iova < container->min_iova) || ((end - 1) > container->max_iova)) { + if (!vfio_host_iommu_lookup(container, iova, end - 1)) { error_report("vfio: IOMMU container %p can't map guest IOVA region" " 0x%"HWADDR_PRIx"..0x%"HWADDR_PRIx, container, iova, end - 1); @@ -367,10 +407,6 @@ static void vfio_listener_region_add(MemoryListener *listener, trace_vfio_listener_region_add_iommu(iova, end - 1); /* - * FIXME: We should do some checking to see if the - * capabilities of the host VFIO IOMMU are adequate to model - * the guest IOMMU - * * FIXME: For VFIO iommu types which have KVM acceleration to * avoid bouncing all map/unmaps through qemu this way, this * would be the right place to wire that up (tell the KVM @@ -818,16 +854,14 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as) * existing Type1 IOMMUs generally support any IOVA we're * going to actually try in practice. */ - container->min_iova = 0; - container->max_iova = (hwaddr)-1; - - /* Assume just 4K IOVA page size */ - container->iova_pgsizes = 0x1000; info.argsz = sizeof(info); ret = ioctl(fd, VFIO_IOMMU_GET_INFO, &info); /* Ignore errors */ if ((ret == 0) && (info.flags & VFIO_IOMMU_INFO_PGSIZES)) { - container->iova_pgsizes = info.iova_pgsizes; + vfio_host_iommu_add(container, 0, (hwaddr)-1, info.iova_pgsizes); + } else { + /* Assume just 4K IOVA page size */ + vfio_host_iommu_add(container, 0, (hwaddr)-1, 0x1000); } } else if (ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_SPAPR_TCE_IOMMU) || ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_SPAPR_TCE_v2_IOMMU)) { @@ -884,11 +918,12 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as) ret = -errno; goto listener_release_exit; } - container->min_iova = info.dma32_window_start; - container->max_iova = container->min_iova + info.dma32_window_size - 1; - /* Assume just 4K IOVA pages for now */ - container->iova_pgsizes = 0x1000; + /* The default table uses 4K pages */ + vfio_host_iommu_add(container, info.dma32_window_start, + info.dma32_window_start + + info.dma32_window_size - 1, + 0x1000); } else { error_report("vfio: No available IOMMU models"); ret = -EINVAL; diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index b861eec..1b98e33 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -82,9 +82,8 @@ typedef struct VFIOContainer { * contiguous IOVA window. We may need to generalize that in * future */ - hwaddr min_iova, max_iova; - uint64_t iova_pgsizes; QLIST_HEAD(, VFIOGuestIOMMU) giommu_list; + QLIST_HEAD(, VFIOHostIOMMU) hiommu_list; QLIST_HEAD(, VFIOGroup) group_list; QLIST_ENTRY(VFIOContainer) next; } VFIOContainer; @@ -97,6 +96,12 @@ typedef struct VFIOGuestIOMMU { QLIST_ENTRY(VFIOGuestIOMMU) giommu_next; } VFIOGuestIOMMU; +typedef struct VFIOHostIOMMU { + hwaddr min_iova, max_iova; + uint64_t iova_pgsizes; + QLIST_ENTRY(VFIOHostIOMMU) hiommu_next; +} VFIOHostIOMMU; + typedef struct VFIODeviceOps VFIODeviceOps; typedef struct VFIODevice {