[RFC v6 11/13] memory: Add IOMMU_DEVIOTLB_UNMAP IOMMUTLBNotificationType

[Eugenio Pérez]

Adapt intel and vhost to use this new notification type

Signed-off-by: Eugenio Pérez <epere...@redhat.com>
---
 hw/i386/intel_iommu.c | 2 +-
 hw/virtio/vhost.c     | 2 +-
 include/exec/memory.h | 9 ++++++---
 softmmu/memory.c      | 5 ++++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 0b3399874f..ddb828da1f 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -2467,7 +2467,7 @@ static bool vtd_process_device_iotlb_desc(IntelIOMMUState 
*s,
     entry.iova = addr;
     entry.perm = IOMMU_NONE;
     entry.translated_addr = 0;
-    entry.type = IOMMU_IOTLB_UNMAP;
+    entry.type = IOMMU_DEVIOTLB_UNMAP;
     memory_region_notify_iommu(&vtd_dev_as->iommu, 0, entry);
 
 done:
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 1a1384e7a6..6ca168b47e 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -729,7 +729,7 @@ static void vhost_iommu_region_add(MemoryListener *listener,
     iommu_idx = memory_region_iommu_attrs_to_index(iommu_mr,
                                                    MEMTXATTRS_UNSPECIFIED);
     iommu_notifier_init(&iommu->n, vhost_iommu_unmap_notify,
-                        IOMMU_NOTIFIER_UNMAP,
+                        IOMMU_NOTIFIER_DEVIOTLB,
                         section->offset_within_region,
                         int128_get64(end),
                         iommu_idx);
diff --git a/include/exec/memory.h b/include/exec/memory.h
index f6d91c54aa..477c3af24c 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -60,9 +60,10 @@ struct ReservedRegion {
 typedef struct IOMMUTLBEntry IOMMUTLBEntry;
 
 typedef enum {
-    IOMMU_IOTLB_NONE  = 0,
-    IOMMU_IOTLB_UNMAP = 1,
-    IOMMU_IOTLB_MAP   = 2,
+    IOMMU_IOTLB_NONE     = 0,
+    IOMMU_IOTLB_UNMAP    = 1,
+    IOMMU_IOTLB_MAP      = 2,
+    IOMMU_DEVIOTLB_UNMAP = 3,
 } IOMMUTLBNotificationType;
 
 /* See address_space_translate: bit 0 is read, bit 1 is write.  */
@@ -94,6 +95,8 @@ typedef enum {
     IOMMU_NOTIFIER_UNMAP = 0x1,
     /* Notify entry changes (newly created entries) */
     IOMMU_NOTIFIER_MAP = 0x2,
+    /* Notify changes on device IOTLB entries */
+    IOMMU_NOTIFIER_DEVIOTLB = 0x04,
 } IOMMUNotifierFlag;
 
 #define IOMMU_NOTIFIER_ALL (IOMMU_NOTIFIER_MAP | IOMMU_NOTIFIER_UNMAP)
diff --git a/softmmu/memory.c b/softmmu/memory.c
index 3e68442ca6..4ed63f4d0d 100644
--- a/softmmu/memory.c
+++ b/softmmu/memory.c
@@ -1892,7 +1892,8 @@ void memory_region_unregister_iommu_notifier(MemoryRegion 
*mr,
 
 static IOMMUNotifierFlag notifier_type_iommu(const IOMMUNotifier *notifier)
 {
-    return notifier->notifier_flags & IOMMU_NOTIFIER_ALL;
+    return notifier->notifier_flags &
+           (IOMMU_NOTIFIER_ALL | IOMMU_NOTIFIER_DEVIOTLB);
 }
 
 static bool memory_region_notify(const IOMMUNotifier *notifier,
@@ -1903,6 +1904,8 @@ static bool memory_region_notify(const IOMMUNotifier 
*notifier,
         return notifier_type_iommu(notifier) == IOMMU_NOTIFIER_MAP;
     case IOMMU_IOTLB_UNMAP:
         return notifier_type_iommu(notifier) == IOMMU_NOTIFIER_UNMAP;
+    case IOMMU_DEVIOTLB_UNMAP:
+        return notifier_type_iommu(notifier) == IOMMU_NOTIFIER_DEVIOTLB;
     default:
         return false;
     };
-- 
2.18.1