vmbase: Enter clients with dynamic PTs live
The layout and linker sections of clients are controlled by a linker
script provided by vmbase so the library should know how to replicate
the client-specific static PTs to generate the dynamic PTs. Therefore,
teach vmbase to use the information it gets from the linker to replicate
the client static PTs, with client-agnostic code, and switch to the
dynamic PTs before entering its clients.
Bug: 377276983
Test: m {pvmfw,rialto,vmbase_example_{bios,kernel}}_bin
Test: atest rialto_test vmbase_example.integration_test
Change-Id: I90fa0e62e6e4cb8474f3294633cee775b1191c71
diff --git a/guest/rialto/src/main.rs b/guest/rialto/src/main.rs
index 8f5a670..04d18be 100644
--- a/guest/rialto/src/main.rs
+++ b/guest/rialto/src/main.rs
@@ -46,11 +46,11 @@
fdt::pci::PciInfo,
fdt::SwiotlbInfo,
generate_image_header,
- layout::{self, crosvm},
+ layout::crosvm,
main,
memory::{
init_shared_pool, map_rodata, map_rodata_outside_main_memory, resize_available_memory,
- switch_to_dynamic_page_tables, PageTable, SIZE_128KB,
+ SIZE_128KB,
},
power::reboot,
virtio::{
@@ -71,28 +71,12 @@
}
}
-fn new_page_table() -> Result<PageTable> {
- let mut page_table = PageTable::default();
-
- page_table.map_data(&layout::data_bss_range().into())?;
- page_table.map_data(&layout::eh_stack_range().into())?;
- page_table.map_data(&layout::stack_range().into())?;
- page_table.map_code(&layout::text_range().into())?;
- page_table.map_rodata(&layout::rodata_range().into())?;
- page_table.map_device(&layout::console_uart_page().into())?;
-
- Ok(page_table)
-}
-
/// # Safety
///
/// Behavior is undefined if any of the following conditions are violated:
/// * The `fdt_addr` must be a valid pointer and points to a valid `Fdt`.
unsafe fn try_main(fdt_addr: usize) -> Result<()> {
info!("Welcome to Rialto!");
- let page_table = new_page_table()?;
-
- switch_to_dynamic_page_tables(page_table);
let fdt_size = NonZeroUsize::new(crosvm::FDT_MAX_SIZE).unwrap();
map_rodata(fdt_addr, fdt_size)?;