Merge remote-tracking branch 'origin/aarch64-rebase' into riscv64

src/context/memory.rs

@@ -15,7 +15,7 @@ use crate::arch::paging::PAGE_SIZE;
 use crate::context::file::FileDescriptor;
 use crate::ipi::{ipi, IpiKind, IpiTarget};
 use crate::memory::Frame;
-use crate::paging::{ActivePageTable, InactivePageTable, Page, PageFlags, PageIter, PhysicalAddress, RmmA, VirtualAddress};
+use crate::paging::{ActivePageTable, InactivePageTable, Page, PageFlags, PageTableType, PageIter, PhysicalAddress, RmmA, VirtualAddress};
 use crate::paging::mapper::PageFlushAll;
 use crate::paging::temporary_page::TemporaryPage;
 
@@ -303,7 +303,10 @@ impl Grant {
     }
 
     pub fn physmap(from: PhysicalAddress, to: VirtualAddress, size: usize, flags: PageFlags<RmmA>) -> Grant {
-        let mut active_table = unsafe { ActivePageTable::new() };
+        let mut active_table = match to.get_type() {
+            VirtualAddressType::User => unsafe { ActivePageTable::new(PageTableType::User) },
+            VirtualAddressType::Kernel => unsafe { ActivePageTable::new(PageTableType::Kernel) }
+        };
 
         let flush_all = PageFlushAll::new();
 
@@ -330,7 +333,10 @@ impl Grant {
     }
 
     pub fn map(to: VirtualAddress, size: usize, flags: PageFlags<RmmA>) -> Grant {
-        let mut active_table = unsafe { ActivePageTable::new() };
+        let mut active_table = match to.get_type() {
+            VirtualAddressType::User => unsafe { ActivePageTable::new(PageTableType::User) },
+            VirtualAddressType::Kernel => unsafe { ActivePageTable::new(PageTableType::Kernel) }
+        };
 
         let flush_all = PageFlushAll::new();
 
@@ -356,7 +362,10 @@ impl Grant {
     }
 
     pub fn map_inactive(from: VirtualAddress, to: VirtualAddress, size: usize, flags: PageFlags<RmmA>, desc_opt: Option<FileDescriptor>, new_table: &mut InactivePageTable, temporary_page: &mut TemporaryPage) -> Grant {
-        let mut active_table = unsafe { ActivePageTable::new() };
+        let mut active_table = match from.get_type() {
+            VirtualAddressType::User => unsafe { ActivePageTable::new(PageTableType::User) },
+            VirtualAddressType::Kernel => unsafe { ActivePageTable::new(PageTableType::Kernel) }
+        };
 
         //TODO: Do not allocate
         let mut frames = VecDeque::with_capacity(size/PAGE_SIZE);
@@ -368,6 +377,11 @@ impl Grant {
             frames.push_back(frame);
         }
 
+        let mut active_table = match to.get_type() {
+            VirtualAddressType::User => unsafe { ActivePageTable::new(PageTableType::User) },
+            VirtualAddressType::Kernel => unsafe { ActivePageTable::new(PageTableType::Kernel) }
+        };
+
         active_table.with(new_table, temporary_page, |mapper| {
             let start_page = Page::containing_address(to);
             let end_page = Page::containing_address(VirtualAddress::new(to.data() + size - 1));
@@ -397,7 +411,10 @@ impl Grant {
     pub fn secret_clone(&self, new_start: VirtualAddress) -> Grant {
         assert!(self.mapped);
 
-        let mut active_table = unsafe { ActivePageTable::new() };
+        let mut active_table = match new_start.get_type() {
+            VirtualAddressType::User => unsafe { ActivePageTable::new(PageTableType::User) },
+            VirtualAddressType::Kernel => unsafe { ActivePageTable::new(PageTableType::Kernel) }
+        };
 
         let flush_all = PageFlushAll::new();
 
@@ -454,7 +471,10 @@ impl Grant {
     pub fn move_to(&mut self, new_start: VirtualAddress, new_table: &mut InactivePageTable, temporary_page: &mut TemporaryPage) {
         assert!(self.mapped);
 
-        let mut active_table = unsafe { ActivePageTable::new() };
+        let mut active_table = match new_start.get_type() {
+            VirtualAddressType::User => unsafe { ActivePageTable::new(PageTableType::User) },
+            VirtualAddressType::Kernel => unsafe { ActivePageTable::new(PageTableType::Kernel) }
+        };
 
         let flush_all = PageFlushAll::new();
 
@@ -490,7 +510,11 @@ impl Grant {
     pub fn unmap(mut self) {
         assert!(self.mapped);
 
-        let mut active_table = unsafe { ActivePageTable::new() };
+        let mut active_table = match self.start_address().get_type() {
+            VirtualAddressType::User => unsafe { ActivePageTable::new(PageTableType::User) },
+            VirtualAddressType::Kernel => unsafe { ActivePageTable::new(PageTableType::Kernel) }
+        };
+
 
         let flush_all = PageFlushAll::new();
 
@@ -519,7 +543,10 @@ impl Grant {
     pub fn unmap_inactive(mut self, new_table: &mut InactivePageTable, temporary_page: &mut TemporaryPage) {
         assert!(self.mapped);
 
-        let mut active_table = unsafe { ActivePageTable::new() };
+        let mut active_table = match self.start_address().get_type() {
+            VirtualAddressType::User => unsafe { ActivePageTable::new(PageTableType::User) },
+            VirtualAddressType::Kernel => unsafe { ActivePageTable::new(PageTableType::Kernel) }
+        };
 
         active_table.with(new_table, temporary_page, |mapper| {
             let start_page = Page::containing_address(self.start_address());
@@ -694,7 +721,10 @@ impl Memory {
     }
 
     fn map(&mut self, clear: bool) {
-        let mut active_table = unsafe { ActivePageTable::new() };
+        let mut active_table = match self.start.get_type() {
+            VirtualAddressType::User => unsafe { ActivePageTable::new(PageTableType::User) },
+            VirtualAddressType::Kernel => unsafe { ActivePageTable::new(PageTableType::Kernel) }
+        };
 
         let flush_all = PageFlushAll::new();
 
@@ -714,7 +744,10 @@ impl Memory {
     }
 
     fn unmap(&mut self) {
-        let mut active_table = unsafe { ActivePageTable::new() };
+        let mut active_table = match self.start.get_type() {
+            VirtualAddressType::User => unsafe { ActivePageTable::new(PageTableType::User) },
+            VirtualAddressType::Kernel => unsafe { ActivePageTable::new(PageTableType::Kernel) }
+        };
 
         let flush_all = PageFlushAll::new();
 
@@ -729,7 +762,10 @@ impl Memory {
     /// A complicated operation to move a piece of memory to a new page table
     /// It also allows for changing the address at the same time
     pub fn move_to(&mut self, new_start: VirtualAddress, new_table: &mut InactivePageTable, temporary_page: &mut TemporaryPage) {
-        let mut active_table = unsafe { ActivePageTable::new() };
+        let mut active_table = match new_start.get_type() {
+            VirtualAddressType::User => unsafe { ActivePageTable::new(PageTableType::User) },
+            VirtualAddressType::Kernel => unsafe { ActivePageTable::new(PageTableType::Kernel) }
+        };
 
         let flush_all = PageFlushAll::new();
 
@@ -751,7 +787,10 @@ impl Memory {
     }
 
     pub fn remap(&mut self, new_flags: PageFlags<RmmA>) {
-        let mut active_table = unsafe { ActivePageTable::new() };
+        let mut active_table = match self.start.get_type() {
+            VirtualAddressType::User => unsafe { ActivePageTable::new(PageTableType::User) },
+            VirtualAddressType::Kernel => unsafe { ActivePageTable::new(PageTableType::Kernel) }
+        };
 
         let flush_all = PageFlushAll::new();
 
@@ -766,7 +805,10 @@ impl Memory {
     }
 
     pub fn resize(&mut self, new_size: usize, clear: bool) {
-        let mut active_table = unsafe { ActivePageTable::new() };
+        let mut active_table = match self.start.get_type() {
+            VirtualAddressType::User => unsafe { ActivePageTable::new(PageTableType::User) },
+            VirtualAddressType::Kernel => unsafe { ActivePageTable::new(PageTableType::Kernel) }
+        };
 
         //TODO: Calculate page changes to minimize operations
         if new_size > self.size {