make map_range_with_table_flags and map_range unsafe

rust-osdev · Sep 5, 2021 · 7a00802 · 7a00802
1 parent c1f380e
commit 7a00802
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/src/structures/paging/mapper/mapped_page_table.rs b/src/structures/paging/mapper/mapped_page_table.rs
@@ -598,7 +598,7 @@ impl<'a, P: PageTableFrameMapping> Mapper<Size1GiB> for MappedPageTable<'a, P> {
     }
 
     #[inline]
-    fn map_range_with_table_flags<A>(
+    unsafe fn map_range_with_table_flags<A>(
         &mut self,
         pages: PageRange<Size1GiB>,
         flags: PageTableFlags,
@@ -801,7 +801,7 @@ impl<'a, P: PageTableFrameMapping> Mapper<Size2MiB> for MappedPageTable<'a, P> {
     }
 
     #[inline]
-    fn map_range_with_table_flags<A>(
+    unsafe fn map_range_with_table_flags<A>(
         &mut self,
         pages: PageRange<Size2MiB>,
         flags: PageTableFlags,
@@ -1024,7 +1024,7 @@ impl<'a, P: PageTableFrameMapping> Mapper<Size4KiB> for MappedPageTable<'a, P> {
     }
 
     #[inline]
-    fn map_range_with_table_flags<A>(
+    unsafe fn map_range_with_table_flags<A>(
         &mut self,
         pages: PageRange<Size4KiB>,
         flags: PageTableFlags,

diff --git a/src/structures/paging/mapper/mod.rs b/src/structures/paging/mapper/mod.rs
@@ -372,10 +372,15 @@ pub trait Mapper<S: PageSize> {
 
     /// Maps frames from the allocator to the given range of virtual pages.
     ///
+    /// ## Safety
+    ///
+    /// This function invokes [`Mapper::map_to_with_table_flags`] internally, so
+    /// all safety requirements of it also apply for this function.
+    ///
     /// ## Errors
     ///
     /// If an error occurs half-way through a [`MapperFlushRange<S>`] is returned that contains the frames that were successfully mapped.
-    fn map_range_with_table_flags<A>(
+    unsafe fn map_range_with_table_flags<A>(
         &mut self,
         mut pages: PageRange<S>,
         flags: PageTableFlags,
@@ -419,11 +424,16 @@ pub trait Mapper<S: PageSize> {
 
     /// Maps frames from the allocator to the given range of virtual pages.
     ///
+    /// ## Safety
+    ///
+    /// This function invokes [`Mapper::map_to_with_table_flags`] internally, so
+    /// all safety requirements of it also apply for this function.
+    ///
     /// ## Errors
     ///
     /// If an error occurs half-way through a [`MapperFlushRange<S>`] is returned that contains the frames that were successfully mapped.
     #[inline]
-    fn map_range<A>(
+    unsafe fn map_range<A>(
         &mut self,
         pages: PageRange<S>,
         flags: PageTableFlags,

diff --git a/src/structures/paging/mapper/offset_page_table.rs b/src/structures/paging/mapper/offset_page_table.rs
@@ -97,7 +97,7 @@ impl<'a> Mapper<Size1GiB> for OffsetPageTable<'a> {
     }
 
     #[inline]
-    fn map_range_with_table_flags<A>(
+    unsafe fn map_range_with_table_flags<A>(
         &mut self,
         pages: PageRange<Size1GiB>,
         flags: PageTableFlags,
@@ -214,7 +214,7 @@ impl<'a> Mapper<Size2MiB> for OffsetPageTable<'a> {
     }
 
     #[inline]
-    fn map_range_with_table_flags<A>(
+    unsafe fn map_range_with_table_flags<A>(
         &mut self,
         pages: PageRange<Size2MiB>,
         flags: PageTableFlags,
@@ -331,7 +331,7 @@ impl<'a> Mapper<Size4KiB> for OffsetPageTable<'a> {
     }
 
     #[inline]
-    fn map_range_with_table_flags<A>(
+    unsafe fn map_range_with_table_flags<A>(
         &mut self,
         pages: PageRange<Size4KiB>,
         flags: PageTableFlags,

diff --git a/src/structures/paging/mapper/recursive_page_table.rs b/src/structures/paging/mapper/recursive_page_table.rs
@@ -767,7 +767,7 @@ impl<'a> Mapper<Size1GiB> for RecursivePageTable<'a> {
     }
 
     #[inline]
-    fn map_range_with_table_flags<A>(
+    unsafe fn map_range_with_table_flags<A>(
         &mut self,
         pages: PageRange<Size1GiB>,
         flags: PageTableFlags,
@@ -984,7 +984,7 @@ impl<'a> Mapper<Size2MiB> for RecursivePageTable<'a> {
     }
 
     #[inline]
-    fn map_range_with_table_flags<A>(
+    unsafe fn map_range_with_table_flags<A>(
         &mut self,
         pages: PageRange<Size2MiB>,
         flags: PageTableFlags,
@@ -1236,7 +1236,7 @@ impl<'a> Mapper<Size4KiB> for RecursivePageTable<'a> {
     }
 
     #[inline]
-    fn map_range_with_table_flags<A>(
+    unsafe fn map_range_with_table_flags<A>(
         &mut self,
         pages: PageRange<Size4KiB>,
         flags: PageTableFlags,