[vmbase] Add page table parameters to vmbase for reuse
in both pvmfw and rialto.
Bug: 284462758
Test: m pvmfw_img
Change-Id: I389e538ec23b8775a39847ff1735b67fd45a6bb4
diff --git a/pvmfw/src/memory.rs b/pvmfw/src/memory.rs
index f259776..989120d 100644
--- a/pvmfw/src/memory.rs
+++ b/pvmfw/src/memory.rs
@@ -17,7 +17,6 @@
#![deny(unsafe_op_in_unsafe_fn)]
use crate::helpers::PVMFW_PAGE_SIZE;
-use aarch64_paging::idmap::IdMap;
use aarch64_paging::paging::{Attributes, Descriptor, MemoryRegion as VaRange};
use aarch64_paging::MapError;
use alloc::alloc::handle_alloc_error;
@@ -40,7 +39,7 @@
dsb, isb, layout,
memory::{
flush_dirty_range, is_leaf_pte, page_4kb_of, set_dbm_enabled, MemorySharer, PageTable,
- MMIO_LAZY_MAP_FLAG, SIZE_2MB, SIZE_4KB,
+ MMIO_LAZY_MAP_FLAG, PT_ASID, SIZE_2MB, SIZE_4KB,
},
tlbi,
util::{align_up, RangeExt as _},
@@ -49,9 +48,6 @@
/// First address that can't be translated by a level 1 TTBR0_EL1.
pub const MAX_ADDR: usize = 1 << 40;
-const PT_ROOT_LEVEL: usize = 1;
-const PT_ASID: usize = 1;
-
pub type MemoryRange = Range<usize>;
pub static MEMORY: SpinMutex<Option<MemoryTracker>> = SpinMutex::new(None);
@@ -520,7 +516,7 @@
}
pub fn init_page_table() -> result::Result<PageTable, MapError> {
- let mut page_table: PageTable = IdMap::new(PT_ASID, PT_ROOT_LEVEL).into();
+ let mut page_table = PageTable::default();
// Stack and scratch ranges are explicitly zeroed and flushed before jumping to payload,
// so dirty state management can be omitted.
diff --git a/rialto/src/main.rs b/rialto/src/main.rs
index 77044a2..bc5ab2c 100644
--- a/rialto/src/main.rs
+++ b/rialto/src/main.rs
@@ -23,7 +23,6 @@
extern crate alloc;
use crate::error::{Error, Result};
-use aarch64_paging::idmap::IdMap;
use buddy_system_allocator::LockedHeap;
use core::slice;
use fdtpci::PciInfo;
@@ -40,11 +39,6 @@
const SZ_1M: usize = 1024 * SZ_1K;
const SZ_1G: usize = 1024 * SZ_1M;
-// Root level is given by the value of TCR_EL1.TG0 and TCR_EL1.T0SZ, set in
-// entry.S. For 4KB granule and 39-bit VA, the root level is 1.
-const PT_ROOT_LEVEL: usize = 1;
-const PT_ASID: usize = 1;
-
#[global_allocator]
static HEAP_ALLOCATOR: LockedHeap<32> = LockedHeap::<32>::new();
@@ -58,7 +52,7 @@
}
fn init_page_table() -> Result<()> {
- let mut page_table: PageTable = IdMap::new(PT_ASID, PT_ROOT_LEVEL).into();
+ let mut page_table = PageTable::default();
// The first 1 GiB of address space is used by crosvm for MMIO.
page_table.map_device(&(0..SZ_1G))?;
diff --git a/vmbase/src/memory/mod.rs b/vmbase/src/memory/mod.rs
index 13f1af5..bb9149c 100644
--- a/vmbase/src/memory/mod.rs
+++ b/vmbase/src/memory/mod.rs
@@ -20,7 +20,7 @@
mod util;
pub use dbm::{flush_dirty_range, set_dbm_enabled};
-pub use page_table::{is_leaf_pte, PageTable, MMIO_LAZY_MAP_FLAG};
+pub use page_table::{is_leaf_pte, PageTable, MMIO_LAZY_MAP_FLAG, PT_ASID};
pub use shared::MemorySharer;
pub use util::{
flush, flushed_zeroize, min_dcache_line_size, page_4kb_of, phys_to_virt, virt_to_phys,
diff --git a/vmbase/src/memory/page_table.rs b/vmbase/src/memory/page_table.rs
index d3564b6..1a9d0f8 100644
--- a/vmbase/src/memory/page_table.rs
+++ b/vmbase/src/memory/page_table.rs
@@ -35,6 +35,12 @@
const RODATA: Attributes = DATA.union(Attributes::READ_ONLY);
const DATA_DBM: Attributes = RODATA.union(Attributes::DBM);
+/// Root level is given by the value of TCR_EL1.TG0 and TCR_EL1.T0SZ, set in
+/// entry.S. For 4KB granule and 39-bit VA, the root level is 1.
+const PT_ROOT_LEVEL: usize = 1;
+/// Page table ASID.
+pub const PT_ASID: usize = 1;
+
type Result<T> = result::Result<T, MapError>;
/// High-level API for managing MMU mappings.
@@ -48,6 +54,12 @@
}
}
+impl Default for PageTable {
+ fn default() -> Self {
+ IdMap::new(PT_ASID, PT_ROOT_LEVEL).into()
+ }
+}
+
impl PageTable {
/// Activates the page table.
///