Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 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
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
92 changes: 90 additions & 2 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3199,9 +3199,9 @@ dependencies = [

[[package]]
name = "iced-x86"
version = "1.20.0"
version = "1.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdd366a53278429c028367e0ba22a46cab6d565a57afb959f06e92c7a69e7828"
checksum = "7c447cff8c7f384a7d4f741cfcff32f75f3ad02b406432e8d6c878d56b1edf6b"
dependencies = [
"lazy_static",
]
Expand Down Expand Up @@ -3547,6 +3547,9 @@ name = "lazy_static"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
dependencies = [
"spin 0.5.2",
]

[[package]]
name = "libc"
Expand Down Expand Up @@ -3609,6 +3612,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.31"
Expand Down Expand Up @@ -4424,6 +4436,14 @@ dependencies = [
"libc",
]

[[package]]
name = "nostd_spin_channel"
version = "0.1.0"
dependencies = [
"spin 0.10.0",
"thiserror 2.0.0",
]

[[package]]
name = "ntapi"
version = "0.4.1"
Expand Down Expand Up @@ -4769,6 +4789,32 @@ dependencies = [
"thiserror 2.0.0",
]

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

[[package]]
name = "openvmm"
version = "0.0.0"
Expand Down Expand Up @@ -6360,6 +6406,30 @@ dependencies = [
"zerocopy 0.8.14",
]

[[package]]
name = "spin"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"

[[package]]
name = "spin"
version = "0.10.0"
Copy link
Contributor

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?

Copy link
Author

Choose a reason for hiding this comment

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

Will work on versioning and package related changes as I resolve the merge conflicts.

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 = "stackfuture"
version = "0.3.0"
Expand Down Expand Up @@ -8736,6 +8806,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 @@ -9313,6 +9389,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.6.0",
"rustversion",
"volatile",
]

[[package]]
name = "x86defs"
version = "0.0.0"
Expand Down
11 changes: 11 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ members = [
"support/sparse_mmap/fuzz",
"support/ucs2/fuzz",
"vm/devices/chipset/fuzz",
#opentmk support
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: this doesn't need to be a member so long as it's a dependency used somewhere else

"support/nostd_spin_channel",
"vm/devices/firmware/firmware_uefi/fuzz",
"vm/devices/storage/disk_nvme/nvme_driver/fuzz",
"vm/devices/storage/ide/fuzz",
Expand All @@ -42,6 +44,8 @@ members = [
"vm/loader/igvmfilegen",
"vm/vmgs/vmgs_lib",
"vm/vmgs/vmgstool",
# opentmk
"opentmk/",
]
exclude = [
"xsync",
Expand Down Expand Up @@ -374,6 +378,9 @@ vnc_worker_defs = { path = "workers/vnc_worker_defs" }
vnc = { path = "workers/vnc_worker/vnc" }
profiler_worker = { path = "openhcl/profiler_worker" }

# opentmk
nostd_spin_channel = { path = "support/nostd_spin_channel"}
Copy link
Contributor

Choose a reason for hiding this comment

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

Group with the rest of the support crates


# crates.io
anyhow = "1.0"
arbitrary = "1.3"
Expand Down Expand Up @@ -445,9 +452,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 = "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"
macaddr = "1.0"
Expand Down Expand Up @@ -493,6 +502,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"
Expand Down Expand Up @@ -520,6 +530,7 @@ winapi = "0.3"
windows = "0.59"
windows-service = "0.7"
windows-sys = "0.52"
x86_64 = { version = "0.15.2", default-features = false }
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
1 change: 1 addition & 0 deletions openhcl/minimal_rt/src/arch/x86_64/hypercall.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ HYPERCALL_PAGE:
/// input/output pages are not being concurrently used elsewhere. For fast
/// hypercalls, the caller must ensure that there are no output words so that
/// there is no register corruption.
#[inline(never)]
Copy link
Contributor

Choose a reason for hiding this comment

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

Why?

Copy link
Author

Choose a reason for hiding this comment

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

Right. I need to remove this.

pub unsafe fn invoke_hypercall(
control: hvdef::hypercall::Control,
input_gpa_or_fast1: u64,
Expand Down
39 changes: 39 additions & 0 deletions opentmk/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# 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.

arrayvec.workspace = true
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"] }
x86defs.workspace = true
zerocopy.workspace = true
nostd_spin_channel.workspace = true

[lints]
workspace = true

[build-dependencies]
minimal_rt_build.workspace = true
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.
5 changes: 5 additions & 0 deletions opentmk/build_deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
RUST_BACKTRACE=1 CARGO_PROFILE_RELEASE_force_frame_pointers=yes cargo build -p opentmk --target x86_64-unknown-uefi --release #--target-dir ./target/x86_64-unknown-uefi/debug
cargo xtask guest-test uefi --bootx64 ~/projects-local/openvmm/target/x86_64-unknown-uefi/release/opentmk.efi
qemu-img convert -f raw -O vhdx ~/projects-local/openvmm/target/x86_64-unknown-uefi/release/opentmk.img ~/projects/opentmk.vhdx
#CARGO_PROFILE_RELEASE_OPT_LEVEL=0
#+nightly-2025-05-09
4 changes: 4 additions & 0 deletions opentmk/rustfmt.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
imports_granularity = "Item" # Expands `use foo::{bar, baz};` into separate `use` lines
Copy link
Contributor

Choose a reason for hiding this comment

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

This will need to go away, although if these options are stabilized they could move to our root rustfmt.toml.

reorder_imports = true # Optional: sort imports
normalize_imports = true # Optional: standardize style (e.g., remove leading ::)
group_imports = "StdExternalCrate" # Optional: group std/external/local with blank lines
27 changes: 27 additions & 0 deletions opentmk/src/arch/aarch64/hypercall.rs
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.
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);
}
3 changes: 3 additions & 0 deletions opentmk/src/arch/aarch64/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
pub mod serial;

pub mod hypercall;
Loading