From a3571c8b7908145315148104bcc9fdea05db9c4f Mon Sep 17 00:00:00 2001
From: MemoryShore <1353318529@qq.com>
Date: Fri, 6 Sep 2024 23:02:50 +0800
Subject: [PATCH] =?UTF-8?q?fix(mm):=20=E4=BF=AE=E5=A4=8Driscv64=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E6=97=B6=E7=9A=84PageFault=20(#915)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 修复riscv64启动时的PageFault

* 优化代码结构
---
 kernel/src/mm/page.rs     | 16 +++++++++-------
 kernel/src/mm/ucontext.rs | 24 ++++++++++--------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/kernel/src/mm/page.rs b/kernel/src/mm/page.rs
index b6a07293..f3d90069 100644
--- a/kernel/src/mm/page.rs
+++ b/kernel/src/mm/page.rs
@@ -807,13 +807,15 @@ impl<Arch: MemoryManagementArch> EntryFlags<Arch> {
     /// - prot_flags: 页的保护标志
     /// - user: 用户空间是否可访问
     pub fn from_prot_flags(prot_flags: ProtFlags, user: bool) -> Self {
-        let vm_flags = super::VmFlags::from(prot_flags);
-        // let flags: EntryFlags<Arch> = EntryFlags::new()
-        //     .set_user(user)
-        //     .set_execute(prot_flags.contains(ProtFlags::PROT_EXEC))
-        //     .set_write(prot_flags.contains(ProtFlags::PROT_WRITE));
-        let flags = Arch::vm_get_page_prot(vm_flags).set_user(user);
-        return flags;
+        if Arch::PAGE_FAULT_ENABLED {
+            let vm_flags = super::VmFlags::from(prot_flags);
+            Arch::vm_get_page_prot(vm_flags).set_user(user)
+        } else {
+            EntryFlags::new()
+                .set_user(user)
+                .set_execute(prot_flags.contains(ProtFlags::PROT_EXEC))
+                .set_write(prot_flags.contains(ProtFlags::PROT_WRITE))
+        }
     }
 
     #[inline(always)]
diff --git a/kernel/src/mm/ucontext.rs b/kernel/src/mm/ucontext.rs
index 40934b65..de6a0a04 100644
--- a/kernel/src/mm/ucontext.rs
+++ b/kernel/src/mm/ucontext.rs
@@ -275,12 +275,6 @@ impl InnerAddressSpace {
 
         let len = page_align_up(len);
 
-        let vm_flags = VmFlags::from(prot_flags)
-            | VmFlags::from(map_flags)
-            | VmFlags::VM_MAYREAD
-            | VmFlags::VM_MAYWRITE
-            | VmFlags::VM_MAYEXEC;
-
         // debug!("map_anonymous: len = {}", len);
 
         let start_page: VirtPageFrame = self.mmap(
@@ -288,7 +282,7 @@ impl InnerAddressSpace {
             PageFrameCount::from_bytes(len).unwrap(),
             prot_flags,
             map_flags,
-            move |page, count, flags, mapper, flusher| {
+            move |page, count, vm_flags, flags, mapper, flusher| {
                 if allocate_at_once {
                     VMA::zeroed(page, count, vm_flags, flags, mapper, flusher, None, None)
                 } else {
@@ -359,12 +353,6 @@ impl InnerAddressSpace {
 
         let len = page_align_up(len);
 
-        let vm_flags = VmFlags::from(prot_flags)
-            | VmFlags::from(map_flags)
-            | VmFlags::VM_MAYREAD
-            | VmFlags::VM_MAYWRITE
-            | VmFlags::VM_MAYEXEC;
-
         // debug!("map_anonymous: len = {}", len);
 
         let binding = ProcessManager::current_pcb().fd_table();
@@ -388,7 +376,7 @@ impl InnerAddressSpace {
             PageFrameCount::from_bytes(len).unwrap(),
             prot_flags,
             map_flags,
-            move |page, count, flags, mapper, flusher| {
+            move |page, count, vm_flags, flags, mapper, flusher| {
                 if allocate_at_once {
                     VMA::zeroed(
                         page,
@@ -436,6 +424,7 @@ impl InnerAddressSpace {
         F: FnOnce(
             VirtPageFrame,
             PageFrameCount,
+            VmFlags,
             EntryFlags<MMArch>,
             &mut PageMapper,
             &mut dyn Flusher<MMArch>,
@@ -467,6 +456,12 @@ impl InnerAddressSpace {
 
         let page = VirtPageFrame::new(region.start());
 
+        let vm_flags = VmFlags::from(prot_flags)
+            | VmFlags::from(map_flags)
+            | VmFlags::VM_MAYREAD
+            | VmFlags::VM_MAYWRITE
+            | VmFlags::VM_MAYEXEC;
+
         // debug!("mmap: page: {:?}, region={region:?}", page.virt_address());
 
         compiler_fence(Ordering::SeqCst);
@@ -483,6 +478,7 @@ impl InnerAddressSpace {
         self.mappings.insert_vma(map_func(
             page,
             page_count,
+            vm_flags,
             EntryFlags::from_prot_flags(prot_flags, true),
             &mut self.user_mapper.utable,
             flusher,