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

kern: physmem: don't create a new exregion for different flags...

Browse Source 
... if the region we're adding is an exact match to one that we already
have.  Simply extend the flags of the existing entry as needed so that
we don't end up with duplicate regions.

It could be that we got the exclusion through two different means, e.g.,
FDT memreserve and the EFI memory map, and we may derive different
characteristics from each.  Apply the most restrictive set to the
region.

Reported by:	Mark Millard <marklmi yahoo com>
Reviewed by:	mhorne
This commit is contained in:
Kyle Evans 2023-03-09 23:27:39 -06:00
parent 75798f9b01
commit cc0fe048ec
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/kern/subr_physmem.c
View File

@ -376,8 +376,8 @@ insert_region(struct region *regions, size_t rcnt, vm_paddr_t addr,
nend = addr + size;
ep = regions + rcnt;
for (i = 0, rp = regions; i < rcnt; ++i, ++rp) {
rend = rp->addr + rp->size;
if (flags == rp->flags) {
rend = rp->addr + rp->size;
if (addr <= rp->addr && nend >= rp->addr) {
/*
* New mapping overlaps at the beginning, shift
@ -404,7 +404,20 @@ insert_region(struct region *regions, size_t rcnt, vm_paddr_t addr,
}
return (rcnt);
}
} else if ((flags != 0) && (rp->flags != 0)) {
/*
* If we're duplicating an entry that already exists
* exactly, just upgrade its flags as needed. We could
* do more if we find that we have differently specified
* flags clipping existing excluding regions, but that's
* probably rare.
*/
if (addr == rp->addr && nend == rend) {
rp->flags |= flags;
return (rcnt);
}
}
if (addr < rp->addr) {
bcopy(rp, rp + 1, (ep - rp) * sizeof(*rp));
break;