-
Notifications
You must be signed in to change notification settings - Fork 128
feat(opentmk): opentmk framework with first testcase #1210
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
6d32033
351199b
3e1673e
056bf7d
6d37a84
53e0da2
7eb38ff
2d2aec4
4cd03a5
bb22270
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,6 +42,9 @@ members = [ | |
"vm/loader/igvmfilegen", | ||
"vm/vmgs/vmgs_lib", | ||
"vm/vmgs/vmgstool", | ||
# opentmk | ||
"opentmk/opentmk", | ||
"opentmk/sync" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If something is a dependency below it shouldn't be a member, members only needs to be top-level crates. |
||
] | ||
exclude = [ | ||
"xsync", | ||
|
@@ -374,6 +377,9 @@ vnc_worker_defs = { path = "workers/vnc_worker_defs" } | |
vnc = { path = "workers/vnc_worker/vnc" } | ||
profiler_worker = { path = "openhcl/profiler_worker" } | ||
|
||
# opentmk | ||
sync_nostd = { path = "opentmk/sync"} | ||
|
||
# crates.io | ||
anyhow = "1.0" | ||
arbitrary = "1.3" | ||
|
@@ -445,9 +451,11 @@ jiff = "0.1" | |
kvm-bindings = "0.7" | ||
# Use of these specific REPO will go away when changes are taken upstream. | ||
landlock = "0.3.1" | ||
lazy_static = { version = "1.4.0", features = ["spin_no_std"] } | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't specify features in the workspace-level Cargo.toml, since that applies them to every crate whether they want them or not. Move it into the specific crates' Cargo.tomls that need it. |
||
libc = "0.2" | ||
libfuzzer-sys = "0.4" | ||
libtest-mimic = "0.8" | ||
linked_list_allocator = "0.10.5" | ||
linkme = "0.3.9" | ||
log = "0.4" | ||
macaddr = "1.0" | ||
|
@@ -493,6 +501,7 @@ smallbox = "0.8" | |
smallvec = "1.8" | ||
smoltcp = { version = "0.8", default-features = false } | ||
socket2 = "0.5" | ||
spin = "0.10.0" | ||
stackfuture = "0.3" | ||
static_assertions = "1.1" | ||
syn = "2" | ||
|
@@ -520,6 +529,7 @@ winapi = "0.3" | |
windows = "0.59" | ||
windows-service = "0.7" | ||
windows-sys = "0.52" | ||
x86_64 = "0.15.2" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. How much functionality from x86_64 are we using? How difficult of a lift would it be to fill in things like x86defs and safe_intrinsics, or just call intrinsics directly? |
||
xshell = "=0.2.2" # pin to 0.2.2 to work around https://github.com/matklad/xshell/issues/63 | ||
xshell-macros = "0.2" | ||
# We add the derive feature here since the vast majority of our crates use it. | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
# Copyright (c) Microsoft Corporation. | ||
# Licensed under the MIT License. | ||
|
||
[package] | ||
name = "opentmk" | ||
edition.workspace = true | ||
rust-version.workspace = true | ||
|
||
[dependencies] | ||
arrayvec.workspace = true | ||
bitfield-struct.workspace = true | ||
cfg-if.workspace = true | ||
hvdef = {workspace = true} | ||
lazy_static.workspace = true | ||
linked_list_allocator.workspace = true | ||
log.workspace = true | ||
memory_range.workspace = true | ||
minimal_rt.workspace = true | ||
serde = { version = "1.0", default-features = false, features = ["derive"]} | ||
serde_json = { version = "1.0", default-features = false, features = ["alloc"] } | ||
uefi = { workspace = true, features = ["alloc"] } | ||
x86_64.workspace = true | ||
x86defs.workspace = true | ||
zerocopy.workspace = true | ||
sync_nostd.workspace = true | ||
|
||
[lints] | ||
workspace = true | ||
|
||
[build-dependencies] | ||
minimal_rt_build.workspace = true | ||
|
||
[profile.release] | ||
debug = false | ||
strip = "debuginfo" | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# OpenTMK | ||
|
||
See the guide for more info on how to build/run the code in this crate. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just delete this file then, it's not adding any value if all the documentation is in the guide. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
RUST_BACKTRACE=1 cargo build -p opentmk --target x86_64-unknown-uefi | ||
cargo xtask guest-test uefi --bootx64 ./target/x86_64-unknown-uefi/debug/opentmk.efi | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This script needs to move into its own xtask command, probably a new |
||
qemu-img convert -f raw -O vhdx ./target/x86_64-unknown-uefi/debug/opentmk.img ~/projects/opentmk.vhdx | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we need to convert to a vhdx? What's the intersection of formats that hyper-v and openvmm support booting from? Ideally we'd have one that doesn't require an external dependency like this to create. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
// Copyright (c) Microsoft Corporation. | ||
// Licensed under the MIT License. | ||
|
||
/// Writes a synthehtic register to tell the hypervisor the OS ID for the boot shim. | ||
fn report_os_id(guest_os_id: u64) { | ||
// On ARM64, to be able to make hypercalls, one needs first to set the Guest OS ID | ||
// synthetic register using a hypercall. Can't use `Hvcall::set_register` at that will | ||
// lead to the infinite recursion as that function will first try initializing hypercalls | ||
// with setting a register. | ||
// | ||
// Only one very specific HvSetVpRegisters hypercall is allowed to set the Guest OS ID | ||
// (this is TLFS section 17.4.4.1.1 and 5.3), and that must be the fast hypercall. | ||
let _ = minimal_rt::arch::hypercall::set_register_fast( | ||
hvdef::HvArm64RegisterName::GuestOsId.into(), | ||
guest_os_id.into(), | ||
); | ||
} | ||
|
||
pub(crate) fn initialize(guest_os_id: u64) { | ||
// We are assuming we are running under a Microsoft hypervisor. | ||
report_os_id(guest_os_id); | ||
} | ||
|
||
/// Call before jumping to kernel. | ||
pub(crate) fn uninitialize() { | ||
report_os_id(0); | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
pub use minimal_rt::arch::aarch64::serial; | ||
|
||
pub mod hypercall; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
// Copyright (c) Microsoft Corporation. | ||
// Licensed under the MIT License. | ||
|
||
//! Imports and re-exports architecture-specific implementations. | ||
|
||
mod x86_64; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this not building the arm code currently? |
||
|
||
cfg_if::cfg_if!( | ||
if #[cfg(target_arch = "x86_64")] { | ||
pub use x86_64::*; | ||
} else if #[cfg(target_arch = "aarch64")] { | ||
pub use aarch64::*; | ||
} else { | ||
compile_error!("target_arch is not supported"); | ||
} | ||
); |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
// Copyright (c) Microsoft Corporation. | ||
// Licensed under the MIT License. | ||
|
||
use core::ptr::addr_of; | ||
use hvdef::HV_PAGE_SIZE; | ||
use minimal_rt::arch::hypercall::HYPERCALL_PAGE; | ||
use minimal_rt::arch::msr::read_msr; | ||
use minimal_rt::arch::msr::write_msr; | ||
#[expect(unsafe_code)] | ||
/// Writes an MSR to tell the hypervisor the OS ID for the boot shim. | ||
fn report_os_id(guest_os_id: u64) { | ||
// SAFETY: Using the contract established in the Hyper-V TLFS. | ||
unsafe { | ||
write_msr(hvdef::HV_X64_MSR_GUEST_OS_ID, guest_os_id); | ||
}; | ||
} | ||
|
||
#[expect(unsafe_code)] | ||
/// Writes an MSR to tell the hypervisor where the hypercall page is | ||
pub fn write_hypercall_msr(enable: bool) { | ||
// SAFETY: Using the contract established in the Hyper-V TLFS. | ||
let hypercall_contents = hvdef::hypercall::MsrHypercallContents::from(unsafe { | ||
read_msr(hvdef::HV_X64_MSR_HYPERCALL) | ||
}); | ||
|
||
let hypercall_page_num = addr_of!(HYPERCALL_PAGE) as u64 / HV_PAGE_SIZE; | ||
|
||
if!(!enable || !hypercall_contents.enable()) { | ||
return; | ||
} | ||
let new_hv_contents: hvdef::hypercall::MsrHypercallContents = hypercall_contents.with_enable(enable).with_gpn(if enable { | ||
hypercall_page_num | ||
} else { | ||
0 | ||
}); | ||
|
||
// SAFETY: Using the contract established in the Hyper-V TLFS. | ||
unsafe { write_msr(hvdef::HV_X64_MSR_HYPERCALL, new_hv_contents.into()) }; | ||
} | ||
|
||
/// Has to be called before using hypercalls. | ||
pub(crate) fn initialize(guest_os_id: u64) { | ||
// We are assuming we are running under a Microsoft hypervisor, so there is | ||
// no need to check any cpuid leaves. | ||
report_os_id(guest_os_id); | ||
write_hypercall_msr(true); | ||
} | ||
|
||
/// Call before jumping to kernel. | ||
pub(crate) fn uninitialize() { | ||
write_hypercall_msr(false); | ||
report_os_id(0); | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame}; | ||
use lazy_static::lazy_static; | ||
use sync_nostd::Mutex; | ||
|
||
use super::interrupt_handler_register::{register_interrupt_handler, set_common_handler}; | ||
|
||
lazy_static! { | ||
static ref IDT: InterruptDescriptorTable = { | ||
let mut idt = InterruptDescriptorTable::new(); | ||
register_interrupt_handler(&mut idt); | ||
idt.double_fault.set_handler_fn(handler_double_fault); | ||
idt | ||
}; | ||
} | ||
|
||
static mut HANDLERS : [fn(); 256] = [no_op; 256]; | ||
static MUTEX: Mutex<()> = Mutex::new(()); | ||
fn no_op() {} | ||
|
||
fn common_handler(_stack_frame: InterruptStackFrame, interrupt: u8) { | ||
unsafe { HANDLERS[interrupt as usize](); } | ||
} | ||
|
||
pub fn set_handler(interrupt: u8, handler: fn()) { | ||
let _lock = MUTEX.lock(); | ||
unsafe { HANDLERS[interrupt as usize] = handler; } | ||
} | ||
|
||
|
||
extern "x86-interrupt" fn handler_double_fault( | ||
stack_frame: InterruptStackFrame, | ||
_error_code: u64, | ||
) -> ! { | ||
log::error!("EXCEPTION:\n\tERROR_CODE: {}\n\tDOUBLE FAULT\n{:#?}", _error_code, stack_frame); | ||
loop {} | ||
} | ||
|
||
// Initialize the IDT | ||
pub fn init() { | ||
IDT.load(); | ||
set_common_handler(common_handler); | ||
x86_64::instructions::interrupts::enable(); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we unify on the same version of spin that lazy_static is pulling in, so we only have the one?