feat: update page_table_multiarch to 0.6

Author: YanLien

Cargo.toml

@@ -30,8 +30,8 @@ numeric-enum-macro = "0.2"
 axerrno = "0.1.0"
 memory_addr = "0.4"
 memory_set = "0.4"
-page_table_entry = "=0.5.7"
-page_table_multiarch = "=0.5.7"
+page_table_entry = "0.6"
+page_table_multiarch = "0.6"
 
 [target.'cfg(any(target_arch = "x86_64", doc))'.dependencies]
 x86 = "0.52"

src/address_space/backend/alloc.rs

@@ -32,7 +32,7 @@ impl<H: PagingHandler> Backend<H> {
             // allocate all possible physical frames for populated mapping.
             for addr in PageIter4K::new(start, start + size).unwrap() {
                 if H::alloc_frame()
-                    .and_then(|frame| pt.map(addr, frame, PageSize::Size4K, flags).ok())
+                    .and_then(|frame| pt.cursor().map(addr, frame, PageSize::Size4K, flags).ok())
                     .is_none()
                 {
                     return false;
@@ -41,15 +41,15 @@ impl<H: PagingHandler> Backend<H> {
             true
         } else {
             // Map to a empty entry for on-demand mapping.
-            pt.map_region(
-                start,
-                |_va| PhysAddr::from(0),
-                size,
-                MappingFlags::empty(),
-                false,
-                false,
-            )
-            .is_ok()
+            pt.cursor()
+                .map_region(
+                    start,
+                    |_va| PhysAddr::from(0),
+                    size,
+                    MappingFlags::empty(),
+                    false,
+                )
+                .is_ok()
         }
     }
 
@@ -62,7 +62,7 @@ impl<H: PagingHandler> Backend<H> {
     ) -> bool {
         debug!("unmap_alloc: [{:#x}, {:#x})", start, start + size);
         for addr in PageIter4K::new(start, start + size).unwrap() {
-            if let Ok((frame, page_size, _)) = pt.unmap(addr) {
+            if let Ok((frame, _, page_size)) = pt.cursor().unmap(addr) {
                 // Deallocate the physical frame if there is a mapping in the
                 // page table.
                 if page_size.is_huge() {
@@ -88,9 +88,9 @@ impl<H: PagingHandler> Backend<H> {
         } else {
             // Allocate a physical frame lazily and map it to the fault address.
             // `vaddr` does not need to be aligned. It will be automatically
-            // aligned during `pt.remap` regardless of the page size.
+            // aligned during `pt.cursor().remap` regardless of the page size.
             H::alloc_frame()
-                .and_then(|frame| pt.remap(vaddr, frame, orig_flags).ok())
+                .and_then(|frame| pt.cursor().remap(vaddr, frame, orig_flags).ok())
                 .is_some()
         }
     }

src/address_space/backend/linear.rs

@@ -27,15 +27,15 @@ impl<H: PagingHandler> Backend<H> {
             pa_start + size,
             flags
         );
-        pt.map_region(
-            start,
-            |va| PhysAddr::from(va.as_usize() - pa_va_offset),
-            size,
-            flags,
-            true,
-            true,
-        )
-        .is_ok()
+        pt.cursor()
+            .map_region(
+                start,
+                |va| PhysAddr::from(va.as_usize() - pa_va_offset),
+                size,
+                flags,
+                true,
+            )
+            .is_ok()
     }
 
     pub(crate) fn unmap_linear(
@@ -46,6 +46,6 @@ impl<H: PagingHandler> Backend<H> {
         _pa_va_offset: usize,
     ) -> bool {
         debug!("unmap_linear: [{:#x}, {:#x})", start, start + size);
-        pt.unmap_region(start, size, true).is_ok()
+        pt.cursor().unmap_region(start, size).is_ok()
     }
 }

src/address_space/backend/mod.rs

@@ -85,10 +85,8 @@ impl<H: PagingHandler> MappingBackend for Backend<H> {
         page_table: &mut PageTable<H>,
     ) -> bool {
         page_table
-            .protect_region(start, size, new_flags, true)
-            // If the TLB is refreshed immediately every time, there might be performance issues.
-            // The TLB refresh is managed uniformly at a higher level.
-            .map(|tlb| tlb.ignore())
+            .cursor()
+            .protect_region(start, size, new_flags)
             .is_ok()
     }
 }