From b11cc78c16e9580f2fd939b5faa78003cc3d08d5 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 2 Oct 2024 16:08:41 -0400 Subject: [PATCH] kernel/vm: Add some more AssertLocked()s in VMCache commitment methods. And remove a now-redundant one. --- src/system/kernel/vm/VMAnonymousCache.cpp | 2 ++ src/system/kernel/vm/VMAnonymousNoSwapCache.cpp | 2 ++ src/system/kernel/vm/VMCache.cpp | 2 -- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/system/kernel/vm/VMAnonymousCache.cpp b/src/system/kernel/vm/VMAnonymousCache.cpp index 78721f1a80..c26cabf8e8 100644 --- a/src/system/kernel/vm/VMAnonymousCache.cpp +++ b/src/system/kernel/vm/VMAnonymousCache.cpp @@ -720,6 +720,8 @@ VMAnonymousCache::Commit(off_t size, int priority) { TRACE("%p->VMAnonymousCache::Commit(%" B_PRIdOFF ")\n", this, size); + AssertLocked(); + // If we can overcommit, we don't commit here, but in Fault(). We always // unreserve memory, if we're asked to shrink our commitment, though. if (fCanOvercommit && size > committed_size) { diff --git a/src/system/kernel/vm/VMAnonymousNoSwapCache.cpp b/src/system/kernel/vm/VMAnonymousNoSwapCache.cpp index cd91d5a5cb..26549fae84 100644 --- a/src/system/kernel/vm/VMAnonymousNoSwapCache.cpp +++ b/src/system/kernel/vm/VMAnonymousNoSwapCache.cpp @@ -61,6 +61,8 @@ VMAnonymousNoSwapCache::Init(bool canOvercommit, int32 numPrecommittedPages, status_t VMAnonymousNoSwapCache::Commit(off_t size, int priority) { + AssertLocked(); + // If we can overcommit, we don't commit here, but in Fault(). We always // unreserve memory, if we're asked to shrink our commitment, though. if (fCanOvercommit && size > committed_size) { diff --git a/src/system/kernel/vm/VMCache.cpp b/src/system/kernel/vm/VMCache.cpp index 16b12c9a6b..0290305d30 100644 --- a/src/system/kernel/vm/VMCache.cpp +++ b/src/system/kernel/vm/VMCache.cpp @@ -1083,8 +1083,6 @@ VMCache::SetMinimalCommitment(off_t commitment, int priority) { TRACE(("VMCache::SetMinimalCommitment(cache %p, commitment %" B_PRIdOFF ")\n", this, commitment)); - AssertLocked(); - T(SetMinimalCommitment(this, commitment)); status_t status = B_OK;