From patchwork Fri Apr 12 10:03:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 1084598 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44gYsN67rYz9s9y for ; Fri, 12 Apr 2019 20:24:08 +1000 (AEST) Received: from localhost ([127.0.0.1]:33830 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEtLq-0002LE-PC for incoming@patchwork.ozlabs.org; Fri, 12 Apr 2019 06:24:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEt4s-00035e-AL for qemu-devel@nongnu.org; Fri, 12 Apr 2019 06:06:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEt4r-0005D9-4m for qemu-devel@nongnu.org; Fri, 12 Apr 2019 06:06:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56408) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEt4o-00055Y-9N; Fri, 12 Apr 2019 06:06:30 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7DD7F3092642; Fri, 12 Apr 2019 10:06:29 +0000 (UTC) Received: from laptop.redhat.com (ovpn-117-161.ams2.redhat.com [10.36.117.161]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6239219C65; Fri, 12 Apr 2019 10:06:14 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org Date: Fri, 12 Apr 2019 12:03:48 +0200 Message-Id: <20190412100354.6409-22-eric.auger@redhat.com> In-Reply-To: <20190412100354.6409-1-eric.auger@redhat.com> References: <20190412100354.6409-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Fri, 12 Apr 2019 10:06:29 +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 21/27] hw/vfio/common: Register a MAP notifier for MSI binding 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: yi.l.liu@intel.com, mst@redhat.com, jean-philippe.brucker@arm.com, peterx@redhat.com, alex.williamson@redhat.com, vincent.stehle@arm.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Instantiate a MAP notifier to register the MSI stage 1 binding (gIOVA -> gDB) to the host. This allows the host to build a nested mapping towards the physical doorbell: guest IOVA -> guest Doorbell -> physical doorbell. Stage1 Stage 2 The unregistration is done on VFIO container deallocation. Signed-off-by: Eric Auger --- v2 -> v3: - only register the notifier if the IOMMU translates MSIs - record the msi bindings in a container list and unregister on container release --- hw/vfio/common.c | 69 +++++++++++++++++++++++++++++++++++ include/hw/vfio/vfio-common.h | 8 ++++ 2 files changed, 77 insertions(+) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index e9b729a503..051be723fd 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -489,6 +489,56 @@ static void vfio_iommu_unmap_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb) } } +static void vfio_iommu_msi_map_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb) +{ + VFIOGuestIOMMU *giommu = container_of(n, VFIOGuestIOMMU, n); + VFIOContainer *container = giommu->container; + int ret; + + struct vfio_iommu_type1_bind_msi ustruct; + VFIOMSIBinding *binding; + + QLIST_FOREACH(binding, &container->msibinding_list, next) { + if (binding->iova == iotlb->iova) { + return; + } + } + ustruct.argsz = sizeof(struct vfio_iommu_type1_bind_msi); + ustruct.flags = 0; + + ustruct.iova = iotlb->iova; + ustruct.gpa = iotlb->translated_addr; + ustruct.size = iotlb->addr_mask + 1; + ret = ioctl(container->fd, VFIO_IOMMU_BIND_MSI , &ustruct); + if (ret) { + error_report("%s: failed to register the stage1 MSI binding (%d)", + __func__, ret); + } + binding = g_new0(VFIOMSIBinding, 1); + binding->iova = ustruct.iova; + binding->gpa = ustruct.gpa; + binding->size = ustruct.size; + + QLIST_INSERT_HEAD(&container->msibinding_list, binding, next); +} + +static void vfio_container_unbind_msis(VFIOContainer *container) +{ + VFIOMSIBinding *binding, *tmp; + + QLIST_FOREACH_SAFE(binding, &container->msibinding_list, next, tmp) { + struct vfio_iommu_type1_unbind_msi ustruct; + + /* the MSI doorbell is not used anymore, unregister it */ + ustruct.argsz = sizeof(struct vfio_iommu_type1_unbind_msi); + ustruct.flags = 0; + ustruct.iova = binding->iova; + ioctl(container->fd, VFIO_IOMMU_UNBIND_MSI , &ustruct); + QLIST_REMOVE(binding, next); + g_free(binding); + } +} + static void vfio_iommu_map_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb) { VFIOGuestIOMMU *giommu = container_of(n, VFIOGuestIOMMU, n); @@ -816,6 +866,8 @@ static void vfio_listener_region_add(MemoryListener *listener, MEMTXATTRS_UNSPECIFIED); if (container->iommu_type == VFIO_TYPE1_NESTING_IOMMU) { + bool translate_msi; + /* Config notifier to propagate guest stage 1 config changes */ giommu = vfio_alloc_guest_iommu(container, iommu_mr, offset); iommu_config_notifier_init(&giommu->n, vfio_iommu_nested_notify, @@ -832,6 +884,21 @@ static void vfio_listener_region_add(MemoryListener *listener, iommu_idx); QLIST_INSERT_HEAD(&container->giommu_list, giommu, giommu_next); memory_region_register_iommu_notifier(section->mr, &giommu->n); + + memory_region_iommu_get_attr(iommu_mr, IOMMU_ATTR_MSI_TRANSLATE, + (void *)&translate_msi); + if (translate_msi) { + giommu = vfio_alloc_guest_iommu(container, iommu_mr, offset); + iommu_iotlb_notifier_init(&giommu->n, + vfio_iommu_msi_map_notify, + IOMMU_NOTIFIER_IOTLB_MAP, + section->offset_within_region, + int128_get64(llend), + iommu_idx); + QLIST_INSERT_HEAD(&container->giommu_list, giommu, + giommu_next); + memory_region_register_iommu_notifier(section->mr, &giommu->n); + } } else { /* MAP/UNMAP IOTLB notifier */ giommu = vfio_alloc_guest_iommu(container, iommu_mr, offset); @@ -1608,6 +1675,8 @@ static void vfio_disconnect_container(VFIOGroup *group) g_free(giommu); } + vfio_container_unbind_msis(container); + trace_vfio_disconnect_container(container->fd); close(container->fd); g_free(container); diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index 686d99ff8c..c862d87725 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -64,6 +64,13 @@ typedef struct VFIOAddressSpace { QLIST_ENTRY(VFIOAddressSpace) list; } VFIOAddressSpace; +typedef struct VFIOMSIBinding { + hwaddr iova; + hwaddr gpa; + hwaddr size; + QLIST_ENTRY(VFIOMSIBinding) next; +} VFIOMSIBinding; + struct VFIOGroup; typedef struct VFIOContainer { @@ -83,6 +90,7 @@ typedef struct VFIOContainer { QLIST_HEAD(, VFIOGuestIOMMU) giommu_list; QLIST_HEAD(, VFIOHostDMAWindow) hostwin_list; QLIST_HEAD(, VFIOGroup) group_list; + QLIST_HEAD(, VFIOMSIBinding) msibinding_list; QLIST_ENTRY(VFIOContainer) next; } VFIOContainer;