andrey/rCore
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore.git synced 2024-11-21 23:56:18 +04:00
Code Issues Projects Releases Wiki Activity

still demand page race fix

Browse Source
This commit is contained in:
gjz010 2021-05-11 02:10:49 +08:00
parent 067dc4e3f5
commit c753f9a1e9
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kernel/src/memory.rs
View File

@ -139,6 +139,19 @@ pub fn handle_page_fault(addr: usize) -> bool {
lock.handle_page_fault(addr)
}
/// Handle page fault at `addr` with access type `access`.
/// Return true to continue, false to halt.
pub fn handle_page_fault_ext(addr: usize, access: crate::memory::AccessType) -> bool {
debug!(
"page fault from kernel @ {:#x} with access type {:?}",
addr, access
);
let thread = current_thread().unwrap();
let mut lock = thread.vm.lock();
lock.handle_page_fault_ext(addr, access)
}
pub fn init_heap() {
use crate::consts::KERNEL_HEAP_SIZE;
const MACHINE_ALIGN: usize = mem::size_of::<usize>();
@ -190,7 +203,6 @@ pub unsafe extern "C" fn read_user_fixup() -> usize {
}
pub fn copy_from_user<T>(addr: *const T) -> Option<T> {
#[naked]
#[inline(never)]
#[link_section = ".text.copy_user"]
unsafe extern "C" fn read_user<T>(dst: *mut T, src: *const T) -> usize {
@ -208,7 +220,6 @@ pub fn copy_from_user<T>(addr: *const T) -> Option<T> {
}
pub fn copy_to_user<T>(addr: *mut T, src: *const T) -> bool {
#[naked]
#[inline(never)]
#[link_section = ".text.copy_user"]
unsafe extern "C" fn write_user<T>(dst: *mut T, src: *const T) -> usize {