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

kernel/vm: Fix a TODO about page I/O leaving pages in ACCESS state.

Browse Source 
It turns out PAGE_ACCESS assertions could be tripped in other cases,
e.g. when resizing a cache while pages were being read in. So,
properly unset ACCESS (and just leave 'busy' set) in the places
where pages are read in, and re-enable the check.

Change-Id: I22ac5c8cb432c87613bb85e82703a0c1aeb55d86
Reviewed-on: https://review.haiku-os.org/c/haiku/+/10627
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Augustin Cavalier
2026-03-30 22:11:53 +00:00
committed by waddlesplash
parent 05772630b8
commit 5554f0b829
3 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/cache/file_cache.cpp
Vendored
+9 -10
View File
@@ -92,9 +92,6 @@ private:
off_t fOffset;
uint32 fVecCount;
generic_size_t fSize;
#if DEBUG_PAGE_ACCESS
thread_id fAllocatingThread;
#endif
};
typedef status_t (*cache_func)(file_cache_ref* ref, void* cookie, off_t offset,
@@ -164,16 +161,13 @@ PrecacheIO::Prepare(vm_page_reservation* reservation)
page->busy_io = true;
fCache->InsertPage(page, fOffset + pos);
DEBUG_PAGE_ACCESS_END(page);
add_to_iovec(fVecs, fVecCount, fPageCount,
page->physical_page_number * B_PAGE_SIZE, B_PAGE_SIZE);
fPages[i++] = page;
}
#if DEBUG_PAGE_ACCESS
fAllocatingThread = find_thread(NULL);
#endif
return B_OK;
}
@@ -203,6 +197,8 @@ PrecacheIO::IOFinished(status_t status, bool partialTransfer,
bytesTransferred = fCache->virtual_end - fOffset;
for (uint32 i = 0; i < pagesTransferred; i++) {
DEBUG_PAGE_ACCESS_START(fPages[i]);
if (i == pagesTransferred - 1
&& (bytesTransferred % B_PAGE_SIZE) != 0) {
// clear partial page
@@ -213,8 +209,6 @@ PrecacheIO::IOFinished(status_t status, bool partialTransfer,
0, B_PAGE_SIZE - bytesTouched);
}
DEBUG_PAGE_ACCESS_TRANSFER(fPages[i], fAllocatingThread);
if (!fPages[i]->busy_io) {
// The busy_io flag was cleared. Let the cache handle the rest.
fCache->FreeRemovedPage(fPages[i]);
@@ -228,7 +222,7 @@ PrecacheIO::IOFinished(status_t status, bool partialTransfer,
// Free pages after failed I/O
for (uint32 i = pagesTransferred; i < fPageCount; i++) {
DEBUG_PAGE_ACCESS_TRANSFER(fPages[i], fAllocatingThread);
DEBUG_PAGE_ACCESS_START(fPages[i]);
if (!fPages[i]->busy_io) {
fCache->FreeRemovedPage(fPages[i]);
continue;
@@ -413,6 +407,7 @@ read_into_cache(file_cache_ref* ref, void* cookie, off_t offset,
page->busy_io = true;
cache->InsertPage(page, offset + pos);
DEBUG_PAGE_ACCESS_END(page);
add_to_iovec(vecs, vecCount, MAX_IO_VECS,
page->physical_page_number * B_PAGE_SIZE, B_PAGE_SIZE);
@@ -434,6 +429,7 @@ read_into_cache(file_cache_ref* ref, void* cookie, off_t offset,
cache->Lock();
for (int32 i = 0; i < pageIndex; i++) {
DEBUG_PAGE_ACCESS_START(pages[i]);
if (!pages[i]->busy_io) {
cache->FreeRemovedPage(pages[i]);
continue;
@@ -468,6 +464,7 @@ read_into_cache(file_cache_ref* ref, void* cookie, off_t offset,
// make the pages accessible in the cache
for (int32 i = pageIndex; i-- > 0;) {
DEBUG_PAGE_ACCESS_START(pages[i]);
if (!pages[i]->busy_io) {
cache->FreeRemovedPage(pages[i]);
continue;
@@ -552,6 +549,7 @@ write_to_cache(file_cache_ref* ref, void* cookie, off_t offset,
page->modified = !writeThrough;
ref->cache->InsertPage(page, offset + pos);
DEBUG_PAGE_ACCESS_END(page);
add_to_iovec(vecs, vecCount, MAX_IO_VECS,
page->physical_page_number * B_PAGE_SIZE, B_PAGE_SIZE);
@@ -647,6 +645,7 @@ write_to_cache(file_cache_ref* ref, void* cookie, off_t offset,
// make the pages accessible in the cache
for (int32 i = pageIndex; i-- > 0;) {
DEBUG_PAGE_ACCESS_START(pages[i]);
if (!pages[i]->busy_io) {
ref->cache->FreeRemovedPage(pages[i]);
continue;