[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v9 04/25] hw/pci: introduce pci_device_get_iommu_attr()
From: |
Liu Yi L |
Subject: |
[RFC v9 04/25] hw/pci: introduce pci_device_get_iommu_attr() |
Date: |
Mon, 27 Jul 2020 23:33:57 -0700 |
This patch adds pci_device_get_iommu_attr() to get vIOMMU attributes.
e.g. if nesting IOMMU wanted.
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: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Liu Yi L <yi.l.liu@intel.com>
---
hw/pci/pci.c | 35 ++++++++++++++++++++++++++++++-----
include/hw/pci/pci.h | 7 +++++++
2 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index b2a2077..3c27805 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -2659,7 +2659,8 @@ static void pci_device_class_base_init(ObjectClass
*klass, void *data)
}
}
-AddressSpace *pci_device_iommu_address_space(PCIDevice *dev)
+static void pci_device_get_iommu_bus_devfn(PCIDevice *dev,
+ PCIBus **pbus, uint8_t *pdevfn)
{
PCIBus *bus = pci_get_bus(dev);
PCIBus *iommu_bus = bus;
@@ -2710,14 +2711,38 @@ AddressSpace *pci_device_iommu_address_space(PCIDevice
*dev)
iommu_bus = parent_bus;
}
- if (iommu_bus && iommu_bus->iommu_ops &&
- iommu_bus->iommu_ops->get_address_space) {
- return iommu_bus->iommu_ops->get_address_space(bus,
- iommu_bus->iommu_opaque, devfn);
+ *pbus = iommu_bus;
+ *pdevfn = devfn;
+}
+
+AddressSpace *pci_device_iommu_address_space(PCIDevice *dev)
+{
+ PCIBus *bus;
+ uint8_t devfn;
+
+ pci_device_get_iommu_bus_devfn(dev, &bus, &devfn);
+ if (bus && bus->iommu_ops &&
+ bus->iommu_ops->get_address_space) {
+ return bus->iommu_ops->get_address_space(bus,
+ bus->iommu_opaque, devfn);
}
return &address_space_memory;
}
+int pci_device_get_iommu_attr(PCIDevice *dev, IOMMUAttr attr, void *data)
+{
+ PCIBus *bus;
+ uint8_t devfn;
+
+ pci_device_get_iommu_bus_devfn(dev, &bus, &devfn);
+ if (bus && bus->iommu_ops &&
+ bus->iommu_ops->get_iommu_attr) {
+ return bus->iommu_ops->get_iommu_attr(bus, bus->iommu_opaque,
+ devfn, attr, data);
+ }
+ return -ENOENT;
+}
+
void pci_setup_iommu(PCIBus *bus, const PCIIOMMUOps *ops, void *opaque)
{
bus->iommu_ops = ops;
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index 18cfba5..822ada5 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -486,13 +486,20 @@ void pci_bus_get_w64_range(PCIBus *bus, Range *range);
void pci_device_deassert_intx(PCIDevice *dev);
+typedef enum IOMMUAttr {
+ IOMMU_WANT_NESTING,
+} IOMMUAttr;
+
typedef struct PCIIOMMUOps PCIIOMMUOps;
struct PCIIOMMUOps {
AddressSpace * (*get_address_space)(PCIBus *bus,
void *opaque, int32_t devfn);
+ int (*get_iommu_attr)(PCIBus *bus, void *opaque, int32_t devfn,
+ IOMMUAttr attr, void *data);
};
AddressSpace *pci_device_iommu_address_space(PCIDevice *dev);
+int pci_device_get_iommu_attr(PCIDevice *dev, IOMMUAttr attr, void *data);
void pci_setup_iommu(PCIBus *bus, const PCIIOMMUOps *iommu_ops, void *opaque);
static inline void
--
2.7.4
- [RFC v9 00/25] intel_iommu: expose Shared Virtual Addressing to VMs, Liu Yi L, 2020/07/28
- [RFC v9 01/25] scripts/update-linux-headers: Import iommu.h, Liu Yi L, 2020/07/28
- [RFC v9 12/25] vfio: init HostIOMMUContext per-container, Liu Yi L, 2020/07/28
- [RFC v9 13/25] intel_iommu: add virtual command capability support, Liu Yi L, 2020/07/28
- [RFC v9 04/25] hw/pci: introduce pci_device_get_iommu_attr(),
Liu Yi L <=
- [RFC v9 02/25] header file update VFIO/IOMMU vSVA APIs kernel 5.8-rc6, Liu Yi L, 2020/07/28
- [RFC v9 11/25] vfio/common: provide PASID alloc/free hooks, Liu Yi L, 2020/07/28
- [RFC v9 14/25] intel_iommu: process PASID cache invalidation, Liu Yi L, 2020/07/28
- [RFC v9 09/25] hw/pci: introduce pci_device_set/unset_iommu_context(), Liu Yi L, 2020/07/28
- [RFC v9 06/25] vfio: pass nesting requirement into vfio_get_group(), Liu Yi L, 2020/07/28
- [RFC v9 03/25] hw/pci: modify pci_setup_iommu() to set PCIIOMMUOps, Liu Yi L, 2020/07/28
- [RFC v9 05/25] intel_iommu: add get_iommu_attr() callback, Liu Yi L, 2020/07/28
- [RFC v9 10/25] intel_iommu: add set/unset_iommu_context callback, Liu Yi L, 2020/07/28
- [RFC v9 16/25] vfio: add bind stage-1 page table support, Liu Yi L, 2020/07/28
- [RFC v9 17/25] intel_iommu: sync IOMMU nesting cap info for assigned devices, Liu Yi L, 2020/07/28