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.t...@intel.com>
Cc: Jacob Pan <jacob.jun....@linux.intel.com>
Cc: Peter Xu <pet...@redhat.com>
Cc: Eric Auger <eric.au...@redhat.com>
Cc: Yi Sun <yi.y....@linux.intel.com>
Cc: David Gibson <da...@gibson.dropbear.id.au>
Cc: Alex Williamson <alex.william...@redhat.com>
Signed-off-by: Liu Yi L <yi.l....@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..5c5d5cf 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_unbind_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->size);
+ memcpy(iommu_ctx->info, info, info->size);
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 6f94d19..3e500f5 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -1228,6 +1228,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_unbind_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->pasid);
+ }
+ 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
@@ -1363,10 +1411,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);
}
@@ -1960,6 +2014,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..7fb8356 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_unbind_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_unbind_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
