[RFC,v6,13/13] memory: Skip bad range assertion if notifier is DEVIOTLB type

Commit Message

Eugenio Perez Martin Aug. 26, 2020, 2:36 p.m. UTC

Signed-off-by: Eugenio Pérez <[e-mail]>
---
 softmmu/memory.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

Patch

diff --git a/softmmu/memory.c b/softmmu/memory.c
index 4ed63f4d0d..d2797e996a 100644
--- a/softmmu/memory.c
+++ b/softmmu/memory.c
@@ -1915,6 +1915,7 @@  void memory_region_notify_iommu_one(IOMMUNotifier *notifier,
                                     IOMMUTLBEntry *entry)
 {
     hwaddr entry_end = entry->iova + entry->addr_mask;
+    IOMMUTLBEntry tmp = *entry;
 
     /*
      * Skip the notification if the notification does not overlap
@@ -1924,10 +1925,18 @@  void memory_region_notify_iommu_one(IOMMUNotifier *notifier,
         return;
     }
 
-    assert(entry->iova >= notifier->start && entry_end <= notifier->end);
+    if (notifier->notifier_flags & IOMMU_NOTIFIER_DEVIOTLB) {
+        /* Crop (iova, addr_mask) to range */
+        tmp.iova = MAX(tmp.iova, notifier->start);
+        tmp.addr_mask = MIN(entry_end, notifier->end) - tmp.iova;
+        /* Confirm no underflow */
+        assert(MIN(entry_end, notifier->end) >= tmp.iova);
+    } else {
+        assert(entry->iova >= notifier->start && entry_end <= notifier->end);
+    }
 
     if (memory_region_notify(notifier, entry)) {
-        notifier->notify(notifier, entry);
+        notifier->notify(notifier, &tmp);
     }
 }