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

kernel/vm: Pages in the store should be in the commitment.

Browse Source 
Otherwise we won't reserve memory/swap for swapped-out pages.
This commit is contained in:
Augustin Cavalier
2026-03-26 17:49:56 -04:00
parent 33dc47cb2c
commit 34e74e0556
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/vm/vm.cpp
+9 -3
View File
@@ -607,6 +607,8 @@ compute_area_page_commitment(VMArea* area)
if (area->page_protections == NULL) { if (area->page_protections == NULL) {
if ((area->protection & commitProtection) != 0) if ((area->protection & commitProtection) != 0)
return area->Size(); return area->Size();
// TODO: We should also include pages in the store here!
return area->cache->page_count * B_PAGE_SIZE; return area->cache->page_count * B_PAGE_SIZE;
} }
@@ -616,7 +618,8 @@ compute_area_page_commitment(VMArea* area)
for (size_t i = 0; i < bytes; i++) { for (size_t i = 0; i < bytes; i++) {
const uint8 protection = area->page_protections[i]; const uint8 protection = area->page_protections[i];
const off_t pageOffset = area->cache_offset + (i * 2 * B_PAGE_SIZE); const off_t pageOffset = area->cache_offset + (i * 2 * B_PAGE_SIZE);
if (area->cache->LookupPage(pageOffset) != NULL) if (area->cache->LookupPage(pageOffset) != NULL
|| area->cache->StoreHasPage(pageOffset))
pages++; pages++;
else else
pages += ((protection & (commitProtection << 0)) != 0) ? 1 : 0; pages += ((protection & (commitProtection << 0)) != 0) ? 1 : 0;
@@ -624,7 +627,8 @@ compute_area_page_commitment(VMArea* area)
if (i == (bytes - 1) && oddPageCount) if (i == (bytes - 1) && oddPageCount)
break; break;
if (area->cache->LookupPage(pageOffset + B_PAGE_SIZE) != NULL) if (area->cache->LookupPage(pageOffset + B_PAGE_SIZE) != NULL
|| area->cache->StoreHasPage(pageOffset + B_PAGE_SIZE))
pages++; pages++;
else else
pages += ((protection & (commitProtection << 4)) != 0) ? 1 : 0; pages += ((protection & (commitProtection << 4)) != 0) ? 1 : 0;
@@ -6552,7 +6556,9 @@ _user_set_memory_protection(void* _address, size_t size, uint32 protection)
const off_t areaCacheBase = area->Base() - area->cache_offset; const off_t areaCacheBase = area->Base() - area->cache_offset;
for (addr_t pageAddress = area->Base() + offset; for (addr_t pageAddress = area->Base() + offset;
pageAddress < currentAddress; pageAddress += B_PAGE_SIZE) { pageAddress < currentAddress; pageAddress += B_PAGE_SIZE) {
if (topCache->LookupPage(pageAddress - areaCacheBase) != NULL) { const off_t cacheOffset = pageAddress - areaCacheBase;
if (topCache->LookupPage(cacheOffset) != NULL
|| topCache->StoreHasPage(cacheOffset)) {
// This page should already be accounted for in the commitment. // This page should already be accounted for in the commitment.
continue; continue;
} }