fix the unmap assert

rel4team · Sep 18, 2024 · dd4c4cc · dd4c4cc
1 parent 3001af8
commit dd4c4cc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 28 deletions.
diff --git a/kernel/src/syscall/invocation/invoke_mmu_op.rs b/kernel/src/syscall/invocation/invoke_mmu_op.rs
@@ -152,7 +152,7 @@ pub fn invoke_page_map(
     // frame_slot.cap = cap;
     pt_slot.update(pte);
 
-	clean_by_va_pou(
+    clean_by_va_pou(
         convert_ref_type_to_usize(pt_slot),
         pptr_to_paddr(convert_ref_type_to_usize(pt_slot)),
     );

diff --git a/sel4_vspace/src/arch/aarch64/interface.rs b/sel4_vspace/src/arch/aarch64/interface.rs
@@ -310,17 +310,17 @@ pub fn unmap_page_table(asid: asid_t, vaddr: vptr_t, pt: &PTE) {
     let mut pte = find_ret.vspace_root.unwrap();
     let mut level: usize = 0;
     while level < UPT_LEVELS - 1 && pte as usize != pt as *const PTE as usize {
-        level = level + 1;
         ptSlot = unsafe { pte.add(VAddr(vaddr).GET_UPT_INDEX(level)) };
         if ptr_to_mut(ptSlot).get_type() != (pte_tag_t::pte_table) as usize {
             return;
         }
         pte = paddr_to_pptr(ptr_to_mut(ptSlot).next_level_paddr()) as *mut PTE;
+        level = level + 1;
     }
     if pte as usize != pt as *const PTE as usize {
         return;
     }
-    assert!(ptSlot.is_null());
+    assert!(!ptSlot.is_null());
     unsafe {
         *(ptSlot) = PTE(0);
         ptr_to_mut(pte).update(*(ptSlot));

diff --git a/sel4_vspace/src/arch/aarch64/pte.rs b/sel4_vspace/src/arch/aarch64/pte.rs
@@ -4,13 +4,13 @@ use super::utils::paddr_to_pptr;
 use super::{mair_types, seL4_VSpaceIndexBits, UPT_LEVELS};
 use crate::{lookupPTSlot_ret_t, vptr_t};
 use sel4_common::utils::ptr_to_mut;
+use sel4_common::MASK;
 use sel4_common::{
     arch::vm_rights_t,
     sel4_config::{seL4_PageBits, seL4_PageTableBits, PT_INDEX_BITS},
     utils::{convert_ref_type_to_usize, convert_to_mut_type_ref},
     BIT,
 };
-use sel4_common::MASK;
 
 #[allow(unused)]
 pub enum VMPageSize {
@@ -187,32 +187,16 @@ impl PTE {
     ) -> Self {
         let nonexecutable = attr.get_armExecuteNever();
         let cacheable = attr.get_armPageCacheable();
-		let mut attrindx =mair_types::DEVICE_nGnRnE as usize;
+        let mut attrindx = mair_types::DEVICE_nGnRnE as usize;
         if cacheable {
-            attrindx=mair_types::NORMAL as usize;
+            attrindx = mair_types::NORMAL as usize;
         }
         let nG: usize = 1;
-		let vm_right:usize = Self::ap_from_vm_rights_t(rights).bits() >> 6;
+        let vm_right: usize = Self::ap_from_vm_rights_t(rights).bits() >> 6;
         if VMPageSize::ARMSmallPage as usize == page_size {
-            PTE::pte_new_4k_page(
-                nonexecutable as usize,
-                paddr,
-                nG,
-                1,
-                0,
-                vm_right,
-                attrindx,
-            )
+            PTE::pte_new_4k_page(nonexecutable as usize, paddr, nG, 1, 0, vm_right, attrindx)
         } else {
-            PTE::pte_new_page(
-                nonexecutable as usize,
-                paddr,
-                nG,
-                1,
-                0,
-                vm_right,
-                attrindx,
-            )
+            PTE::pte_new_page(nonexecutable as usize, paddr, nG, 1, 0, vm_right, attrindx)
         }
     }
 
@@ -268,18 +252,18 @@ impl PTE {
         let mut pt = self.0 as *mut PTE;
         let mut level: usize = UPT_LEVELS - 1;
         let ptBitsLeft = PT_INDEX_BITS * level + seL4_PageBits;
-		pt = unsafe { pt.add((vptr >> ptBitsLeft) & MASK!(seL4_VSpaceIndexBits)) };
+        pt = unsafe { pt.add((vptr >> ptBitsLeft) & MASK!(seL4_VSpaceIndexBits)) };
         let mut ret: lookupPTSlot_ret_t = lookupPTSlot_ret_t {
             ptSlot: pt,
             ptBitsLeft: ptBitsLeft,
         };
-        
+
         while ptr_to_mut(ret.ptSlot).get_type() == (pte_tag_t::pte_table) as usize && level > 0 {
             level = level - 1;
             ret.ptBitsLeft = ret.ptBitsLeft - PT_INDEX_BITS;
             let paddr = ptr_to_mut(ret.ptSlot).next_level_paddr();
             pt = paddr_to_pptr(paddr) as *mut PTE;
-			pt = unsafe { pt.add((vptr >> ret.ptBitsLeft) & MASK!(PT_INDEX_BITS)) };
+            pt = unsafe { pt.add((vptr >> ret.ptBitsLeft) & MASK!(PT_INDEX_BITS)) };
             ret.ptSlot = pt;
         }
         ret