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

kernel/vm: Make privately-mapped anonymous regions avoid committing memory too.

Browse Source 
This was already the case for non-anonymous regions (i.e. mmap'ed files),
but wasn't the case for anonymous ones (fd < 0). Now it is.
This commit is contained in:
Augustin Cavalier
2024-12-10 22:34:16 -05:00
parent 5b2ecc7859
commit 3cd8a6719d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/vm/vm.cpp
+6 -5
View File
@@ -2271,6 +2271,12 @@ _vm_map_file(team_id team, const char* name, void** _address,
uint32 mappingFlags = 0; uint32 mappingFlags = 0;
if (unmapAddressRange) if (unmapAddressRange)
mappingFlags |= CREATE_AREA_UNMAP_ADDRESS_RANGE; mappingFlags |= CREATE_AREA_UNMAP_ADDRESS_RANGE;
if (mapping == REGION_PRIVATE_MAP) {
// For privately mapped read-only regions, skip committing memory.
// (If protections are changed later on, memory will be committed then.)
if ((protection & (B_WRITE_AREA | B_KERNEL_WRITE_AREA)) == 0)
mappingFlags |= CREATE_AREA_DONT_COMMIT_MEMORY;
}
if (fd < 0) { if (fd < 0) {
virtual_address_restrictions virtualRestrictions = {}; virtual_address_restrictions virtualRestrictions = {};
@@ -2304,11 +2310,6 @@ _vm_map_file(team_id team, const char* name, void** _address,
protectionMax = protection | B_USER_PROTECTION; protectionMax = protection | B_USER_PROTECTION;
else else
protectionMax = protection | (B_USER_PROTECTION & ~B_WRITE_AREA); protectionMax = protection | (B_USER_PROTECTION & ~B_WRITE_AREA);
} else if (mapping == REGION_PRIVATE_MAP) {
// For privately mapped read-only regions, skip committing memory.
// (If protections are changed later on, memory will be committed then.)
if ((protection & B_WRITE_AREA) == 0)
mappingFlags |= CREATE_AREA_DONT_COMMIT_MEMORY;
} }
// get the vnode for the object, this also grabs a ref to it // get the vnode for the object, this also grabs a ref to it