From patchwork Sat Feb 22 08:07:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liu, Yi L" X-Patchwork-Id: 11397873 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 8D6BB138D for ; Sat, 22 Feb 2020 08:02:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6EB28208C4 for ; Sat, 22 Feb 2020 08:02:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727297AbgBVICW (ORCPT ); Sat, 22 Feb 2020 03:02:22 -0500 Received: from mga04.intel.com ([192.55.52.120]:65090 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727093AbgBVICA (ORCPT ); Sat, 22 Feb 2020 03:02:00 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Feb 2020 00:01:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,471,1574150400"; d="scan'208";a="240547689" Received: from jacob-builder.jf.intel.com ([10.7.199.155]) by orsmga006.jf.intel.com with ESMTP; 22 Feb 2020 00:01:57 -0800 From: Liu Yi L To: qemu-devel@nongnu.org, alex.williamson@redhat.com, peterx@redhat.com Cc: pbonzini@redhat.com, mst@redhat.com, eric.auger@redhat.com, david@gibson.dropbear.id.au, kevin.tian@intel.com, yi.l.liu@intel.com, jun.j.tian@intel.com, yi.y.sun@intel.com, kvm@vger.kernel.org, Jacob Pan , Yi Sun Subject: [RFC v3.1 13/22] vfio: add bind stage-1 page table support Date: Sat, 22 Feb 2020 00:07:14 -0800 Message-Id: <1582358843-51931-14-git-send-email-yi.l.liu@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1582358843-51931-1-git-send-email-yi.l.liu@intel.com> References: <1582358843-51931-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 This patch adds bind_stage1_pgtbl() definition in HostIOMMUOops, also adds corresponding implementation in VFIO. This is to expose a way for vIOMMU to setup dual stage DMA translation for passthru devices on hardware. 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/host_iommu_context.c | 20 ++++++++++++++ hw/vfio/common.c | 49 +++++++++++++++++++++++++++++++++++ include/hw/iommu/host_iommu_context.h | 23 ++++++++++++++++ 3 files changed, 92 insertions(+) diff --git a/hw/iommu/host_iommu_context.c b/hw/iommu/host_iommu_context.c index 689a087..5f7eb92 100644 --- a/hw/iommu/host_iommu_context.c +++ b/hw/iommu/host_iommu_context.c @@ -41,6 +41,26 @@ int host_iommu_ctx_pasid_free(HostIOMMUContext *host_icx, uint32_t pasid) return -ENOENT; } +int host_iommu_ctx_bind_stage1_pgtbl(HostIOMMUContext *host_icx, + DualIOMMUStage1BindData *data) +{ + if (host_icx && (host_icx->flags & HOST_IOMMU_NESTING) && + host_icx->ops && host_icx->ops->bind_stage1_pgtbl) { + return host_icx->ops->bind_stage1_pgtbl(host_icx, data); + } + return -ENOENT; +} + +int host_iommu_ctx_unbind_stage1_pgtbl(HostIOMMUContext *host_icx, + DualIOMMUStage1BindData *data) +{ + if (host_icx && (host_icx->flags & HOST_IOMMU_NESTING) && + host_icx->ops && host_icx->ops->unbind_stage1_pgtbl) { + return host_icx->ops->unbind_stage1_pgtbl(host_icx, data); + } + return -ENOENT; +} + void host_iommu_ctx_init(HostIOMMUContext *host_icx, uint64_t flags, HostIOMMUOps *ops, HostIOMMUInfo *uinfo) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 8f30a52..b560fdb 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -1223,9 +1223,57 @@ static int vfio_host_icx_pasid_free(HostIOMMUContext *host_icx, return 0; } +static int vfio_host_icx_bind_stage1_pgtbl(HostIOMMUContext *host_icx, + DualIOMMUStage1BindData *bind_data) +{ + VFIOContainer *container = container_of(host_icx, VFIOContainer, host_icx); + struct vfio_iommu_type1_bind *bind; + unsigned long argsz; + int ret = 0; + + argsz = sizeof(*bind) + sizeof(bind_data->bind_data); + bind = g_malloc0(argsz); + bind->argsz = argsz; + bind->flags = VFIO_IOMMU_BIND_GUEST_PGTBL; + memcpy(&bind->data, &bind_data->bind_data, sizeof(bind_data->bind_data)); + + if (ioctl(container->fd, VFIO_IOMMU_BIND, bind)) { + ret = -errno; + error_report("%s: pasid (%u) bind failed: %d", + __func__, bind_data->pasid, ret); + } + g_free(bind); + return ret; +} + +static int vfio_host_icx_unbind_stage1_pgtbl(HostIOMMUContext *host_icx, + DualIOMMUStage1BindData *bind_data) +{ + VFIOContainer *container = container_of(host_icx, VFIOContainer, host_icx); + struct vfio_iommu_type1_bind *bind; + unsigned long argsz; + int ret = 0; + + argsz = sizeof(*bind) + sizeof(bind_data->bind_data); + bind = g_malloc0(argsz); + bind->argsz = argsz; + bind->flags = VFIO_IOMMU_UNBIND_GUEST_PGTBL; + memcpy(&bind->data, &bind_data->bind_data, sizeof(bind_data->bind_data)); + + if (ioctl(container->fd, VFIO_IOMMU_BIND, bind)) { + ret = -errno; + error_report("%s: pasid (%u) unbind failed: %d", + __func__, bind_data->pasid, ret); + } + g_free(bind); + return ret; +} + static struct HostIOMMUOps vfio_host_icx_ops = { .pasid_alloc = vfio_host_icx_pasid_alloc, .pasid_free = vfio_host_icx_pasid_free, + .bind_stage1_pgtbl = vfio_host_icx_bind_stage1_pgtbl, + .unbind_stage1_pgtbl = vfio_host_icx_unbind_stage1_pgtbl, }; /** @@ -1354,6 +1402,7 @@ static int vfio_init_container(VFIOContainer *container, int group_fd, uinfo.stage1_format = nesting.stage1_format; flags |= (nesting.nesting_capabilities & VFIO_IOMMU_PASID_REQS) ? HOST_IOMMU_PASID_REQUEST : 0; + flags |= HOST_IOMMU_NESTING; host_iommu_ctx_init(&container->host_icx, flags, &vfio_host_icx_ops, &uinfo); } diff --git a/include/hw/iommu/host_iommu_context.h b/include/hw/iommu/host_iommu_context.h index 6797f6d..660fab8 100644 --- a/include/hw/iommu/host_iommu_context.h +++ b/include/hw/iommu/host_iommu_context.h @@ -31,6 +31,7 @@ typedef struct HostIOMMUContext HostIOMMUContext; typedef struct HostIOMMUOps HostIOMMUOps; typedef struct HostIOMMUInfo HostIOMMUInfo; +typedef struct DualIOMMUStage1BindData DualIOMMUStage1BindData; struct HostIOMMUOps { /* Allocate pasid from HostIOMMUContext (a.k.a. host software) */ @@ -41,6 +42,16 @@ struct HostIOMMUOps { /* Reclaim pasid from HostIOMMUContext (a.k.a. host software) */ int (*pasid_free)(HostIOMMUContext *host_icx, uint32_t pasid); + /* + * Bind stage-1 page table to a hostIOMMU w/ dual stage + * DMA translation capability. + * @bind_data specifies the bind configurations. + */ + int (*bind_stage1_pgtbl)(HostIOMMUContext *dsi_obj, + DualIOMMUStage1BindData *bind_data); + /* Undo a previous bind. @bind_data specifies the unbind info. */ + int (*unbind_stage1_pgtbl)(HostIOMMUContext *dsi_obj, + DualIOMMUStage1BindData *bind_data); }; struct HostIOMMUInfo { @@ -52,14 +63,26 @@ struct HostIOMMUInfo { */ struct HostIOMMUContext { #define HOST_IOMMU_PASID_REQUEST (1ULL << 0) +#define HOST_IOMMU_NESTING (1ULL << 1) uint64_t flags; HostIOMMUOps *ops; HostIOMMUInfo uinfo; }; +struct DualIOMMUStage1BindData { + uint32_t pasid; + union { + struct iommu_gpasid_bind_data gpasid_bind; + } bind_data; +}; + int host_iommu_ctx_pasid_alloc(HostIOMMUContext *host_icx, uint32_t min, uint32_t max, uint32_t *pasid); int host_iommu_ctx_pasid_free(HostIOMMUContext *host_icx, uint32_t pasid); +int host_iommu_ctx_bind_stage1_pgtbl(HostIOMMUContext *host_icx, + DualIOMMUStage1BindData *data); +int host_iommu_ctx_unbind_stage1_pgtbl(HostIOMMUContext *host_icx, + DualIOMMUStage1BindData *data); void host_iommu_ctx_init(HostIOMMUContext *host_icx, uint64_t flags, HostIOMMUOps *ops,