Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-24 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix RamFS readahead

Browse Source
This commit is contained in:
Ruihan Li
2024-09-16 23:52:58 +08:00
committed by Tate, Hongliang Tian
parent c99069981e
commit 179705a3fc
3 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/src/fs/utils/page_cache.rs
View File

@ -306,8 +306,12 @@ impl ReadaheadState {
for async_idx in window.readahead_range() {
let mut async_page = Page::alloc()?;
let pg_waiter = backend.read_page_async(async_idx, async_page.frame())?;
self.waiter.concat(pg_waiter);
async_page.set_state(PageState::Uninit);
if pg_waiter.nreqs() > 0 {
self.waiter.concat(pg_waiter);
} else {
// Some backends (e.g. RamFS) do not issue requests, but fill the page directly.
async_page.set_state(PageState::UpToDate);
}
pages.put(async_idx, async_page);
}
Ok(())
@ -394,9 +398,7 @@ impl PageCacheManager {
if let PageState::Uninit = page.state() {
// Cond 2: We should wait for the previous readahead.
// If there is no previous readahead, an error must have occurred somewhere.
if ra_state.request_number() == 0 {
return_errno!(Errno::EINVAL)
}
assert!(ra_state.request_number() != 0);
ra_state.wait_for_prev_readahead(&mut pages)?;
pages.get(&idx).unwrap().frame().clone()
} else {