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

Inject post_schedule/user_page_fault handler to OSTD

Browse Source
This commit is contained in:
Chen Chengjun
2025-03-17 13:58:01 +08:00
committed by Tate, Hongliang Tian
parent 2a20f6b59a
commit 048fd1077c
4 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
kernel/src/thread/exception.rs
View File

@ -3,9 +3,10 @@
#![expect(unused_variables)]
use aster_rights::Full;
use ostd::{cpu::*, mm::VmSpace, task::Task};
use ostd::cpu::*;
use crate::{
current_userspace,
prelude::*,
process::signal::signals::fault::FaultSignal,
vm::{page_fault_handler::PageFaultHandler, perms::VmPerms, vmar::Vmar},
@ -41,26 +42,8 @@ pub fn handle_exception(ctx: &Context, context: &UserContext) {
generate_fault_signal(trap_info, ctx);
}
/// Handles the page fault occurs in the input `VmSpace`.
pub(crate) fn handle_page_fault_from_vm_space(
vm_space: &VmSpace,
page_fault_info: &PageFaultInfo,
) -> core::result::Result<(), ()> {
let task = Task::current().unwrap();
let current_root_vmar = task.as_thread_local().unwrap().root_vmar().borrow();
let root_vmar = current_root_vmar.as_ref().unwrap();
// If page is not present or due to write access, we should ask the vmar try to commit this page
debug_assert_eq!(
Arc::as_ptr(root_vmar.vm_space()),
vm_space as *const VmSpace
);
handle_page_fault_from_vmar(root_vmar, page_fault_info)
}
/// Handles the page fault occurs in the input `Vmar`.
pub(crate) fn handle_page_fault_from_vmar(
fn handle_page_fault_from_vmar(
root_vmar: &Vmar<Full>,
page_fault_info: &PageFaultInfo,
) -> core::result::Result<(), ()> {
@ -92,3 +75,7 @@ fn log_trap_info(trap_info: &CpuExceptionInfo) {
trace!("[Trap][{exception:?}][err = {}]", trap_info.error_code)
}
}
pub(super) fn page_fault_handler(info: &CpuExceptionInfo) -> core::result::Result<(), ()> {
handle_page_fault_from_vmar(current_userspace!().root_vmar(), &info.try_into().unwrap())
}

17
kernel/src/thread/mod.rs
View File

@ -24,6 +24,23 @@ pub mod work_queue;
pub type Tid = u32;
fn post_schedule_handler() {
let task = Task::current().unwrap();
let Some(thread_local) = task.as_thread_local() else {
return;
};
let root_vmar = thread_local.root_vmar().borrow();
if let Some(vmar) = root_vmar.as_ref() {
vmar.vm_space().activate()
}
}
pub(super) fn init() {
ostd::task::inject_post_schedule_handler(post_schedule_handler);
ostd::arch::trap::inject_user_page_fault_handler(exception::page_fault_handler);
}
/// A thread is a wrapper on top of task.
#[derive(Debug)]
pub struct Thread {