d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iommu_gas: don't remove and insert boundary entry

Browse Source 
Avoid removing an item in iommu_gas_free_region only to reinsert it,
by avoiding removing an entry that is either first_place or
last_place.

Reviewed by:	kib
MFC after:	3 weeks
Differential Revision:	https://reviews.freebsd.org/D36597
This commit is contained in:
Doug Moore 2022-09-16 15:32:11 -05:00
parent daa85548d5
commit 87cd087a4a
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/iommu/iommu_gas.c
View File

@ -580,7 +580,6 @@ void
iommu_gas_free_region(struct iommu_map_entry *entry)
{
struct iommu_domain *domain;
struct iommu_map_entry *next, *prev;
domain = entry->domain;
KASSERT((entry->flags & (IOMMU_MAP_ENTRY_PLACE | IOMMU_MAP_ENTRY_RMRR |
@ -588,15 +587,10 @@ iommu_gas_free_region(struct iommu_map_entry *entry)
("non-RMRR entry %p %p", domain, entry));
IOMMU_DOMAIN_LOCK(domain);
prev = RB_PREV(iommu_gas_entries_tree, &domain->rb_root, entry);
next = RB_NEXT(iommu_gas_entries_tree, &domain->rb_root, entry);
iommu_gas_rb_remove(domain, entry);
if (entry != domain->first_place &&
entry != domain->last_place)
iommu_gas_rb_remove(domain, entry);
entry->flags &= ~IOMMU_MAP_ENTRY_RMRR;
if (prev == NULL)
iommu_gas_rb_insert(domain, domain->first_place);
if (next == NULL)
iommu_gas_rb_insert(domain, domain->last_place);
IOMMU_DOMAIN_UNLOCK(domain);
}
@ -608,7 +602,7 @@ iommu_gas_remove_clip_left(struct iommu_domain *domain, iommu_gaddr_t start,
IOMMU_DOMAIN_ASSERT_LOCKED(domain);
MPASS(start <= end);
MPASS(end <= domain->last_place->end);
MPASS(end <= domain->end);
/*
* Find an entry which contains the supplied guest's address