[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v2 08/22] intel_iommu: provide get_iommu_context() callback
From: |
Liu Yi L |
Subject: |
[RFC v2 08/22] intel_iommu: provide get_iommu_context() callback |
Date: |
Thu, 24 Oct 2019 08:34:29 -0400 |
This patch adds get_iommu_context() callback to return an iommu_context
Intel VT-d platform.
Cc: Kevin Tian <address@hidden>
Cc: Jacob Pan <address@hidden>
Cc: Peter Xu <address@hidden>
Cc: Yi Sun <address@hidden>
Signed-off-by: Liu Yi L <address@hidden>
---
hw/i386/intel_iommu.c | 57 ++++++++++++++++++++++++++++++++++++++-----
include/hw/i386/intel_iommu.h | 14 ++++++++++-
2 files changed, 64 insertions(+), 7 deletions(-)
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 67a7836..e9f8692 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -3288,22 +3288,33 @@ static const MemoryRegionOps vtd_mem_ir_ops = {
},
};
-VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus, int devfn)
+static VTDBus *vtd_find_add_bus(IntelIOMMUState *s, PCIBus *bus)
{
uintptr_t key = (uintptr_t)bus;
- VTDBus *vtd_bus = g_hash_table_lookup(s->vtd_as_by_busptr, &key);
- VTDAddressSpace *vtd_dev_as;
- char name[128];
+ VTDBus *vtd_bus;
+ vtd_iommu_lock(s);
+ vtd_bus = g_hash_table_lookup(s->vtd_as_by_busptr, &key);
if (!vtd_bus) {
uintptr_t *new_key = g_malloc(sizeof(*new_key));
*new_key = (uintptr_t)bus;
/* No corresponding free() */
- vtd_bus = g_malloc0(sizeof(VTDBus) + sizeof(VTDAddressSpace *) * \
- PCI_DEVFN_MAX);
+ vtd_bus = g_malloc0(sizeof(VTDBus) + PCI_DEVFN_MAX * \
+ (sizeof(VTDAddressSpace *) + sizeof(VTDIOMMUContext *)));
vtd_bus->bus = bus;
g_hash_table_insert(s->vtd_as_by_busptr, new_key, vtd_bus);
}
+ vtd_iommu_unlock(s);
+ return vtd_bus;
+}
+
+VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus, int devfn)
+{
+ VTDBus *vtd_bus;
+ VTDAddressSpace *vtd_dev_as;
+ char name[128];
+
+ vtd_bus = vtd_find_add_bus(s, bus);
vtd_dev_as = vtd_bus->dev_as[devfn];
@@ -3370,6 +3381,27 @@ VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s,
PCIBus *bus, int devfn)
return vtd_dev_as;
}
+VTDIOMMUContext *vtd_find_add_ic(IntelIOMMUState *s,
+ PCIBus *bus, int devfn)
+{
+ VTDBus *vtd_bus;
+ VTDIOMMUContext *vtd_dev_ic;
+
+ vtd_bus = vtd_find_add_bus(s, bus);
+
+ vtd_dev_ic = vtd_bus->dev_ic[devfn];
+
+ if (!vtd_dev_ic) {
+ vtd_bus->dev_ic[devfn] = vtd_dev_ic =
+ g_malloc0(sizeof(VTDIOMMUContext));
+ vtd_dev_ic->vtd_bus = vtd_bus;
+ vtd_dev_ic->devfn = (uint8_t)devfn;
+ vtd_dev_ic->iommu_state = s;
+ iommu_context_init(&vtd_dev_ic->iommu_context);
+ }
+ return vtd_dev_ic;
+}
+
static uint64_t get_naturally_aligned_size(uint64_t start,
uint64_t size, int gaw)
{
@@ -3666,8 +3698,21 @@ static AddressSpace *vtd_host_dma_iommu(PCIBus *bus,
void *opaque, int devfn)
return &vtd_as->as;
}
+static IOMMUContext *vtd_dev_iommu_context(PCIBus *bus,
+ void *opaque, int devfn)
+{
+ IntelIOMMUState *s = opaque;
+ VTDIOMMUContext *vtd_ic;
+
+ assert(0 <= devfn && devfn < PCI_DEVFN_MAX);
+
+ vtd_ic = vtd_find_add_ic(s, bus, devfn);
+ return &vtd_ic->iommu_context;
+}
+
static PCIIOMMUOps vtd_iommu_ops = {
.get_address_space = vtd_host_dma_iommu,
+ .get_iommu_context = vtd_dev_iommu_context,
};
static bool vtd_decide_config(IntelIOMMUState *s, Error **errp)
diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h
index 6062588..1c580c1 100644
--- a/include/hw/i386/intel_iommu.h
+++ b/include/hw/i386/intel_iommu.h
@@ -68,6 +68,7 @@ typedef union VTD_IR_TableEntry VTD_IR_TableEntry;
typedef union VTD_IR_MSIAddress VTD_IR_MSIAddress;
typedef struct VTDPASIDDirEntry VTDPASIDDirEntry;
typedef struct VTDPASIDEntry VTDPASIDEntry;
+typedef struct VTDIOMMUContext VTDIOMMUContext;
/* Context-Entry */
struct VTDContextEntry {
@@ -116,9 +117,19 @@ struct VTDAddressSpace {
IOVATree *iova_tree; /* Traces mapped IOVA ranges */
};
+struct VTDIOMMUContext {
+ VTDBus *vtd_bus;
+ uint8_t devfn;
+ IOMMUContext iommu_context;
+ IntelIOMMUState *iommu_state;
+};
+
struct VTDBus {
PCIBus* bus; /* A reference to the bus to provide
translation for */
- VTDAddressSpace *dev_as[0]; /* A table of VTDAddressSpace objects
indexed by devfn */
+ /* A table of VTDAddressSpace objects indexed by devfn */
+ VTDAddressSpace *dev_as[PCI_DEVFN_MAX];
+ /* A table of VTDIOMMUContext objects indexed by devfn */
+ VTDIOMMUContext *dev_ic[PCI_DEVFN_MAX];
};
struct VTDIOTLBEntry {
@@ -282,5 +293,6 @@ struct IntelIOMMUState {
* create a new one if none exists
*/
VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus, int devfn);
+VTDIOMMUContext *vtd_find_add_ic(IntelIOMMUState *s, PCIBus *bus, int devfn);
#endif
--
2.7.4
- Re: [RFC v2 06/22] hw/pci: modify pci_setup_iommu() to set PCIIOMMUOps, (continued)
- [RFC v2 09/22] vfio/pci: add iommu_context notifier for pasid alloc/free, Liu Yi L, 2019/10/24
- [RFC v2 10/22] intel_iommu: add virtual command capability support, Liu Yi L, 2019/10/24
- [RFC v2 05/22] vfio/common: add iommu_ctx_notifier in container, Liu Yi L, 2019/10/24
- [RFC v2 03/22] intel_iommu: modify x-scalable-mode to be string option, Liu Yi L, 2019/10/24
- [RFC v2 04/22] hw/iommu: introduce IOMMUContext, Liu Yi L, 2019/10/24
- [RFC v2 07/22] hw/pci: introduce pci_device_iommu_context(), Liu Yi L, 2019/10/24
- [RFC v2 08/22] intel_iommu: provide get_iommu_context() callback,
Liu Yi L <=
- [RFC v2 02/22] header update VFIO/IOMMU vSVA APIs against 5.4.0-rc3+, Liu Yi L, 2019/10/24
- [RFC v2 11/22] intel_iommu: process pasid cache invalidation, Liu Yi L, 2019/10/24
- [RFC v2 12/22] intel_iommu: add present bit check for pasid table entries, Liu Yi L, 2019/10/24
- [RFC v2 14/22] vfio/pci: add iommu_context notifier for pasid bind/unbind, Liu Yi L, 2019/10/24
- [RFC v2 13/22] intel_iommu: add PASID cache management infrastructure, Liu Yi L, 2019/10/24
- [RFC v2 15/22] intel_iommu: bind/unbind guest page table to host, Liu Yi L, 2019/10/24
- [RFC v2 17/22] intel_iommu: replay pasid binds after context cache invalidation, Liu Yi L, 2019/10/24
- [RFC v2 16/22] intel_iommu: replay guest pasid bindings to host, Liu Yi L, 2019/10/24
- [RFC v2 18/22] intel_iommu: do not passdown pasid bind for PASID #0, Liu Yi L, 2019/10/24
- [RFC v2 19/22] vfio/pci: add iommu_context notifier for PASID-based iotlb flush, Liu Yi L, 2019/10/24