i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel/vm: Improve new-range logic in vm_allocate_early_physical_page.

Browse Source 
* Break upon finding an allocatable page.

 * Use addr_range& where possible.
This commit is contained in:
Augustin Cavalier
2024-10-12 12:54:41 -04:00
parent 12357279a8
commit b511d6b064
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/vm/vm.cpp
+11 -9
View File
@@ -4381,26 +4381,28 @@ vm_allocate_early_physical_page(kernel_args* args)
// Try starting a new range. // Try starting a new range.
if (args->num_physical_allocated_ranges < MAX_PHYSICAL_ALLOCATED_RANGE) { if (args->num_physical_allocated_ranges < MAX_PHYSICAL_ALLOCATED_RANGE) {
const uint32 next = args->num_physical_allocated_ranges; const addr_range& lastRange =
phys_addr_t lastPage = args->physical_allocated_range[next - 1].start args->physical_allocated_range[args->num_physical_allocated_ranges - 1];
+ args->physical_allocated_range[next - 1].size; const phys_addr_t lastPage = lastRange.start + lastRange.size;
phys_addr_t nextPage = 0; phys_addr_t nextPage = 0;
for (uint32 i = 0; i < args->num_physical_memory_ranges; i++) { for (uint32 i = 0; i < args->num_physical_memory_ranges; i++) {
const addr_range& range = args->physical_memory_range[i];
// Ignore everything before the last-allocated page, as well as small ranges. // Ignore everything before the last-allocated page, as well as small ranges.
if (args->physical_memory_range[i].start < lastPage) if (range.start < lastPage || range.size < (B_PAGE_SIZE * 128))
continue;
if (args->physical_memory_range[i].size < (B_PAGE_SIZE * 128))
continue; continue;
nextPage = args->physical_memory_range[i].start; nextPage = range.start;
break;
} }
if (nextPage != 0) { if (nextPage != 0) {
// we got one! // we got one!
addr_range& range =
args->physical_allocated_range[args->num_physical_allocated_ranges];
args->num_physical_allocated_ranges++; args->num_physical_allocated_ranges++;
args->physical_allocated_range[next].start = nextPage; range.start = nextPage;
args->physical_allocated_range[next].size = B_PAGE_SIZE; range.size = B_PAGE_SIZE;
return nextPage / B_PAGE_SIZE; return nextPage / B_PAGE_SIZE;
} }
} }