From patchwork Wed Jan 29 12:16:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 11356055 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 F13B4112B for ; Wed, 29 Jan 2020 12:11:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DC0C920732 for ; Wed, 29 Jan 2020 12:11:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726912AbgA2ML5 (ORCPT ); Wed, 29 Jan 2020 07:11:57 -0500 Received: from mga04.intel.com ([192.55.52.120]:15960 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726808AbgA2MLy (ORCPT ); Wed, 29 Jan 2020 07:11:54 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jan 2020 04:11:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,377,1574150400"; d="scan'208";a="314071318" Received: from jacob-builder.jf.intel.com ([10.7.199.155]) by fmsmga001.fm.intel.com with ESMTP; 29 Jan 2020 04:11:53 -0800 From: "Liu, Yi L" To: qemu-devel@nongnu.org, david@gibson.dropbear.id.au, pbonzini@redhat.com, alex.williamson@redhat.com, peterx@redhat.com Cc: mst@redhat.com, eric.auger@redhat.com, kevin.tian@intel.com, yi.l.liu@intel.com, jun.j.tian@intel.com, yi.y.sun@intel.com, kvm@vger.kernel.org, hao.wu@intel.com, Jacob Pan , Yi Sun Subject: [RFC v3 22/25] vfio: add support for flush iommu stage-1 cache Date: Wed, 29 Jan 2020 04:16:53 -0800 Message-Id: <1580300216-86172-23-git-send-email-yi.l.liu@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1580300216-86172-1-git-send-email-yi.l.liu@intel.com> References: <1580300216-86172-1-git-send-email-yi.l.liu@intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Liu Yi L This patch adds flush_stage1_cache() definition in DualStageIOMMUOops. And adds corresponding implementation in VFIO. This is to expose a way for vIOMMU to flush stage-1 cache in host side since guest owns stage-1 translation structures in dual stage DMA translation. Cc: Kevin Tian Cc: Jacob Pan Cc: Peter Xu Cc: Eric Auger Cc: Yi Sun Cc: David Gibson Cc: Alex Williamson Signed-off-by: Liu Yi L --- hw/iommu/dual_stage_iommu.c | 13 +++++++++++++ hw/vfio/common.c | 24 ++++++++++++++++++++++++ include/hw/iommu/dual_stage_iommu.h | 14 ++++++++++++++ 3 files changed, 51 insertions(+) diff --git a/hw/iommu/dual_stage_iommu.c b/hw/iommu/dual_stage_iommu.c index 9d99e9e..abbd2f7 100644 --- a/hw/iommu/dual_stage_iommu.c +++ b/hw/iommu/dual_stage_iommu.c @@ -73,6 +73,19 @@ int ds_iommu_unbind_stage1_pgtbl(DualStageIOMMUObject *dsi_obj, return -ENOENT; } +int ds_iommu_flush_stage1_cache(DualStageIOMMUObject *dsi_obj, + DualIOMMUStage1Cache *cache) +{ + if (!dsi_obj) { + return -ENOENT; + } + + if (dsi_obj->ops && dsi_obj->ops->flush_stage1_cache) { + return dsi_obj->ops->flush_stage1_cache(dsi_obj, cache); + } + return -ENOENT; +} + void ds_iommu_object_init(DualStageIOMMUObject *dsi_obj, DualStageIOMMUOps *ops, DualStageIOMMUInfo *uinfo) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index d84bdc9..6f0933c 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -1265,11 +1265,35 @@ static int vfio_ds_iommu_unbind_stage1_pgtbl(DualStageIOMMUObject *dsi_obj, return ret; } +static int vfio_ds_iommu_flush_stage1_cache(DualStageIOMMUObject *dsi_obj, + DualIOMMUStage1Cache *cache) +{ + VFIOContainer *container = container_of(dsi_obj, VFIOContainer, dsi_obj); + struct vfio_iommu_type1_cache_invalidate *cache_inv; + unsigned long argsz; + int ret = 0; + + argsz = sizeof(*cache_inv) + sizeof(cache->cache_info); + cache_inv = g_malloc0(argsz); + cache_inv->argsz = argsz; + cache_inv->flags = 0; + memcpy(&cache_inv->cache_info, &cache->cache_info, + sizeof(cache->cache_info)); + + if (ioctl(container->fd, VFIO_IOMMU_CACHE_INVALIDATE, cache_inv)) { + error_report("%s: iommu cache flush failed: %d", __func__, -errno); + ret = -errno; + } + g_free(cache_inv); + return ret; +} + static struct DualStageIOMMUOps vfio_ds_iommu_ops = { .pasid_alloc = vfio_ds_iommu_pasid_alloc, .pasid_free = vfio_ds_iommu_pasid_free, .bind_stage1_pgtbl = vfio_ds_iommu_bind_stage1_pgtbl, .unbind_stage1_pgtbl = vfio_ds_iommu_unbind_stage1_pgtbl, + .flush_stage1_cache = vfio_ds_iommu_flush_stage1_cache, }; static int vfio_get_iommu_info(VFIOContainer *container, diff --git a/include/hw/iommu/dual_stage_iommu.h b/include/hw/iommu/dual_stage_iommu.h index 0eb983c..7daeb72 100644 --- a/include/hw/iommu/dual_stage_iommu.h +++ b/include/hw/iommu/dual_stage_iommu.h @@ -32,6 +32,7 @@ typedef struct DualStageIOMMUObject DualStageIOMMUObject; typedef struct DualStageIOMMUOps DualStageIOMMUOps; typedef struct DualStageIOMMUInfo DualStageIOMMUInfo; typedef struct DualIOMMUStage1BindData DualIOMMUStage1BindData; +typedef struct DualIOMMUStage1Cache DualIOMMUStage1Cache; struct DualStageIOMMUOps { /* Allocate pasid from DualStageIOMMU (a.k.a. host IOMMU) */ @@ -52,6 +53,12 @@ struct DualStageIOMMUOps { /* Undo a previous bind. @bind_data specifies the unbind info. */ int (*unbind_stage1_pgtbl)(DualStageIOMMUObject *dsi_obj, DualIOMMUStage1BindData *bind_data); + /* + * Propagate stage-1 cache flush to DualStageIOMMU (a.k.a. + * host IOMMU), cache info specifid in @cache + */ + int (*flush_stage1_cache)(DualStageIOMMUObject *dsi_obj, + DualIOMMUStage1Cache *cache); }; struct DualStageIOMMUInfo { @@ -73,6 +80,11 @@ struct DualIOMMUStage1BindData { } bind_data; }; +struct DualIOMMUStage1Cache { + uint32_t pasid; + struct iommu_cache_invalidate_info cache_info; +}; + int ds_iommu_pasid_alloc(DualStageIOMMUObject *dsi_obj, uint32_t min, uint32_t max, uint32_t *pasid); int ds_iommu_pasid_free(DualStageIOMMUObject *dsi_obj, uint32_t pasid); @@ -80,6 +92,8 @@ int ds_iommu_bind_stage1_pgtbl(DualStageIOMMUObject *dsi_obj, DualIOMMUStage1BindData *bind_data); int ds_iommu_unbind_stage1_pgtbl(DualStageIOMMUObject *dsi_obj, DualIOMMUStage1BindData *bind_data); +int ds_iommu_flush_stage1_cache(DualStageIOMMUObject *dsi_obj, + DualIOMMUStage1Cache *cache); void ds_iommu_object_init(DualStageIOMMUObject *dsi_obj, DualStageIOMMUOps *ops,