memory: Skip bad range assertion if notifier is DEVIOTLB_UNMAP type
Device IOTLB invalidations can unmap arbitrary ranges, eiter outside of the memory region or even [0, ~0ULL] for all the space. The assertion could be hit by a guest, and rhel7 guest effectively hit it. Signed-off-by: Eugenio Pérez <eperezma@redhat.com> Reviewed-by: Peter Xu <peterx@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Acked-by: Jason Wang <jasowang@redhat.com> Message-Id: <20201116165506.31315-6-eperezma@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
f7701e2c79
commit
1804857f19
@ -1947,6 +1947,7 @@ void memory_region_notify_iommu_one(IOMMUNotifier *notifier,
|
||||
{
|
||||
IOMMUTLBEntry *entry = &event->entry;
|
||||
hwaddr entry_end = entry->iova + entry->addr_mask;
|
||||
IOMMUTLBEntry tmp = *entry;
|
||||
|
||||
if (event->type == IOMMU_NOTIFIER_UNMAP) {
|
||||
assert(entry->perm == IOMMU_NONE);
|
||||
@ -1960,10 +1961,16 @@ void memory_region_notify_iommu_one(IOMMUNotifier *notifier,
|
||||
return;
|
||||
}
|
||||
|
||||
if (notifier->notifier_flags & IOMMU_NOTIFIER_DEVIOTLB_UNMAP) {
|
||||
/* Crop (iova, addr_mask) to range */
|
||||
tmp.iova = MAX(tmp.iova, notifier->start);
|
||||
tmp.addr_mask = MIN(entry_end, notifier->end) - tmp.iova;
|
||||
} else {
|
||||
assert(entry->iova >= notifier->start && entry_end <= notifier->end);
|
||||
}
|
||||
|
||||
if (event->type & notifier->notifier_flags) {
|
||||
notifier->notify(notifier, entry);
|
||||
notifier->notify(notifier, &tmp);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user