Merge branch 'coconut-svsm:main' into main

Author: stefano-garzarella

Cargo.lock

@@ -39,6 +39,8 @@ members = [
     "tools/cbit",
 ]
 
+[workspace.package]
+edition = "2024"
 
 [workspace.dependencies]
 # internal library crates
@@ -79,6 +81,7 @@ kbs-types = { version = "0.14.0", default-features = false }
 libfuzzer-sys = "0.4"
 log = "0.4.17"
 p384 = { version = "0.13.0" }
+rustc-demangle = { version = "0.1.26" }
 serde = { version = "1.0.215", default-features = false }
 serde_json = { version = "1.0", default-features = false }
 sha2 = { version = "0.10.8", default-features = false }

Cargo.toml

@@ -39,7 +39,7 @@ Coding Style
 Submitted changes must be checked with ```rustfmt``` before submitting
 and submitted code must not introduce new warnings in the build process.
 
-Make sure to format the code according to Rust edition 2021. There is a
+Make sure to format the code according to Rust edition 2024. There is a
 git-hook in the scripts directory which checks any changes with rustfmt
 before allowing them to be committed. It can be installed by running
 

Documentation/docs/developer/CONTRIBUTING.md

@@ -4,7 +4,7 @@ SVSM_ARGS += --features ${FEATURES}
 XBUILD_ARGS += -f ${FEATURES}
 endif
 
-FEATURES_TEST ?= vtpm,virtio-drivers
+FEATURES_TEST ?= vtpm,virtio-drivers,block
 SVSM_ARGS_TEST += --no-default-features
 ifneq ($(FEATURES_TEST),)
 SVSM_ARGS_TEST += --features ${FEATURES_TEST}
@@ -20,8 +20,10 @@ ifdef RELEASE
 TARGET_PATH=release
 CARGO_ARGS += --release
 XBUILD_ARGS += --release
+OBJCOPY_ELF_ARGS := --strip-unneeded
 else
 TARGET_PATH=debug
+OBJCOPY_ELF_ARGS := --strip-debug
 endif
 
 ifdef OFFLINE
@@ -145,7 +147,7 @@ bin/stage2.bin: bin
 
 bin/svsm-kernel.elf: bin
 	cargo build --package svsm --bin svsm ${CARGO_ARGS} ${SVSM_ARGS} --target=x86_64-unknown-none
-	objcopy -O elf64-x86-64 --strip-unneeded ${SVSM_KERNEL_ELF} $@
+	objcopy -O elf64-x86-64 ${OBJCOPY_ELF_ARGS} ${SVSM_KERNEL_ELF} $@
 
 bin/test-kernel.elf: bin
 # RUSTDOC=true removes doctests, which is necessary as they do not work with

Makefile

@@ -1,7 +1,7 @@
 [package]
 name = "bootlib"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 
 [dependencies]
 uuid.workspace = true

bootlib/Cargo.toml

@@ -2,7 +2,7 @@
 //
 // Author: Carlos López <carlos.lopezr4096@gmail.com>
 
-use uuid::{uuid, Uuid};
+use uuid::{Uuid, uuid};
 
 pub const OVMF_RESET_VECTOR_GUID: Uuid = uuid!("813d7b2c-9558-4d88-8b31-1427a85abe69");
 pub const OVMF_SEV_METADATA_GUID: Uuid = uuid!("dc886566-984a-4798-a75e-5585a7bf67cc");

bootlib/src/firmware.rs

@@ -4,13 +4,16 @@
 //
 // Author: Joerg Roedel <jroedel@suse.de>
 
-use crate::platform::SvsmPlatformType;
+use crate::{platform::SvsmPlatformType, symbols::KSym};
 use core::mem::size_of;
 use zerocopy::{FromBytes, Immutable, IntoBytes};
 
 // The SIPI stub is placed immediately below the stage 2 heap.
 pub const SIPI_STUB_GPA: u32 = 0xF000;
 
+// Two pages below the SIPI stub are used for low memory page tables.
+pub const SIPI_STUB_PT_GPA: u32 = 0xD000;
+
 // The first 640 KB of RAM (low memory)
 pub const LOWMEM_END: u32 = 0xA0000;
 
@@ -39,18 +42,18 @@ pub struct KernelLaunchInfo {
     pub heap_area_allocated: u64,
     pub kernel_region_virt_start: u64,
     pub heap_area_virt_start: u64, // Start of virtual heap area mapping.
-    pub kernel_elf_stage2_virt_start: u64, // Virtual address of kernel ELF in Stage2 mapping.
-    pub kernel_elf_stage2_virt_end: u64,
     pub kernel_fs_start: u64,
     pub kernel_fs_end: u64,
     pub stage2_start: u64,
-    pub stage2_end: u64,
     pub cpuid_page: u64,
     pub secrets_page: u64,
-    pub stage2_igvm_params_phys_addr: u64,
-    pub stage2_igvm_params_size: u64,
     pub igvm_params_virt_addr: u64,
+    pub kernel_symtab_start: *const KSym,
+    pub kernel_symtab_len: u64,
+    pub kernel_strtab_start: *const u8,
+    pub kernel_strtab_len: u64,
     pub vtom: u64,
+    pub kernel_page_table_vaddr: u64,
     pub debug_serial_port: u16,
     pub use_alternate_injection: bool,
     pub suppress_svsm_interrupts: bool,

bootlib/src/kernel_launch.rs

@@ -14,3 +14,4 @@ pub mod firmware;
 pub mod igvm_params;
 pub mod kernel_launch;
 pub mod platform;
+pub mod symbols;

bootlib/src/lib.rs

@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+//
+// Copyright (c) 2026 SUSE LLC
+//
+// Author: Carlos López <clopez@suse.de>
+
+use zerocopy::{FromBytes, Immutable, IntoBytes};
+
+/// A smaller version of `Elf64Sym`.
+///
+/// Defines the format of the symbol information passed to the SVSM kernel to be
+/// able to perform address to symbol resolution.
+#[repr(C)]
+#[derive(Clone, Copy, Debug, IntoBytes, Immutable, FromBytes)]
+pub struct KSym {
+    /// The starting address of the symbol.
+    pub addr: usize,
+    /// The span of the symbol in the address space.
+    pub size: u32,
+    /// The name of the symbol, as an index into the `strtab`.
+    pub name: u32,
+}
+
+impl KSym {
+    pub const fn new(addr: usize, size: u32, name: u32) -> Self {
+        Self { addr, size, name }
+    }
+
+    /// Checks whether a given address falls within the span of this symbol.
+    pub const fn contains(&self, addr: usize) -> bool {
+        let end = self.addr + self.size as usize;
+        self.addr <= addr && addr < end
+    }
+}

bootlib/src/symbols.rs

@@ -1,7 +1,7 @@
 [package]
 name = "cpuarch"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 
 [dependencies]
 bitfield-struct.workspace = true