[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v6 21/25] vfio: add support for flush iommu stage-1 cache
From: |
Liu Yi L |
Subject: |
[RFC v6 21/25] vfio: add support for flush iommu stage-1 cache |
Date: |
Thu, 11 Jun 2020 05:54:20 -0700 |
This patch adds flush_stage1_cache() definition in HostIOMUContextClass.
And adds corresponding implementation in VFIO. This is to expose a way
for vIOMMU to flush stage-1 cache in host side since guest owns stage-1
translation structures in dual stage DMA translation configuration.
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>
Acked-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Liu Yi L <yi.l.liu@intel.com>
---
hw/iommu/host_iommu_context.c | 19 +++++++++++++++++++
hw/vfio/common.c | 24 ++++++++++++++++++++++++
include/hw/iommu/host_iommu_context.h | 8 ++++++++
3 files changed, 51 insertions(+)
diff --git a/hw/iommu/host_iommu_context.c b/hw/iommu/host_iommu_context.c
index 5c5d5cf..293286a 100644
--- a/hw/iommu/host_iommu_context.c
+++ b/hw/iommu/host_iommu_context.c
@@ -113,6 +113,25 @@ int host_iommu_ctx_unbind_stage1_pgtbl(HostIOMMUContext
*iommu_ctx,
return hicxc->unbind_stage1_pgtbl(iommu_ctx, unbind);
}
+int host_iommu_ctx_flush_stage1_cache(HostIOMMUContext *iommu_ctx,
+ struct iommu_cache_invalidate_info *cache)
+{
+ HostIOMMUContextClass *hicxc;
+
+ hicxc = HOST_IOMMU_CONTEXT_GET_CLASS(iommu_ctx);
+
+ if (!hicxc) {
+ return -EINVAL;
+ }
+
+ if (!(iommu_ctx->flags & HOST_IOMMU_NESTING) ||
+ !hicxc->flush_stage1_cache) {
+ return -EINVAL;
+ }
+
+ return hicxc->flush_stage1_cache(iommu_ctx, cache);
+}
+
void host_iommu_ctx_init(void *_iommu_ctx, size_t instance_size,
const char *mrtypename,
uint64_t flags,
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 3e500f5..241d044 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -1276,6 +1276,29 @@ static int
vfio_host_iommu_ctx_unbind_stage1_pgtbl(HostIOMMUContext *iommu_ctx,
return ret;
}
+static int vfio_host_iommu_ctx_flush_stage1_cache(HostIOMMUContext *iommu_ctx,
+ struct iommu_cache_invalidate_info *cache)
+{
+ 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(*cache);
+ op = g_malloc0(argsz);
+ op->argsz = argsz;
+ op->flags = VFIO_IOMMU_NESTING_OP_CACHE_INVLD;
+ memcpy(&op->data, cache, sizeof(*cache));
+
+ if (ioctl(container->fd, VFIO_IOMMU_NESTING_OP, op)) {
+ ret = -errno;
+ error_report("%s: iommu cache flush failed: %m", __func__);
+ }
+ 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
@@ -2016,6 +2039,7 @@ static void
vfio_host_iommu_context_class_init(ObjectClass *klass,
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;
+ hicxc->flush_stage1_cache = vfio_host_iommu_ctx_flush_stage1_cache;
}
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 7fb8356..f98ffe9 100644
--- a/include/hw/iommu/host_iommu_context.h
+++ b/include/hw/iommu/host_iommu_context.h
@@ -64,6 +64,12 @@ typedef struct HostIOMMUContextClass {
/* Undo a previous bind. @unbind specifies the unbind info. */
int (*unbind_stage1_pgtbl)(HostIOMMUContext *iommu_ctx,
struct iommu_gpasid_unbind_data *unbind);
+ /*
+ * Propagate stage-1 cache flush to host IOMMU, cache
+ * info specifid in @cache
+ */
+ int (*flush_stage1_cache)(HostIOMMUContext *iommu_ctx,
+ struct iommu_cache_invalidate_info *cache);
} HostIOMMUContextClass;
/*
@@ -85,6 +91,8 @@ 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);
+int host_iommu_ctx_flush_stage1_cache(HostIOMMUContext *iommu_ctx,
+ struct iommu_cache_invalidate_info *cache);
void host_iommu_ctx_init(void *_iommu_ctx, size_t instance_size,
const char *mrtypename,
--
2.7.4
- [RFC v6 03/25] hw/pci: modify pci_setup_iommu() to set PCIIOMMUOps, (continued)
- [RFC v6 03/25] hw/pci: modify pci_setup_iommu() to set PCIIOMMUOps, Liu Yi L, 2020/06/11
- [RFC v6 09/25] hw/pci: introduce pci_device_set/unset_iommu_context(), Liu Yi L, 2020/06/11
- [RFC v6 16/25] vfio: add bind stage-1 page table support, Liu Yi L, 2020/06/11
- [RFC v6 23/25] intel_iommu: propagate PASID-based iotlb invalidation to host, Liu Yi L, 2020/06/11
- [RFC v6 13/25] intel_iommu: add virtual command capability support, Liu Yi L, 2020/06/11
- [RFC v6 05/25] intel_iommu: add get_iommu_attr() callback, Liu Yi L, 2020/06/11
- [RFC v6 17/25] intel_iommu: sync IOMMU nesting cap info for assigned devices, Liu Yi L, 2020/06/11
- [RFC v6 11/25] vfio/common: provide PASID alloc/free hooks, Liu Yi L, 2020/06/11
- [RFC v6 18/25] intel_iommu: bind/unbind guest page table to host, Liu Yi L, 2020/06/11
- [RFC v6 25/25] intel_iommu: modify x-scalable-mode to be string option, Liu Yi L, 2020/06/11
- [RFC v6 21/25] vfio: add support for flush iommu stage-1 cache,
Liu Yi L <=
- [RFC v6 10/25] intel_iommu: add set/unset_iommu_context callback, Liu Yi L, 2020/06/11
- [RFC v6 04/25] hw/pci: introduce pci_device_get_iommu_attr(), Liu Yi L, 2020/06/11
- [RFC v6 22/25] intel_iommu: process PASID-based iotlb invalidation, Liu Yi L, 2020/06/11
- [RFC v6 24/25] intel_iommu: process PASID-based Device-TLB invalidation, Liu Yi L, 2020/06/11
- Re: [RFC v6 00/25] intel_iommu: expose Shared Virtual Addressing to VMs, no-reply, 2020/06/11