refactor: use PVH StartInfoReader

Signed-off-by: Martin Kröning <martin.kroening@eonerc.rwth-aachen.de>

Author: mkroening

Cargo.toml

@@ -39,7 +39,7 @@ fdt = "0.1.5"
 chrono = { version = "0.4", default-features = false }
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
-pvh = { version = "0.1", default-features = false, features = ["elfnote"] }
+pvh = "0.1"
 uart_16550 = "0.4.0"
 x86_64 = { version = "0.15.4", default-features = false, features = [
     "instructions",

src/common.rs

@@ -15,21 +15,6 @@ macro_rules! container_of_mut {
     }};
 }
 
-// SAFETY: Requires that addr point to a static, null-terminated C-string.
-// The returned slice does not include the null-terminator.
-#[cfg(all(target_arch = "x86_64", not(feature = "coreboot")))]
-pub unsafe fn from_cstring(addr: u64) -> &'static [u8] {
-    if addr == 0 {
-        return &[];
-    }
-    let start = addr as *const u8;
-    let mut size: usize = 0;
-    while start.add(size).read() != 0 {
-        size += 1;
-    }
-    core::slice::from_raw_parts(start, size)
-}
-
 pub fn ascii_strip(s: &[u8]) -> &str {
     core::str::from_utf8(s).unwrap().trim_matches(char::from(0))
 }

src/main.rs

@@ -179,22 +179,22 @@ fn boot_from_device(
 
 #[cfg(target_arch = "x86_64")]
 #[no_mangle]
-pub extern "C" fn rust64_start(
-    #[cfg(not(feature = "coreboot"))] pvh_info: &::pvh::start_info::StartInfo,
-) -> ! {
+pub extern "C" fn rust64_start(#[cfg(not(feature = "coreboot"))] start_info_paddr: u32) -> ! {
     serial::PORT.borrow_mut().init();
     logger::init();
 
     arch::x86_64::sse::enable_sse();
     arch::x86_64::paging::setup();
 
     #[cfg(feature = "coreboot")]
-    let info = &coreboot::StartInfo::default();
+    let info = coreboot::StartInfo::default();
 
     #[cfg(not(feature = "coreboot"))]
-    let info = pvh_info;
+    let info = unsafe {
+        ::pvh::start_info::reader::StartInfoReader::from_paddr_identity(start_info_paddr).unwrap()
+    };
 
-    main(info)
+    main(&info)
 }
 
 #[cfg(target_arch = "aarch64")]

src/pvh.rs

@@ -1,11 +1,13 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2020 Google LLC
 
-use pvh::start_info::{MemmapTableEntry, StartInfo};
+use pvh::start_info::{
+    reader::{MemMap, StartInfoReader},
+    MemmapTableEntry,
+};
 
 use crate::{
     bootinfo::{EntryType, Info, MemoryEntry},
-    common,
     layout::MemoryDescriptor,
 };
 
@@ -19,27 +21,21 @@ impl From<MemmapTableEntry> for MemoryEntry {
     }
 }
 
-impl Info for StartInfo {
+impl<M: MemMap> Info for StartInfoReader<'_, M> {
     fn name(&self) -> &str {
         "PVH Boot Protocol"
     }
     fn rsdp_addr(&self) -> Option<u64> {
-        Some(self.rsdp_paddr)
+        Some(self.raw().rsdp_paddr)
     }
     fn cmdline(&self) -> &[u8] {
-        unsafe { common::from_cstring(self.cmdline_paddr) }
+        self.cmdline().unwrap_or_default().to_bytes()
     }
     fn num_entries(&self) -> usize {
-        // memmap_paddr and memmap_entries only exist in version 1 or later
-        if self.version < 1 || self.memmap_paddr == 0 {
-            return 0;
-        }
-        self.memmap_entries as usize
+        self.memmap().len()
     }
     fn entry(&self, idx: usize) -> MemoryEntry {
-        assert!(idx < self.num_entries());
-        let ptr = self.memmap_paddr as *const MemmapTableEntry;
-        let entry = unsafe { *ptr.add(idx) };
+        let entry = self.memmap()[idx];
         MemoryEntry::from(entry)
     }
     fn kernel_load_addr(&self) -> u64 {