From patchwork Sun Mar 22 12:36:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 11451739 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 EDC2E6CA for ; Sun, 22 Mar 2020 12:31:58 +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 CD2BD20724 for ; Sun, 22 Mar 2020 12:31:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD2BD20724 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]:45926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFzll-0002wS-Tc for patchwork-qemu-devel@patchwork.kernel.org; Sun, 22 Mar 2020 08:31:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47996) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFzkq-00011I-Va for qemu-devel@nongnu.org; Sun, 22 Mar 2020 08:31:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jFzkn-0003vD-Ul for qemu-devel@nongnu.org; Sun, 22 Mar 2020 08:31:00 -0400 Received: from mga02.intel.com ([134.134.136.20]:41752) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jFzkn-0003r4-BN for qemu-devel@nongnu.org; Sun, 22 Mar 2020 08:30:57 -0400 IronPort-SDR: t6KXQOf8gVH6NUcHNwEL6o/BYlzLfme46fKm+igXbU7+SEDplL8x1speFJeb5VFfIzaggTqmEv Xt7QAnJH02fQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Mar 2020 05:30:39 -0700 IronPort-SDR: 2PjxvB4qtNOtUpwgE/DzNfuQOYtldOE3+9hEtfhHfVcaaEJNFb2cCjVnkrJMZFR5Lng2yyZit6 t3VJbOn9yPuQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,292,1580803200"; d="scan'208";a="239664389" Received: from jacob-builder.jf.intel.com ([10.7.199.155]) by orsmga008.jf.intel.com with ESMTP; 22 Mar 2020 05:30:38 -0700 From: Liu Yi L To: qemu-devel@nongnu.org, alex.williamson@redhat.com, peterx@redhat.com Subject: [PATCH v1 13/22] vfio: add bind stage-1 page table support Date: Sun, 22 Mar 2020 05:36:10 -0700 Message-Id: <1584880579-12178-14-git-send-email-yi.l.liu@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1584880579-12178-1-git-send-email-yi.l.liu@intel.com> References: <1584880579-12178-1-git-send-email-yi.l.liu@intel.com> X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 134.134.136.20 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: jean-philippe@linaro.org, kevin.tian@intel.com, yi.l.liu@intel.com, Yi Sun , kvm@vger.kernel.org, mst@redhat.com, jun.j.tian@intel.com, eric.auger@redhat.com, yi.y.sun@intel.com, Jacob Pan , pbonzini@redhat.com, hao.wu@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 bind_stage1_pgtbl() definition in HostIOMMUContextClass, 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 | 49 ++++++++++++++++++++++++++++++- hw/vfio/common.c | 55 ++++++++++++++++++++++++++++++++++- include/hw/iommu/host_iommu_context.h | 26 ++++++++++++++++- 3 files changed, 127 insertions(+), 3 deletions(-) diff --git a/hw/iommu/host_iommu_context.c b/hw/iommu/host_iommu_context.c index af61899..8a53376 100644 --- a/hw/iommu/host_iommu_context.c +++ b/hw/iommu/host_iommu_context.c @@ -69,21 +69,67 @@ int host_iommu_ctx_pasid_free(HostIOMMUContext *host_icx, uint32_t pasid) return hicxc->pasid_free(host_icx, pasid); } +int host_iommu_ctx_bind_stage1_pgtbl(HostIOMMUContext *host_icx, + DualIOMMUStage1BindData *data) +{ + HostIOMMUContextClass *hicxc; + + if (!host_icx) { + return -EINVAL; + } + + hicxc = HOST_IOMMU_CONTEXT_GET_CLASS(host_icx); + if (!hicxc) { + return -EINVAL; + } + + if (!(host_icx->flags & HOST_IOMMU_NESTING) || + !hicxc->bind_stage1_pgtbl) { + return -EINVAL; + } + + return hicxc->bind_stage1_pgtbl(host_icx, data); +} + +int host_iommu_ctx_unbind_stage1_pgtbl(HostIOMMUContext *host_icx, + DualIOMMUStage1BindData *data) +{ + HostIOMMUContextClass *hicxc; + + if (!host_icx) { + return -EINVAL; + } + + hicxc = HOST_IOMMU_CONTEXT_GET_CLASS(host_icx); + if (!hicxc) { + return -EINVAL; + } + + if (!(host_icx->flags & HOST_IOMMU_NESTING) || + !hicxc->unbind_stage1_pgtbl) { + return -EINVAL; + } + + return hicxc->unbind_stage1_pgtbl(host_icx, data); +} + void host_iommu_ctx_init(void *_host_icx, size_t instance_size, const char *mrtypename, - uint64_t flags) + uint64_t flags, uint32_t formats) { HostIOMMUContext *host_icx; object_initialize(_host_icx, instance_size, mrtypename); host_icx = HOST_IOMMU_CONTEXT(_host_icx); host_icx->flags = flags; + host_icx->stage1_formats = formats; host_icx->initialized = true; } void host_iommu_ctx_destroy(HostIOMMUContext *host_icx) { host_icx->flags = 0x0; + host_icx->stage1_formats = 0x0; host_icx->initialized = false; } @@ -92,6 +138,7 @@ static void host_icx_init_fn(Object *obj) HostIOMMUContext *host_icx = HOST_IOMMU_CONTEXT(obj); host_icx->flags = 0x0; + host_icx->stage1_formats = 0x0; host_icx->initialized = false; } diff --git a/hw/vfio/common.c b/hw/vfio/common.c index e0f2828..770a785 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -1223,6 +1223,52 @@ 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; +} + /** * Get iommu info from host. Caller of this funcion should free * the memory pointed by the returned pointer stored in @info @@ -1337,6 +1383,7 @@ static int vfio_init_container(VFIOContainer *container, int group_fd, struct vfio_iommu_type1_info_cap_nesting nesting = { .nesting_capabilities = 0x0, .stage1_formats = 0, }; + uint32_t stage1_formats; ret = vfio_get_nesting_iommu_cap(container, &nesting); if (ret) { @@ -1347,10 +1394,14 @@ static int vfio_init_container(VFIOContainer *container, int group_fd, flags |= (nesting.nesting_capabilities & VFIO_IOMMU_PASID_REQS) ? HOST_IOMMU_PASID_REQUEST : 0; + flags |= HOST_IOMMU_NESTING; + stage1_formats = nesting.stage1_formats; + host_iommu_ctx_init(&container->host_icx, sizeof(container->host_icx), TYPE_VFIO_HOST_IOMMU_CONTEXT, - flags); + flags, + stage1_formats); } container->iommu_type = iommu_type; @@ -1943,6 +1994,8 @@ static void vfio_host_iommu_context_class_init(ObjectClass *klass, hicxc->pasid_alloc = vfio_host_icx_pasid_alloc; hicxc->pasid_free = vfio_host_icx_pasid_free; + hicxc->bind_stage1_pgtbl = vfio_host_icx_bind_stage1_pgtbl; + hicxc->unbind_stage1_pgtbl = vfio_host_icx_unbind_stage1_pgtbl; } static const TypeInfo vfio_host_iommu_context_info = { diff --git a/include/hw/iommu/host_iommu_context.h b/include/hw/iommu/host_iommu_context.h index 5f11a4c..97c9473 100644 --- a/include/hw/iommu/host_iommu_context.h +++ b/include/hw/iommu/host_iommu_context.h @@ -41,6 +41,7 @@ TYPE_HOST_IOMMU_CONTEXT) typedef struct HostIOMMUContext HostIOMMUContext; +typedef struct DualIOMMUStage1BindData DualIOMMUStage1BindData; typedef struct HostIOMMUContextClass { /* private */ @@ -54,6 +55,16 @@ typedef struct HostIOMMUContextClass { /* 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); } HostIOMMUContextClass; /* @@ -62,17 +73,30 @@ typedef struct HostIOMMUContextClass { struct HostIOMMUContext { Object parent_obj; #define HOST_IOMMU_PASID_REQUEST (1ULL << 0) +#define HOST_IOMMU_NESTING (1ULL << 1) uint64_t flags; + uint32_t stage1_formats; bool initialized; }; +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(void *_host_icx, size_t instance_size, const char *mrtypename, - uint64_t flags); + uint64_t flags, uint32_t formats); void host_iommu_ctx_destroy(HostIOMMUContext *host_icx); #endif