Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions kernel/src/mm/aspace/backend/file.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,12 @@ impl Drop for FileBackendInner {
}
}
impl FileBackendInner {
pub fn register_listener(self: &Arc<Self>, aspace: &Arc<Mutex<AddrSpace>>) -> usize {
pub fn register_listener(self: &Arc<Self>, aspace: &Arc<Mutex<AddrSpace>>) {
if self.handle.load(Ordering::Acquire) != 0 {
panic!("Listener already registered");
}
let aspace = Arc::downgrade(aspace);
self.cache.add_evict_listener({
let handle = self.cache.add_evict_listener({
let this = Arc::downgrade(self);
move |pn, _page| {
let Some(this) = this.upgrade() else {
Expand All @@ -53,7 +56,8 @@ impl FileBackendInner {
};
this.on_evict(pn, &mut aspace);
}
})
});
self.handle.store(handle, Ordering::Release);
}

fn on_evict(self: &Arc<Self>, pn: u32, aspace: &mut AddrSpace) {
Expand Down
8 changes: 7 additions & 1 deletion kernel/src/mm/aspace/backend/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,12 @@ impl MappingBackend for Backend {
new_flags: Self::Flags,
pt: &mut Self::PageTable,
) -> bool {
pt.cursor().protect_region(start, size, new_flags).is_ok()
let range = VirtAddrRange::from_start_size(start, size);
let mut cursor = pt.cursor();
if let Err(err) = BackendOps::on_protect(self, range, new_flags, &mut cursor) {
warn!("Failed to protect area: {:?}", err);
return false;
}
cursor.protect_region(start, size, new_flags).is_ok()
}
}
13 changes: 8 additions & 5 deletions kernel/src/mm/aspace/backend/shared.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@ pub struct SharedPages {
}
impl SharedPages {
pub fn new(size: usize, page_size: PageSize) -> AxResult<Self> {
Ok(Self {
phys_pages: (0..divide_page(size, page_size))
.map(|_| alloc_frame(true, page_size))
.collect::<AxResult<_>>()?,
let num_pages = divide_page(size, page_size);
let mut result = Self {
phys_pages: Vec::with_capacity(num_pages),
size: page_size,
})
};
for _ in 0..num_pages {
result.phys_pages.push(alloc_frame(true, page_size)?);
}
Ok(result)
}

pub fn len(&self) -> usize {
Expand Down