Skip to content

Commit 0b2d005

Browse files
committed
Progress on page allocator verification
Signed-off-by: Lennard Gäher <[email protected]>
1 parent b831232 commit 0b2d005

File tree

76 files changed

+3019
-483
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+3019
-483
lines changed

confidential-vms/linux_vm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ LINUX_VM_ROOTFS_SOURCE_DIR ?= $(CONFIDENTIAL_VMS_LINUX_SOURCE_DIR)/hypervisor_
1414
LINUX_VM_BUILDROOT_SOURCE_DIR ?= $(CONFIDENTIAL_VMS_LINUX_SOURCE_DIR)/../../hypervisor/buildroot
1515
LINUX_VM_BUILDROOT_WORK_DIR ?= $(CONFIDENTIAL_VMS_LINUX_WORK_DIR)/buildroot
1616
LINUX_VM_BUILDROOT_ROOTFS ?= $(LINUX_VM_BUILDROOT_WORK_DIR)/images/rootfs.ext2
17-
LINUX_VM_BUILDROOT_ROOTFS_SIZE ?= "256M"
17+
LINUX_VM_BUILDROOT_ROOTFS_SIZE ?= "128M"
1818
LINUX_VM_OVERLAY_SOURCE_DIR ?= $(CONFIDENTIAL_VMS_LINUX_SOURCE_DIR)/overlay
1919
LINUX_VM_OVERLAY_WORK_DIR ?= $(CONFIDENTIAL_VMS_LINUX_WORK_DIR)/overlay
2020
LINUX_VM_OVERLAY_WORK_ROOT_DIR ?= $(LINUX_VM_OVERLAY_WORK_DIR)/root

confidential-vms/linux_vm/configurations/qemu_riscv64_virt_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ BR2_TARGET_ROOTFS_EXT2=y
3434
BR2_TARGET_ROOTFS_EXT2_2=n
3535
BR2_TARGET_ROOTFS_EXT2_3=n
3636
BR2_TARGET_ROOTFS_EXT2_4=y
37-
BR2_TARGET_ROOTFS_EXT2_SIZE="5G"
37+
BR2_TARGET_ROOTFS_EXT2_SIZE="1G"
3838

3939
# Kernel
4040
BR2_LINUX_KERNEL=y

hypervisor/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ BUILDROOT_SOURCE_DIR ?= $(MAKEFILE_SOURCE_DIR)/buildroot
1414
HYPERVISOR_BUILDROOT_CONFIG_DIR ?= $(HYPERVISOR_CONFIGURATION_DIR)/qemu_riscv64_virt_defconfig
1515
HYPERVISOR_LINUX_CONFIG ?= $(HYPERVISOR_CONFIGURATION_DIR)/linux64-defconfig
1616
HYPERVISOR_BUILDROOT_OVERRIDE_DIR ?= $(HYPERVISOR_CONFIGURATION_DIR)/package_override.dev
17-
HYPERVISOR_ROOTFS_SIZE ?= "1G"
17+
HYPERVISOR_ROOTFS_SIZE ?= "512M"
1818
HYPERVISOR_OVERLAY_DIR ?= $(HYPERVISOR_WORK_DIR)/overlay
1919
HYPERVISOR_OVERLAY_ROOT_DIR ?= $(HYPERVISOR_OVERLAY_DIR)/root
2020
HYPERVISOR_PATCHES_DIR ?= $(MAKEFILE_SOURCE_DIR)/patches

security-monitor/src/confidential_flow/handlers/shutdown/shutdown_vm.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use crate::core::control_data::{ConfidentialHart, ConfidentialHartRemoteCommand,
1414
/// shutdown (lifecycle state `Shutdown`). To do so, we send `Shutdown IPI` to all confidential harts. The last
1515
/// confidential hart that shutdowns itself, will remove the entire confidential VM from the control data.
1616
#[derive(Clone, PartialEq)]
17+
#[rr::skip]
1718
pub struct ShutdownRequest {
1819
calling_hart_id: usize,
1920
}

security-monitor/src/confidential_flow/handlers/symmetrical_multiprocessing/fence_i.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use crate::core::control_data::{
1010

1111
/// Handles a request from one confidential hart to execute fence.i instruction on remote confidential harts.
1212
#[derive(Clone, PartialEq)]
13+
#[rr::skip]
1314
pub struct RemoteFenceI {
1415
ipi: Ipi,
1516
}

security-monitor/src/confidential_flow/handlers/symmetrical_multiprocessing/hfence_gvma_vmid.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use crate::core::memory_layout::ConfidentialVmPhysicalAddress;
88

99
/// An inter hart request sent by the security monitor to clear G-stage level cached address translations.
1010
#[derive(Clone, PartialEq)]
11+
#[rr::skip]
1112
pub struct RemoteHfenceGvmaVmid {
1213
ipi: Ipi,
1314
_start_address: Option<ConfidentialVmPhysicalAddress>,

security-monitor/src/confidential_flow/handlers/symmetrical_multiprocessing/ipi.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use crate::core::control_data::{
1010

1111
/// Handles a request from one confidential hart to execute IPI on other confidential harts.
1212
#[derive(PartialEq, Debug, Clone)]
13+
#[rr::skip]
1314
pub struct Ipi {
1415
hart_mask: usize,
1516
hart_mask_base: usize,

security-monitor/src/confidential_flow/handlers/symmetrical_multiprocessing/sfence_vma.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use crate::core::control_data::{
1111

1212
/// Handles a request from one confidential hart to execute sfence.vma instruction on remote confidential harts.
1313
#[derive(Clone, PartialEq)]
14+
#[rr::skip]
1415
pub struct RemoteSfenceVma {
1516
ipi: Ipi,
1617
_start_address: usize,

security-monitor/src/confidential_flow/handlers/symmetrical_multiprocessing/sfence_vma_asid.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ use crate::core::control_data::{
1212
/// Handles a request from one confidential hart to execute sfence.vma instruction on remote confidential harts. It represents an inter hart
1313
/// request.
1414
#[derive(Clone, PartialEq)]
15+
#[rr::skip]
1516
pub struct RemoteSfenceVmaAsid {
1617
ipi: Ipi,
1718
_start_address: usize,

security-monitor/src/core/architecture/riscv/control_status_registers.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ pub const CSR: &ControlStatusRegister = &ControlStatusRegister {
314314
};
315315

316316
#[derive(Copy, Clone)]
317+
#[rr::skip]
317318
pub struct ReadWriteRiscvCsr<const V: u16>(usize);
318319

319320
impl<const V: u16> ReadWriteRiscvCsr<V> {

0 commit comments

Comments
 (0)