make map_range safe

Author: Freax13

src/structures/paging/mapper/mapped_page_table.rs

@@ -598,7 +598,7 @@ impl<'a, P: PageTableFrameMapping> Mapper<Size1GiB> for MappedPageTable<'a, P> {
     }
 
     #[inline]
-    unsafe fn map_range_with_table_flags<A>(
+    fn map_range_with_table_flags<A>(
         &mut self,
         pages: PageRange<Size1GiB>,
         flags: PageTableFlags,
@@ -800,7 +800,7 @@ impl<'a, P: PageTableFrameMapping> Mapper<Size2MiB> for MappedPageTable<'a, P> {
     }
 
     #[inline]
-    unsafe fn map_range_with_table_flags<A>(
+    fn map_range_with_table_flags<A>(
         &mut self,
         pages: PageRange<Size2MiB>,
         flags: PageTableFlags,
@@ -1022,7 +1022,7 @@ impl<'a, P: PageTableFrameMapping> Mapper<Size4KiB> for MappedPageTable<'a, P> {
     }
 
     #[inline]
-    unsafe fn map_range_with_table_flags<A>(
+    fn map_range_with_table_flags<A>(
         &mut self,
         pages: PageRange<Size4KiB>,
         flags: PageTableFlags,

src/structures/paging/mapper/mod.rs

@@ -380,15 +380,10 @@ pub trait Mapper<S: PageSize> {
 
     /// Maps frames from the allocator to the given range of virtual pages.
     ///
-    /// ## Safety
-    ///
-    /// This is a convencience function that 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.
-    unsafe fn map_range_with_table_flags<A>(
+    fn map_range_with_table_flags<A>(
         &mut self,
         mut pages: PageRange<S>,
         flags: PageTableFlags,
@@ -405,13 +400,16 @@ pub trait Mapper<S: PageSize> {
                     .allocate_frame()
                     .ok_or((MapToError::FrameAllocationFailed, page))?;
 
-                self.map_to_with_table_flags(
-                    page,
-                    frame,
-                    flags,
-                    parent_table_flags,
-                    frame_allocator,
-                )
+                unsafe {
+                    // SAFETY: frame was just freshly allocated and therefore can't cause aliasing issues
+                    self.map_to_with_table_flags(
+                        page,
+                        frame,
+                        flags,
+                        parent_table_flags,
+                        frame_allocator,
+                    )
+                }
                 .map(|_| ())
                 .map_err(|e| (e, page))
             })
@@ -429,16 +427,11 @@ pub trait Mapper<S: PageSize> {
 
     /// Maps frames from the allocator to the given range of virtual pages.
     ///
-    /// ## Safety
-    ///
-    /// This is a convencience function that invokes [`Mapper::map_range_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]
-    unsafe fn map_range<A>(
+    fn map_range<A>(
         &mut self,
         pages: PageRange<S>,
         flags: PageTableFlags,

src/structures/paging/mapper/offset_page_table.rs

@@ -98,7 +98,7 @@ impl<'a> Mapper<Size1GiB> for OffsetPageTable<'a> {
     }
 
     #[inline]
-    unsafe fn map_range_with_table_flags<A>(
+    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]
-    unsafe fn map_range_with_table_flags<A>(
+    fn map_range_with_table_flags<A>(
         &mut self,
         pages: PageRange<Size2MiB>,
         flags: PageTableFlags,
@@ -330,7 +330,7 @@ impl<'a> Mapper<Size4KiB> for OffsetPageTable<'a> {
     }
 
     #[inline]
-    unsafe fn map_range_with_table_flags<A>(
+    fn map_range_with_table_flags<A>(
         &mut self,
         pages: PageRange<Size4KiB>,
         flags: PageTableFlags,

src/structures/paging/mapper/recursive_page_table.rs

@@ -767,7 +767,7 @@ impl<'a> Mapper<Size1GiB> for RecursivePageTable<'a> {
     }
 
     #[inline]
-    unsafe fn map_range_with_table_flags<A>(
+    fn map_range_with_table_flags<A>(
         &mut self,
         pages: PageRange<Size1GiB>,
         flags: PageTableFlags,
@@ -983,7 +983,7 @@ impl<'a> Mapper<Size2MiB> for RecursivePageTable<'a> {
     }
 
     #[inline]
-    unsafe fn map_range_with_table_flags<A>(
+    fn map_range_with_table_flags<A>(
         &mut self,
         pages: PageRange<Size2MiB>,
         flags: PageTableFlags,
@@ -1234,7 +1234,7 @@ impl<'a> Mapper<Size4KiB> for RecursivePageTable<'a> {
     }
 
     #[inline]
-    unsafe fn map_range_with_table_flags<A>(
+    fn map_range_with_table_flags<A>(
         &mut self,
         pages: PageRange<Size4KiB>,
         flags: PageTableFlags,