From: Liu Yi L <yi.l.liu@intel.com>
To: qemu-devel@nongnu.org, alex.williamson@redhat.com,
peterx@redhat.com, jasowang@redhat.com
Cc: jean-philippe@linaro.org, kevin.tian@intel.com,
yi.l.liu@intel.com, Yi Sun <yi.y.sun@linux.intel.com>,
kvm@vger.kernel.org, mst@redhat.com, jun.j.tian@intel.com,
eric.auger@redhat.com, yi.y.sun@intel.com,
Jacob Pan <jacob.jun.pan@linux.intel.com>,
pbonzini@redhat.com, hao.wu@intel.com,
david@gibson.dropbear.id.au
Subject: [RFC v10 16/25] vfio: add bind stage-1 page table support
Date: Thu, 10 Sep 2020 03:56:29 -0700 [thread overview]
Message-ID: <1599735398-6829-17-git-send-email-yi.l.liu@intel.com> (raw)
In-Reply-To: <1599735398-6829-1-git-send-email-yi.l.liu@intel.com>
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 <kevin.tian@intel.com>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Eric Auger <eric.auger@redhat.com>
Cc: Yi Sun <yi.y.sun@linux.intel.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Liu Yi L <yi.l.liu@intel.com>
---
hw/iommu/host_iommu_context.c | 57 +++++++++++++++++++++++++++++++++-
hw/vfio/common.c | 58 ++++++++++++++++++++++++++++++++++-
include/hw/iommu/host_iommu_context.h | 19 +++++++++++-
3 files changed, 131 insertions(+), 3 deletions(-)
diff --git a/hw/iommu/host_iommu_context.c b/hw/iommu/host_iommu_context.c
index 5fb2223..c43965c 100644
--- a/hw/iommu/host_iommu_context.c
+++ b/hw/iommu/host_iommu_context.c
@@ -69,23 +69,78 @@ int host_iommu_ctx_pasid_free(HostIOMMUContext *iommu_ctx, uint32_t pasid)
return hicxc->pasid_free(iommu_ctx, pasid);
}
+int host_iommu_ctx_bind_stage1_pgtbl(HostIOMMUContext *iommu_ctx,
+ struct iommu_gpasid_bind_data *bind)
+{
+ HostIOMMUContextClass *hicxc;
+
+ if (!iommu_ctx) {
+ return -EINVAL;
+ }
+
+ hicxc = HOST_IOMMU_CONTEXT_GET_CLASS(iommu_ctx);
+ if (!hicxc) {
+ return -EINVAL;
+ }
+
+ if (!(iommu_ctx->flags & HOST_IOMMU_NESTING) ||
+ !hicxc->bind_stage1_pgtbl) {
+ return -EINVAL;
+ }
+
+ return hicxc->bind_stage1_pgtbl(iommu_ctx, bind);
+}
+
+int host_iommu_ctx_unbind_stage1_pgtbl(HostIOMMUContext *iommu_ctx,
+ struct iommu_gpasid_bind_data *unbind)
+{
+ HostIOMMUContextClass *hicxc;
+
+ if (!iommu_ctx) {
+ return -EINVAL;
+ }
+
+ hicxc = HOST_IOMMU_CONTEXT_GET_CLASS(iommu_ctx);
+ if (!hicxc) {
+ return -EINVAL;
+ }
+
+ if (!(iommu_ctx->flags & HOST_IOMMU_NESTING) ||
+ !hicxc->unbind_stage1_pgtbl) {
+ return -EINVAL;
+ }
+
+ return hicxc->unbind_stage1_pgtbl(iommu_ctx, unbind);
+}
+
void host_iommu_ctx_init(void *_iommu_ctx, size_t instance_size,
const char *mrtypename,
- uint64_t flags)
+ uint64_t flags,
+ struct iommu_nesting_info *info)
{
HostIOMMUContext *iommu_ctx;
object_initialize(_iommu_ctx, instance_size, mrtypename);
iommu_ctx = HOST_IOMMU_CONTEXT(_iommu_ctx);
iommu_ctx->flags = flags;
+ iommu_ctx->info = g_malloc0(info->argsz);
+ memcpy(iommu_ctx->info, info, info->argsz);
iommu_ctx->initialized = true;
}
+static void host_iommu_ctx_finalize_fn(Object *obj)
+{
+ HostIOMMUContext *iommu_ctx = HOST_IOMMU_CONTEXT(obj);
+
+ g_free(iommu_ctx->info);
+}
+
static const TypeInfo host_iommu_context_info = {
.parent = TYPE_OBJECT,
.name = TYPE_HOST_IOMMU_CONTEXT,
.class_size = sizeof(HostIOMMUContextClass),
.instance_size = sizeof(HostIOMMUContext),
+ .instance_finalize = host_iommu_ctx_finalize_fn,
.abstract = true,
};
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index f41deeb..74dbeaf 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -1227,6 +1227,54 @@ static int vfio_host_iommu_ctx_pasid_free(HostIOMMUContext *iommu_ctx,
return ret;
}
+static int vfio_host_iommu_ctx_bind_stage1_pgtbl(HostIOMMUContext *iommu_ctx,
+ struct iommu_gpasid_bind_data *bind)
+{
+ VFIOContainer *container = container_of(iommu_ctx,
+ VFIOContainer, iommu_ctx);
+ struct vfio_iommu_type1_nesting_op *op;
+ unsigned long argsz;
+ int ret = 0;
+
+ argsz = sizeof(*op) + sizeof(*bind);
+ op = g_malloc0(argsz);
+ op->argsz = argsz;
+ op->flags = VFIO_IOMMU_NESTING_OP_BIND_PGTBL;
+ memcpy(&op->data, bind, sizeof(*bind));
+
+ if (ioctl(container->fd, VFIO_IOMMU_NESTING_OP, op)) {
+ ret = -errno;
+ error_report("%s: pasid (%llu) bind failed: %m",
+ __func__, bind->hpasid);
+ }
+ g_free(op);
+ return ret;
+}
+
+static int vfio_host_iommu_ctx_unbind_stage1_pgtbl(HostIOMMUContext *iommu_ctx,
+ struct iommu_gpasid_bind_data *unbind)
+{
+ VFIOContainer *container = container_of(iommu_ctx,
+ VFIOContainer, iommu_ctx);
+ struct vfio_iommu_type1_nesting_op *op;
+ unsigned long argsz;
+ int ret = 0;
+
+ argsz = sizeof(*op) + sizeof(*unbind);
+ op = g_malloc0(argsz);
+ op->argsz = argsz;
+ op->flags = VFIO_IOMMU_NESTING_OP_UNBIND_PGTBL;
+ memcpy(&op->data, unbind, sizeof(*unbind));
+
+ if (ioctl(container->fd, VFIO_IOMMU_NESTING_OP, op)) {
+ ret = -errno;
+ error_report("%s: pasid (%llu) unbind failed: %m",
+ __func__, unbind->hpasid);
+ }
+ g_free(op);
+ return ret;
+}
+
/**
* Get iommu info from host. Caller of this funcion should free
* the memory pointed by the returned pointer stored in @info
@@ -1364,10 +1412,16 @@ static int vfio_init_container(VFIOContainer *container, int group_fd,
nest_info = (struct iommu_nesting_info *) &nesting->info;
flags |= (nest_info->features & IOMMU_NESTING_FEAT_SYSWIDE_PASID) ?
HOST_IOMMU_PASID_REQUEST : 0;
+ if ((nest_info->features & IOMMU_NESTING_FEAT_BIND_PGTBL) &&
+ (nest_info->features & IOMMU_NESTING_FEAT_CACHE_INVLD)) {
+ flags |= HOST_IOMMU_NESTING;
+ }
+
host_iommu_ctx_init(&container->iommu_ctx,
sizeof(container->iommu_ctx),
TYPE_VFIO_HOST_IOMMU_CONTEXT,
- flags);
+ flags,
+ nest_info);
g_free(nesting);
}
@@ -1967,6 +2021,8 @@ static void vfio_host_iommu_context_class_init(ObjectClass *klass,
hicxc->pasid_alloc = vfio_host_iommu_ctx_pasid_alloc;
hicxc->pasid_free = vfio_host_iommu_ctx_pasid_free;
+ hicxc->bind_stage1_pgtbl = vfio_host_iommu_ctx_bind_stage1_pgtbl;
+ hicxc->unbind_stage1_pgtbl = vfio_host_iommu_ctx_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 227c433..2883ed8 100644
--- a/include/hw/iommu/host_iommu_context.h
+++ b/include/hw/iommu/host_iommu_context.h
@@ -54,6 +54,16 @@ typedef struct HostIOMMUContextClass {
/* Reclaim pasid from HostIOMMUContext (a.k.a. host software) */
int (*pasid_free)(HostIOMMUContext *iommu_ctx,
uint32_t pasid);
+ /*
+ * Bind stage-1 page table to a hostIOMMU w/ dual stage
+ * DMA translation capability.
+ * @bind specifies the bind configurations.
+ */
+ int (*bind_stage1_pgtbl)(HostIOMMUContext *iommu_ctx,
+ struct iommu_gpasid_bind_data *bind);
+ /* Undo a previous bind. @unbind specifies the unbind info. */
+ int (*unbind_stage1_pgtbl)(HostIOMMUContext *iommu_ctx,
+ struct iommu_gpasid_bind_data *unbind);
} HostIOMMUContextClass;
/*
@@ -62,17 +72,24 @@ typedef struct HostIOMMUContextClass {
struct HostIOMMUContext {
Object parent_obj;
#define HOST_IOMMU_PASID_REQUEST (1ULL << 0)
+#define HOST_IOMMU_NESTING (1ULL << 1)
uint64_t flags;
+ struct iommu_nesting_info *info;
bool initialized;
};
int host_iommu_ctx_pasid_alloc(HostIOMMUContext *iommu_ctx, uint32_t min,
uint32_t max, uint32_t *pasid);
int host_iommu_ctx_pasid_free(HostIOMMUContext *iommu_ctx, uint32_t pasid);
+int host_iommu_ctx_bind_stage1_pgtbl(HostIOMMUContext *iommu_ctx,
+ struct iommu_gpasid_bind_data *bind);
+int host_iommu_ctx_unbind_stage1_pgtbl(HostIOMMUContext *iommu_ctx,
+ struct iommu_gpasid_bind_data *unbind);
void host_iommu_ctx_init(void *_iommu_ctx, size_t instance_size,
const char *mrtypename,
- uint64_t flags);
+ uint64_t flags,
+ struct iommu_nesting_info *info);
void host_iommu_ctx_destroy(HostIOMMUContext *iommu_ctx);
#endif
--
2.7.4
next prev parent reply other threads:[~2020-09-10 11:09 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-10 10:56 [RFC v10 00/25] intel_iommu: expose Shared Virtual Addressing to VMs Liu Yi L
2020-09-10 10:56 ` [RFC v10 01/25] scripts/update-linux-headers: Import iommu.h Liu Yi L
2020-09-10 10:56 ` [RFC v10 02/25] header file update VFIO/IOMMU vSVA APIs kernel 5.9-rc2 Liu Yi L
2020-09-10 10:56 ` [RFC v10 03/25] hw/pci: modify pci_setup_iommu() to set PCIIOMMUOps Liu Yi L
2020-09-10 10:56 ` [RFC v10 04/25] hw/pci: introduce pci_device_get_iommu_attr() Liu Yi L
2020-09-10 10:56 ` [RFC v10 05/25] intel_iommu: add get_iommu_attr() callback Liu Yi L
2020-09-10 10:56 ` [RFC v10 06/25] vfio: pass nesting requirement into vfio_get_group() Liu Yi L
2020-09-10 10:56 ` [RFC v10 07/25] vfio: check VFIO_TYPE1_NESTING_IOMMU support Liu Yi L
2020-09-10 10:56 ` [RFC v10 08/25] hw/iommu: introduce HostIOMMUContext Liu Yi L
2020-09-10 10:56 ` [RFC v10 09/25] hw/pci: introduce pci_device_set/unset_iommu_context() Liu Yi L
2020-09-10 10:56 ` [RFC v10 10/25] intel_iommu: add set/unset_iommu_context callback Liu Yi L
2020-09-10 10:56 ` [RFC v10 11/25] vfio/common: provide PASID alloc/free hooks Liu Yi L
2020-09-10 10:56 ` [RFC v10 12/25] vfio: init HostIOMMUContext per-container Liu Yi L
2020-09-10 10:56 ` [RFC v10 13/25] intel_iommu: add virtual command capability support Liu Yi L
2020-09-10 10:56 ` [RFC v10 14/25] intel_iommu: process PASID cache invalidation Liu Yi L
2020-09-10 10:56 ` [RFC v10 15/25] intel_iommu: add PASID cache management infrastructure Liu Yi L
2020-09-10 10:56 ` Liu Yi L [this message]
2020-09-10 10:56 ` [RFC v10 17/25] intel_iommu: sync IOMMU nesting cap info for assigned devices Liu Yi L
2020-09-10 10:56 ` [RFC v10 18/25] intel_iommu: bind/unbind guest page table to host Liu Yi L
2020-09-10 10:56 ` [RFC v10 19/25] intel_iommu: replay pasid binds after context cache invalidation Liu Yi L
2020-09-10 10:56 ` [RFC v10 20/25] intel_iommu: do not pass down pasid bind for PASID #0 Liu Yi L
2020-09-10 10:56 ` [RFC v10 21/25] vfio: add support for flush iommu stage-1 cache Liu Yi L
2020-09-10 10:56 ` [RFC v10 22/25] intel_iommu: process PASID-based iotlb invalidation Liu Yi L
2020-09-10 10:56 ` [RFC v10 23/25] intel_iommu: propagate PASID-based iotlb invalidation to host Liu Yi L
2020-09-10 10:56 ` [RFC v10 24/25] intel_iommu: process PASID-based Device-TLB invalidation Liu Yi L
2020-09-10 10:56 ` [RFC v10 25/25] intel_iommu: modify x-scalable-mode to be string option Liu Yi L
2021-02-25 14:14 ` [RFC v10 00/25] intel_iommu: expose Shared Virtual Addressing to VMs Zenghui Yu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1599735398-6829-17-git-send-email-yi.l.liu@intel.com \
--to=yi.l.liu@intel.com \
--cc=alex.williamson@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=eric.auger@redhat.com \
--cc=hao.wu@intel.com \
--cc=jacob.jun.pan@linux.intel.com \
--cc=jasowang@redhat.com \
--cc=jean-philippe@linaro.org \
--cc=jun.j.tian@intel.com \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=yi.y.sun@intel.com \
--cc=yi.y.sun@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).