Skip to content

Commit 5610979

Browse files
Jean-Philippe Bruckerjoergroedel
authored andcommitted
iommu/virtio: Sort reserved regions
To ease identity mapping support, keep the list of reserved regions sorted. Reviewed-by: Eric Auger <eric.auger@redhat.com> Reviewed-by: Kevin Tian <kevin.tian@intel.com> Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> Link: https://lore.kernel.org/r/20211201173323.1045819-4-jean-philippe@linaro.org Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 parent f0f07a8 commit 5610979

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

drivers/iommu/virtio-iommu.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ static int viommu_add_resv_mem(struct viommu_endpoint *vdev,
423423
size_t size;
424424
u64 start64, end64;
425425
phys_addr_t start, end;
426-
struct iommu_resv_region *region = NULL;
426+
struct iommu_resv_region *region = NULL, *next;
427427
unsigned long prot = IOMMU_WRITE | IOMMU_NOEXEC | IOMMU_MMIO;
428428

429429
start = start64 = le64_to_cpu(mem->start);
@@ -454,7 +454,12 @@ static int viommu_add_resv_mem(struct viommu_endpoint *vdev,
454454
if (!region)
455455
return -ENOMEM;
456456

457-
list_add(&region->list, &vdev->resv_regions);
457+
/* Keep the list sorted */
458+
list_for_each_entry(next, &vdev->resv_regions, list) {
459+
if (next->start > region->start)
460+
break;
461+
}
462+
list_add_tail(&region->list, &next->list);
458463
return 0;
459464
}
460465

0 commit comments

Comments
 (0)