Merge pull request #20 from AsakuraMizu/feat/copy

feat: copy and clear

Author: equation314

Cargo.lock

@@ -1,10 +1,7 @@
 [workspace]
 resolver = "2"
 
-members = [
-    "page_table_multiarch",
-    "page_table_entry",
-]
+members = ["page_table_multiarch", "page_table_entry"]
 
 [workspace.package]
 version = "0.5.3"
@@ -17,3 +14,6 @@ repository = "https://github.com/arceos-org/page_table_multiarch"
 keywords = ["arceos", "paging", "page-table", "virtual-memory"]
 categories = ["os", "hardware-support", "memory-management", "no-std"]
 rust-version = "1.85"
+
+[workspace.dependencies]
+memory_addr = "0.4"

Cargo.toml

@@ -17,7 +17,7 @@ arm-el2 = []
 
 [dependencies]
 bitflags = "2.6"
-memory_addr = "0.3"
+memory_addr.workspace = true
 
 [target.'cfg(any(target_arch = "aarch64", doc))'.dependencies]
 aarch64-cpu = "10.0"
@@ -26,4 +26,4 @@ aarch64-cpu = "10.0"
 x86_64 = "0.15.2"
 
 [package.metadata.docs.rs]
-rustc-args = [ "--cfg" , "doc"]
+rustc-args = ["--cfg", "doc"]

page_table_entry/Cargo.toml

@@ -12,10 +12,15 @@ keywords.workspace = true
 categories.workspace = true
 rust-version.workspace = true
 
+[features]
+default = []
+copy-from = ["dep:bitmaps"]
+
 [dependencies]
 log = "0.4"
-memory_addr = "0.3"
+memory_addr.workspace = true
 page_table_entry = { path = "../page_table_entry", version = "0.5.2" }
+bitmaps = { version = "3.2", default-features = false, optional = true }
 
 [target.'cfg(any(target_arch = "x86_64", doc))'.dependencies]
 x86 = "0.52"
@@ -24,4 +29,4 @@ x86 = "0.52"
 riscv = { version = "0.12", default-features = false }
 
 [package.metadata.docs.rs]
-rustc-args = [ "--cfg" , "doc"]
+rustc-args = ["--cfg", "doc"]

page_table_multiarch/Cargo.toml

@@ -27,6 +27,8 @@ const fn p1_index(vaddr: usize) -> usize {
 /// When the [`PageTable64`] itself is dropped.
 pub struct PageTable64<M: PagingMetaData, PTE: GenericPTE, H: PagingHandler> {
     root_paddr: PhysAddr,
+    #[cfg(feature = "copy-from")]
+    borrowed_entries: bitmaps::Bitmap<ENTRY_COUNT>,
     _phantom: PhantomData<(M, PTE, H)>,
 }
 
@@ -38,6 +40,8 @@ impl<M: PagingMetaData, PTE: GenericPTE, H: PagingHandler> PageTable64<M, PTE, H
         let root_paddr = Self::alloc_table()?;
         Ok(Self {
             root_paddr,
+            #[cfg(feature = "copy-from")]
+            borrowed_entries: bitmaps::Bitmap::new(),
             _phantom: PhantomData,
         })
     }
@@ -325,6 +329,7 @@ impl<M: PagingMetaData, PTE: GenericPTE, H: PagingHandler> PageTable64<M, PTE, H
     }
 
     /// Copy entries from another page table within the given virtual memory range.
+    #[cfg(feature = "copy-from")]
     pub fn copy_from(&mut self, other: &Self, start: M::VirtAddr, size: usize) {
         if size == 0 {
             return;
@@ -342,7 +347,13 @@ impl<M: PagingMetaData, PTE: GenericPTE, H: PagingHandler> PageTable64<M, PTE, H
         let end_idx = index_fn(start.into() + size - 1) + 1;
         assert!(start_idx < ENTRY_COUNT);
         assert!(end_idx <= ENTRY_COUNT);
-        dst_table[start_idx..end_idx].copy_from_slice(&src_table[start_idx..end_idx]);
+        for i in start_idx..end_idx {
+            let entry = &mut dst_table[i];
+            if !self.borrowed_entries.set(i, true) {
+                self.dealloc_tree(entry, 1);
+            }
+            *entry = src_table[i];
+        }
     }
 }
 
@@ -520,20 +531,31 @@ impl<M: PagingMetaData, PTE: GenericPTE, H: PagingHandler> PageTable64<M, PTE, H
         }
         Ok(())
     }
+
+    fn dealloc_tree(&self, table_entry: &PTE, level: usize) {
+        // don't free the entries in last level, they are not array.
+        if level < M::LEVELS - 1 {
+            if let Ok(table) = self.next_table(table_entry) {
+                for entry in table {
+                    self.dealloc_tree(entry, level + 1);
+                }
+                H::dealloc_frame(table_entry.paddr());
+            }
+        }
+    }
 }
 
 impl<M: PagingMetaData, PTE: GenericPTE, H: PagingHandler> Drop for PageTable64<M, PTE, H> {
     fn drop(&mut self) {
-        // don't free the entries in last level, they are not array.
-        let _ = self.walk(
-            usize::MAX,
-            None,
-            Some(&|level, _index, _vaddr, entry: &PTE| {
-                if level < M::LEVELS - 1 && entry.is_present() && !entry.is_huge() {
-                    H::dealloc_frame(entry.paddr());
-                }
-            }),
-        );
+        let root = self.table_of(self.root_paddr);
+        #[allow(unused_variables)]
+        for (i, entry) in root.iter().enumerate() {
+            #[cfg(feature = "copy-from")]
+            if self.borrowed_entries.get(i) {
+                continue;
+            }
+            self.dealloc_tree(entry, 1);
+        }
         H::dealloc_frame(self.root_paddr());
     }
 }