[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 14/22] vfio: add bind stage-1 page table support
|
From: |
Liu Yi L |
|
Subject: |
[PATCH v2 14/22] vfio: add bind stage-1 page table support |
|
Date: |
Sun, 29 Mar 2020 21:24:53 -0700 |
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 <address@hidden>
Cc: Jacob Pan <address@hidden>
Cc: Peter Xu <address@hidden>
Cc: Eric Auger <address@hidden>
Cc: Yi Sun <address@hidden>
Cc: David Gibson <address@hidden>
Cc: Alex Williamson <address@hidden>
Signed-off-by: Liu Yi L <address@hidden>
---
hw/iommu/host_iommu_context.c | 47 +++++++++++++++++++++++++++++-
hw/vfio/common.c | 55 ++++++++++++++++++++++++++++++++++-
include/hw/iommu/host_iommu_context.h | 26 ++++++++++++++++-
3 files changed, 125 insertions(+), 3 deletions(-)
diff --git a/hw/iommu/host_iommu_context.c b/hw/iommu/host_iommu_context.c
index 5fb2223..8ae20fe 100644
--- a/hw/iommu/host_iommu_context.c
+++ b/hw/iommu/host_iommu_context.c
@@ -69,15 +69,60 @@ 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,
+ DualIOMMUStage1BindData *data)
+{
+ 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, data);
+}
+
+int host_iommu_ctx_unbind_stage1_pgtbl(HostIOMMUContext *iommu_ctx,
+ DualIOMMUStage1BindData *data)
+{
+ 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, data);
+}
+
void host_iommu_ctx_init(void *_iommu_ctx, size_t instance_size,
const char *mrtypename,
- uint64_t flags)
+ uint64_t flags, uint32_t formats)
{
HostIOMMUContext *iommu_ctx;
object_initialize(_iommu_ctx, instance_size, mrtypename);
iommu_ctx = HOST_IOMMU_CONTEXT(_iommu_ctx);
iommu_ctx->flags = flags;
+ iommu_ctx->stage1_formats = formats;
iommu_ctx->initialized = true;
}
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 44b142c..465e4d8 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -1226,6 +1226,54 @@ static int
vfio_host_iommu_ctx_pasid_free(HostIOMMUContext *iommu_ctx,
return 0;
}
+static int vfio_host_iommu_ctx_bind_stage1_pgtbl(HostIOMMUContext *iommu_ctx,
+ DualIOMMUStage1BindData *bind_data)
+{
+ VFIOContainer *container = container_of(iommu_ctx,
+ VFIOContainer, iommu_ctx);
+ 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_iommu_ctx_unbind_stage1_pgtbl(HostIOMMUContext *iommu_ctx,
+ DualIOMMUStage1BindData *bind_data)
+{
+ VFIOContainer *container = container_of(iommu_ctx,
+ VFIOContainer, iommu_ctx);
+ 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
@@ -1350,10 +1398,13 @@ 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;
+
host_iommu_ctx_init(&container->iommu_ctx,
sizeof(container->iommu_ctx),
TYPE_VFIO_HOST_IOMMU_CONTEXT,
- flags);
+ flags,
+ nesting.stage1_formats);
}
container->iommu_type = iommu_type;
@@ -1945,6 +1996,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..44daca9 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 *iommu_ctx,
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 *iommu_ctx,
+ DualIOMMUStage1BindData *bind_data);
+ /* Undo a previous bind. @bind_data specifies the unbind info. */
+ int (*unbind_stage1_pgtbl)(HostIOMMUContext *iommu_ctx,
+ 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 *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,
+ DualIOMMUStage1BindData *data);
+int host_iommu_ctx_unbind_stage1_pgtbl(HostIOMMUContext *iommu_ctx,
+ DualIOMMUStage1BindData *data);
void host_iommu_ctx_init(void *_iommu_ctx, size_t instance_size,
const char *mrtypename,
- uint64_t flags);
+ uint64_t flags, uint32_t formats);
void host_iommu_ctx_destroy(HostIOMMUContext *iommu_ctx);
#endif
--
2.7.4
- [PATCH v2 09/22] vfio/common: init HostIOMMUContext per-container, (continued)
- [PATCH v2 09/22] vfio/common: init HostIOMMUContext per-container, Liu Yi L, 2020/03/30
- [PATCH v2 02/22] header file update VFIO/IOMMU vSVA APIs, Liu Yi L, 2020/03/30
- [PATCH v2 08/22] vfio/common: provide PASID alloc/free hooks, Liu Yi L, 2020/03/30
- [PATCH v2 05/22] hw/pci: modify pci_setup_iommu() to set PCIIOMMUOps, Liu Yi L, 2020/03/30
- [PATCH v2 12/22] intel_iommu: process PASID cache invalidation, Liu Yi L, 2020/03/30
- [PATCH v2 11/22] intel_iommu: add virtual command capability support, Liu Yi L, 2020/03/30
- [PATCH v2 13/22] intel_iommu: add PASID cache management infrastructure, Liu Yi L, 2020/03/30
- [PATCH v2 16/22] intel_iommu: replay pasid binds after context cache invalidation, Liu Yi L, 2020/03/30
- [PATCH v2 15/22] intel_iommu: bind/unbind guest page table to host, Liu Yi L, 2020/03/30
- [PATCH v2 14/22] vfio: add bind stage-1 page table support,
Liu Yi L <=
- [PATCH v2 19/22] intel_iommu: process PASID-based iotlb invalidation, Liu Yi L, 2020/03/30
- [PATCH v2 17/22] intel_iommu: do not pass down pasid bind for PASID #0, Liu Yi L, 2020/03/30
- [PATCH v2 18/22] vfio: add support for flush iommu stage-1 cache, Liu Yi L, 2020/03/30
- [PATCH v2 21/22] intel_iommu: process PASID-based Device-TLB invalidation, Liu Yi L, 2020/03/30
- [PATCH v2 20/22] intel_iommu: propagate PASID-based iotlb invalidation to host, Liu Yi L, 2020/03/30
- Re: [PATCH v2 00/22] intel_iommu: expose Shared Virtual Addressing to VMs, no-reply, 2020/03/30
- Re: [PATCH v2 00/22] intel_iommu: expose Shared Virtual Addressing to VMs, Auger Eric, 2020/03/30