@@ -2619,6 +2619,33 @@ static void vfio_iommu_bind_pasid_tbl_notify(IOMMUNotifier *n, void *data)
g_free(vfio_svm);
}
+static void vfio_iommu_tlb_invalidate_notify(IOMMUNotifier *n,
+ void *data)
+{
+ VFIOGuestIOMMU *giommu = container_of(n, VFIOGuestIOMMU, n);
+ VFIOContainer *container = giommu->container;
+ IOMMUNotifierData *iommu_data = (IOMMUNotifierData *) data;
+ struct vfio_iommu_tlb_invalidate *vfio_tlb_inv;
+ int argsz;
+
+ argsz = sizeof(*vfio_tlb_inv) + iommu_data->payload_size;
+ vfio_tlb_inv = g_malloc0(argsz);
+ vfio_tlb_inv->argsz = argsz;
+ vfio_tlb_inv->length = iommu_data->payload_size;
+
+ memcpy(&vfio_tlb_inv->data, iommu_data->payload,
+ iommu_data->payload_size);
+
+ rcu_read_lock();
+ if (ioctl(container->fd, VFIO_IOMMU_TLB_INVALIDATE,
+ vfio_tlb_inv) != 0) {
+ error_report("vfio_iommu_tlb_invalidate_notify:"
+ " failed, contanier: %p", container);
+ }
+ rcu_read_unlock();
+ g_free(vfio_tlb_inv);
+}
+
static void vfio_realize(PCIDevice *pdev, Error **errp)
{
VFIOPCIDevice *vdev = DO_UPCAST(VFIOPCIDevice, pdev, pdev);
@@ -2865,6 +2892,7 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
QTAILQ_FOREACH(subregion, &as->root->subregions, subregions_link) {
if (memory_region_is_iommu(subregion)) {
IOMMUNotifier n1;
+ IOMMUNotifier n2;
/*
FIXME: current iommu notifier is actually designed for
@@ -2882,6 +2910,15 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
0,
&n1);
+ iommu_notifier_init(&n2, vfio_iommu_tlb_invalidate_notify,
+ IOMMU_NOTIFIER_IOMMU_TLB_INV,
+ 0,
+ 0);
+ vfio_register_notifier(group->container,
+ subregion,
+ 0,
+ &n2);
+
memory_region_notify_device_record(subregion,
&vdev->host);
@@ -83,6 +83,8 @@ typedef enum {
IOMMU_NOTIFIER_MAP = 0x2,
/* Notify PASID Table Binding */
IOMMU_NOTIFIER_SVM_PASIDT_BIND = 0x4,
+ /* Notify IOMMU TLB Invalidation */
+ IOMMU_NOTIFIER_IOMMU_TLB_INV = 0x8,
} IOMMUNotifierFlag;
#define IOMMU_NOTIFIER_MAP_UNMAP (IOMMU_NOTIFIER_MAP | IOMMU_NOTIFIER_UNMAP)
@@ -27,4 +27,9 @@ struct pasid_table_info {
__u8 opaque[];/* IOMMU-specific details */
};
+struct tlb_invalidate_info {
+ __u32 model;
+ __u8 opaque[];
+};
+
#endif /* __LINUX_IOMMU_H */
@@ -554,6 +554,14 @@ struct vfio_device_svm {
#define VFIO_IOMMU_SVM_BIND_TASK _IO(VFIO_TYPE, VFIO_BASE + 22)
+/* For IOMMU Invalidation Passdwon */
+struct vfio_iommu_tlb_invalidate {
+ __u32 argsz;
+ __u32 length;
+ __u8 data[];
+};
+
+#define VFIO_IOMMU_TLB_INVALIDATE _IO(VFIO_TYPE, VFIO_BASE + 23)
/* -------- Additional API for SPAPR TCE (Server POWERPC) IOMMU -------- */
This patch adds the following items: * add new notifier flag IOMMU_NOTIFIER_IOMMU_TLB_INV = 0x8 * add new IOCTL cmd VFIO_IOMMU_TLB_INVALIDATE attached on container->fd * add vfio_iommu_tlb_invalidate_notify() to propagate IOMMU TLB invalidate to host This new notifier is originated from the requirement of SVM virtualization on VT-d. It is for invalidation of first-level and nested mappings from the IOTLB and the paging-structure-caches. Since the existed MAP/UNMAP notifier is designed for second-level related mappings, it is not suitable for the new requirement. So it is necessary to introduce this new notifier to meet the SVM virtualization requirement. Further detail would be included in the patch below: "intel_iommu: propagate Extended-IOTLB invalidate to host" Signed-off-by: Liu, Yi L <yi.l.liu@linux.intel.com> --- hw/vfio/pci.c | 37 +++++++++++++++++++++++++++++++++++++ include/exec/memory.h | 2 ++ linux-headers/linux/iommu.h | 5 +++++ linux-headers/linux/vfio.h | 8 ++++++++ 4 files changed, 52 insertions(+)