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

kernel/vm: Assert in VMCache::InsertPage() that the offset is within the cache.

Browse Source 
This would have caught the problem fixed in the previous commit.
Also adjust the assertion in MovePage for correctness.
This commit is contained in:
Augustin Cavalier
2025-01-22 15:39:58 -05:00
parent 8ff91e4a44
commit ece9fcbaa8
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/vm/VMCache.cpp
+4 -3
View File
@@ -788,15 +788,16 @@ VMCache::InsertPage(vm_page* page, off_t offset)
{
TRACE(("VMCache::InsertPage(): cache %p, page %p, offset %" B_PRIdOFF "\n",
this, page, offset));
T2(InsertPage(this, page, offset));
AssertLocked();
ASSERT(offset >= virtual_base && offset <= virtual_end);
if (page->CacheRef() != NULL) {
panic("insert page %p into cache %p: page cache is set to %p\n",
page, this, page->Cache());
}
T2(InsertPage(this, page, offset));
page->cache_offset = (page_num_t)(offset >> PAGE_SHIFT);
page_count++;
page->SetCacheRef(fCacheRef);
@@ -854,7 +855,7 @@ VMCache::MovePage(vm_page* page, off_t offset)
AssertLocked();
oldCache->AssertLocked();
ASSERT(offset >= virtual_base && (offset + B_PAGE_SIZE) <= virtual_end);
ASSERT(offset >= virtual_base && offset <= virtual_end);
// remove from old cache
oldCache->pages.Remove(page);