Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
6d32033
feat: opentmk init
mayank-microsoft Mar 10, 2025
351199b
feat: added docs
mayank-microsoft Apr 21, 2025
3e1673e
refactor(opentmk): interrupt handler doesn't need to save state for a…
mayank-microsoft Apr 21, 2025
056bf7d
reafctor(opentmk): remove dead code
mayank-microsoft Apr 21, 2025
6d37a84
chore: resolve PR feedback
mayank-microsoft May 11, 2025
53e0da2
chore: resolve PR feedback
mayank-microsoft May 12, 2025
7eb38ff
refactor: resolve PR feedback
mayank-microsoft May 12, 2025
2d2aec4
reafactor: errors for hyper-v error handling
mayank-microsoft May 21, 2025
4cd03a5
feat: add test for a negitive case where parition has not enabled VTL1
mayank-microsoft May 21, 2025
bb22270
docs: add documentation for structs
mayank-microsoft May 22, 2025
e9fef3a
rtc+broken misc test
mayank-microsoft Jul 3, 2025
9a0ef26
clippy fixup
mayank-microsoft Jul 3, 2025
e02ee17
broken
mayank-microsoft Jul 17, 2025
48d300a
chore: add tpm working
mayank-microsoft Jul 29, 2025
7bdf91f
feat: add new cvm tests
mayank-microsoft Aug 12, 2025
1104901
lint: add lints for imports
mayank-microsoft Aug 12, 2025
c0f3e0a
chore: resolve PR comments
mayank-microsoft Aug 26, 2025
7f33bbd
chore: resolve PR comments
mayank-microsoft Aug 27, 2025
a49da94
feat: compiles on Arm64
mayank-microsoft Aug 27, 2025
9bdf302
chore: resolve copilot comments
mayank-microsoft Aug 27, 2025
fc0b866
chore: remove default impl for channel
mayank-microsoft Aug 27, 2025
7019671
cleanup
mayank-microsoft Aug 27, 2025
7d70c67
fix: compiler error
mayank-microsoft Aug 28, 2025
43e04f0
chore: add back features
mayank-microsoft Aug 28, 2025
4560aa6
feat: add register intercept test
mayank-microsoft Sep 2, 2025
d28f9c3
lint: ran cargo fmt
mayank-microsoft Sep 2, 2025
1b31943
fix: changes to make register intercepts CVM ready
mayank-microsoft Sep 2, 2025
a20e5cb
refactor: reduce number of cfgs
mayank-microsoft Sep 5, 2025
84297d4
chore: resolve PR comments
mayank-microsoft Sep 8, 2025
c22989a
chore: pr comments resolve
mayank-microsoft Sep 8, 2025
151ae4f
chore: resolve PR comment
mayank-microsoft Sep 8, 2025
7f241aa
chore: resolve PR comments
mayank-microsoft Sep 8, 2025
f961d8a
chore: resolve PR comments
mayank-microsoft Sep 8, 2025
63becb0
chore: adding reason for inline(never)
mayank-microsoft Sep 8, 2025
2be9b2d
chore: update error description
mayank-microsoft Sep 8, 2025
cc9205d
chore: resolve PR comments
mayank-microsoft Sep 8, 2025
93845da
chore: updates for clippy pass
mayank-microsoft Sep 8, 2025
8c436ec
chore: unimplemented functions should not have irrelavant docs
mayank-microsoft Sep 8, 2025
909f2b0
chore: depende on minimal_rt for aarch64 serial port communication
mayank-microsoft Sep 8, 2025
66ee0b7
chore: resolve PR comments
mayank-microsoft Sep 8, 2025
1d687da
chore: resolve PR comments
mayank-microsoft Oct 7, 2025
119afb5
Merge branch 'main' into target-opentmk
mattkur Oct 7, 2025
c32ecbf
Merge branch 'main' into target-opentmk
mayank-microsoft Oct 7, 2025
77e7129
Cargo.lock merge fix
mattkur Oct 7, 2025
4105362
cleanup: remove files not required with the PR merged
mayank-microsoft Oct 7, 2025
ff51df4
chore: refactor for PR comments
mayank-microsoft Oct 7, 2025
a0d6037
chore: [WIP] flowey fixups
mayank-microsoft Oct 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 70 additions & 0 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3766,6 +3766,15 @@ dependencies = [
"escape8259",
]

[[package]]
name = "linked_list_allocator"
version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9afa463f5405ee81cdb9cc2baf37e08ec7e4c8209442b5d72c04cfb2cd6e6286"
dependencies = [
"spinning_top",
]

[[package]]
name = "linkme"
version = "0.3.33"
Expand Down Expand Up @@ -4618,6 +4627,14 @@ dependencies = [
"libc",
]

[[package]]
name = "nostd_spin_channel"
version = "0.0.0"
dependencies = [
"spin 0.10.0",
"thiserror 2.0.16",
]

[[package]]
name = "ntapi"
version = "0.4.1"
Expand Down Expand Up @@ -5067,6 +5084,29 @@ dependencies = [
"thiserror 2.0.16",
]

[[package]]
name = "opentmk"
version = "0.0.0"
dependencies = [
"bitfield-struct 0.11.0",
"cfg-if",
"hvdef",
"iced-x86",
"lazy_static",
"linked_list_allocator",
"log",
"memory_range",
"minimal_rt",
"nostd_spin_channel",
"serde",
"serde_json",
"spin 0.10.0",
"thiserror 2.0.16",
"uefi",
"x86_64",
"zerocopy 0.8.25",
]

[[package]]
name = "openvmm"
version = "0.0.0"
Expand Down Expand Up @@ -6823,6 +6863,18 @@ name = "spin"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591"
dependencies = [
"lock_api",
]

[[package]]
name = "spinning_top"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b9eb1a2f4c41445a3a0ff9abc5221c5fcd28e1f13cd7c0397706f9ac938ddb0"
dependencies = [
"lock_api",
]

[[package]]
name = "spki"
Expand Down Expand Up @@ -9421,6 +9473,12 @@ dependencies = [
"vmsocket",
]

[[package]]
name = "volatile"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "442887c63f2c839b346c192d047a7c87e73d0689c9157b00b53dcc27dd5ea793"

[[package]]
name = "vpci"
version = "0.0.0"
Expand Down Expand Up @@ -10154,6 +10212,18 @@ dependencies = [
"tap",
]

[[package]]
name = "x86_64"
version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f042214de98141e9c8706e8192b73f56494087cc55ebec28ce10f26c5c364ae"
dependencies = [
"bit_field",
"bitflags 2.9.3",
"rustversion",
"volatile",
]

[[package]]
name = "x86defs"
version = "0.0.0"
Expand Down
7 changes: 7 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ members = [
"vm/loader/igvmfilegen",
"vm/vmgs/vmgs_lib",
"vm/vmgs/vmgstool",
# opentmk
"opentmk",
]
exclude = [
"xsync",
Expand Down Expand Up @@ -126,6 +128,7 @@ mesh_rpc = { path = "support/mesh/mesh_rpc" }
mesh_worker = { path = "support/mesh/mesh_worker" }
mesh_tracing = { path = "support/mesh_tracing" }
minircu = { path = "support/minircu" }
nostd_spin_channel = { path = "support/nostd_spin_channel"}
open_enum = { path = "support/open_enum" }
openssl_kdf = { path = "support/openssl_kdf" }
openssl_crypto_only = { path = "support/openssl_crypto_only" }
Expand Down Expand Up @@ -466,9 +469,11 @@ jiff = "0.2.14"
kvm-bindings = "0.14.0"
# Use of these specific REPO will go away when changes are taken upstream.
landlock = "0.4.1"
lazy_static = "1.4.0"
libc = "0.2"
libfuzzer-sys = "0.4"
libtest-mimic = "0.8"
linked_list_allocator = "0.10.5"
linkme = "0.3.9"
log = "0.4"
loom = "0.7.2"
Expand Down Expand Up @@ -516,6 +521,7 @@ smallbox = "0.8"
smallvec = "1.8"
smoltcp = { version = "0.8", default-features = false }
socket2 = "0.6"
spin = "0.10.0"
stackfuture = "0.3"
static_assertions = "1.1"
syn = "2"
Expand Down Expand Up @@ -543,6 +549,7 @@ windows = "0.62"
windows-service = "0.8"
windows-sys = "0.61"
windows-version = "0.1.4"
x86_64 = { version = "0.15.2", default-features = false }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what are we getting from this dep that we don't already have in x86defs?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we use x86_64 heavily for interrupt management. For the IDT structs, helpers and interrupt abi.

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.
Expand Down
36 changes: 36 additions & 0 deletions opentmk/Cargo.toml
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

[features]
default = ["nightly"]
nightly = ["x86_64-nightly"]
x86_64-nightly = ["x86_64/nightly"]

[dependencies]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: sort and switch to dotted syntax for crates that don't need features. Also move all crates to be workspaced.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@smalis-msft There is one issue where I want to use the serde package with default features off as I want to use a no_std env. Should I disable the feature in workspace?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, you'll have to.

bitfield-struct.workspace = true
cfg-if.workspace = true
hvdef = {workspace = true}
iced-x86 = { workspace = true, features = ["decoder", "nasm", "no_std"]}
lazy_static = { workspace = true, features = ["spin_no_std"] }
linked_list_allocator.workspace = true
log.workspace = true
memory_range.workspace = true
minimal_rt.workspace = true
spin.workspace = true
serde = { version = "1.0", default-features = false, features = ["derive"]}
serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
thiserror.workspace = true
uefi = { workspace = true, features = ["alloc"] }
x86_64 = { workspace = true, features = ["instructions"] }
zerocopy.workspace = true
nostd_spin_channel.workspace = true

[lints]
workspace = true

[build-dependencies]
3 changes: 3 additions & 0 deletions opentmk/README.md
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.
29 changes: 29 additions & 0 deletions opentmk/src/arch/aarch64/hypercall.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

//! Hypercall interface for AArch64 architecture.

/// Writes a synthehtic register to tell the hypervisor the OS ID.
Copy link

Copilot AI Oct 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spelling error: 'synthehtic' should be 'synthetic'.

Suggested change
/// Writes a synthehtic register to tell the hypervisor the OS ID.
/// Writes a synthetic register to tell the hypervisor the OS ID.

Copilot uses AI. Check for mistakes.

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);
}
4 changes: 4 additions & 0 deletions opentmk/src/arch/aarch64/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

pub mod hypercall;
16 changes: 16 additions & 0 deletions opentmk/src/arch/mod.rs
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.

cfg_if::cfg_if!(
if #[cfg(target_arch = "x86_64")] {
mod x86_64;
pub use x86_64::*;
} else if #[cfg(target_arch = "aarch64")] {
mod aarch64;
pub use aarch64::*;
} else {
compile_error!("target_arch is not supported");
}
);
55 changes: 55 additions & 0 deletions opentmk/src/arch/x86_64/hypercall.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

//! Hypercall interface for x86_64 architecture.

#![expect(unsafe_code)]

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;

/// Writes an MSR to tell the hypervisor the OS ID.
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);
};
}

/// 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 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 to uninitialize hypercalL page overlay
pub fn uninitialize() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need uninitialize? Do we ever call it and/or jump to an OS kernel?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its just for sanity if we do need to uninit the hypercall pages.

write_hypercall_msr(false);
report_os_id(0);
}
64 changes: 64 additions & 0 deletions opentmk/src/arch/x86_64/interrupt.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

//! x86_64-specific interrupt handling implementation.
//!

use lazy_static::lazy_static;
use spin::Mutex;
use x86_64::structures::idt::InterruptDescriptorTable;
use x86_64::structures::idt::InterruptStackFrame;

use super::interrupt_handler_register::register_interrupt_handler;
use super::interrupt_handler_register::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) {
// SAFETY: Handlers are initilizaed to no_op and only set via set_handler which is
// protected by a mutex.
unsafe {
HANDLERS[interrupt as usize]();
}
}

/// Sets the handler for a specific interrupt number.
pub fn set_handler(interrupt: u8, handler: fn()) {
let _lock = MUTEX.lock();
// SAFETY: handlers is protected by a mutex.
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 {
core::hint::spin_loop();
}
}

/// Initialize the IDT
pub fn init() {
IDT.load();
set_common_handler(common_handler);
x86_64::instructions::interrupts::enable();
}
Loading
Loading