From patchwork Thu Oct 24 12:34:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 11209919 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A469113B1 for ; Thu, 24 Oct 2019 14:40:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 84A7C20679 for ; Thu, 24 Oct 2019 14:40:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 84A7C20679 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:44430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNeHb-0008KS-8Q for patchwork-qemu-devel@patchwork.kernel.org; Thu, 24 Oct 2019 10:40:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52095) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNckw-000654-HD for qemu-devel@nongnu.org; Thu, 24 Oct 2019 09:02:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNckv-00038G-8T for qemu-devel@nongnu.org; Thu, 24 Oct 2019 09:02:22 -0400 Received: from mga11.intel.com ([192.55.52.93]:40516) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNckv-0002aG-0C for qemu-devel@nongnu.org; Thu, 24 Oct 2019 09:02:21 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Oct 2019 06:02:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,224,1569308400"; d="scan'208";a="210156333" Received: from iov.bj.intel.com ([10.238.145.67]) by fmsmga001.fm.intel.com with ESMTP; 24 Oct 2019 06:02:03 -0700 From: Liu Yi L To: qemu-devel@nongnu.org, mst@redhat.com, pbonzini@redhat.com, alex.williamson@redhat.com, peterx@redhat.com Subject: [RFC v2 19/22] vfio/pci: add iommu_context notifier for PASID-based iotlb flush Date: Thu, 24 Oct 2019 08:34:40 -0400 Message-Id: <1571920483-3382-20-git-send-email-yi.l.liu@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571920483-3382-1-git-send-email-yi.l.liu@intel.com> References: <1571920483-3382-1-git-send-email-yi.l.liu@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.93 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tianyu.lan@intel.com, kevin.tian@intel.com, yi.l.liu@intel.com, Yi Sun , kvm@vger.kernel.org, jun.j.tian@intel.com, eric.auger@redhat.com, yi.y.sun@intel.com, jacob.jun.pan@linux.intel.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" This patch adds notifier for propagating guest PASID-based iotlb invalidation to host. Cc: Kevin Tian Cc: Jacob Pan Cc: Peter Xu Cc: Eric Auger Cc: Yi Sun Cc: David Gibson Signed-off-by: Liu Yi L --- hw/vfio/pci.c | 29 +++++++++++++++++++++++++++++ include/hw/iommu/iommu.h | 8 ++++++++ 2 files changed, 37 insertions(+) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 012b8ed..52fe3ed 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -2802,6 +2802,31 @@ static void vfio_iommu_pasid_bind_notify(IOMMUCTXNotifier *n, #endif } +static void vfio_iommu_cache_inv_notify(IOMMUCTXNotifier *n, + IOMMUCTXEventData *event_data) +{ +#ifdef __linux__ + VFIOIOMMUContext *giommu_ctx = container_of(n, VFIOIOMMUContext, n); + VFIOContainer *container = giommu_ctx->container; + IOMMUCTXCacheInvInfo *inv_info = + (IOMMUCTXCacheInvInfo *) event_data->data; + struct vfio_iommu_type1_cache_invalidate *cache_inv; + unsigned long argsz; + + argsz = sizeof(*cache_inv); + cache_inv = g_malloc0(argsz); + cache_inv->argsz = argsz; + cache_inv->info = *inv_info->info; + cache_inv->flags = 0; + + if (ioctl(container->fd, VFIO_IOMMU_CACHE_INVALIDATE, cache_inv) != 0) { + error_report("%s: cache invalidation failed: %d", __func__, -errno); + } + + g_free(cache_inv); +#endif +} + static void vfio_realize(PCIDevice *pdev, Error **errp) { VFIOPCIDevice *vdev = PCI_VFIO(pdev); @@ -3118,6 +3143,10 @@ static void vfio_realize(PCIDevice *pdev, Error **errp) iommu_context, vfio_iommu_pasid_bind_notify, IOMMU_CTX_EVENT_PASID_BIND); + vfio_register_iommu_ctx_notifier(vdev, + iommu_context, + vfio_iommu_cache_inv_notify, + IOMMU_CTX_EVENT_CACHE_INV); } return; diff --git a/include/hw/iommu/iommu.h b/include/hw/iommu/iommu.h index 4f21aa1..452f609 100644 --- a/include/hw/iommu/iommu.h +++ b/include/hw/iommu/iommu.h @@ -34,6 +34,7 @@ enum IOMMUCTXEvent { IOMMU_CTX_EVENT_PASID_ALLOC, IOMMU_CTX_EVENT_PASID_FREE, IOMMU_CTX_EVENT_PASID_BIND, + IOMMU_CTX_EVENT_CACHE_INV, IOMMU_CTX_EVENT_NUM, }; typedef enum IOMMUCTXEvent IOMMUCTXEvent; @@ -61,6 +62,13 @@ struct IOMMUCTXPASIDBindData { }; typedef struct IOMMUCTXPASIDBindData IOMMUCTXPASIDBindData; +struct IOMMUCTXCacheInvInfo { +#ifdef __linux__ + struct iommu_cache_invalidate_info *info; +#endif +}; +typedef struct IOMMUCTXCacheInvInfo IOMMUCTXCacheInvInfo; + struct IOMMUCTXEventData { IOMMUCTXEvent event; uint64_t length;