-
Notifications
You must be signed in to change notification settings - Fork 161
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
Changes from 41 commits
6d32033
351199b
3e1673e
056bf7d
6d37a84
53e0da2
7eb38ff
2d2aec4
4cd03a5
bb22270
e9fef3a
9a0ef26
e02ee17
48d300a
7bdf91f
1104901
c0f3e0a
7f33bbd
a49da94
9bdf302
fc0b866
7019671
7d70c67
43e04f0
4560aa6
d28f9c3
1b31943
a20e5cb
84297d4
c22989a
151ae4f
7f241aa
f961d8a
63becb0
2be9b2d
cc9205d
93845da
8c436ec
909f2b0
66ee0b7
1d687da
119afb5
c32ecbf
77e7129
4105362
ff51df4
a0d6037
e67c794
96603fe
3ca6418
c0f8aca
b95eaf6
b725ef5
0952aec
19a7312
1af6f82
a61d548
083a52f
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,8 @@ members = [ | |
| "vm/loader/igvmfilegen", | ||
| "vm/vmgs/vmgs_lib", | ||
| "vm/vmgs/vmgstool", | ||
| # opentmk | ||
| "opentmk", | ||
smalis-msft marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ] | ||
| exclude = [ | ||
| "xsync", | ||
|
|
@@ -117,6 +119,7 @@ mesh_remote = { path = "support/mesh/mesh_remote" } | |
| mesh_rpc = { path = "support/mesh/mesh_rpc" } | ||
| mesh_worker = { path = "support/mesh/mesh_worker" } | ||
| mesh_tracing = { path = "support/mesh_tracing" } | ||
| 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" } | ||
|
|
@@ -445,9 +448,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" | ||
|
|
@@ -493,6 +498,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 +526,7 @@ winapi = "0.3" | |
| windows = "0.59" | ||
| windows-service = "0.7" | ||
| windows-sys = "0.52" | ||
| x86_64 = { version = "0.15.2", default-features = false } | ||
|
Member
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. what are we getting from this dep that we don't already have in x86defs?
Contributor
Author
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. 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. | ||
|
|
||
| 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] | ||
smalis-msft marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| 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 | ||
| 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. | ||
smalis-msft marked this conversation as resolved.
Show resolved
Hide resolved
|
||
smalis-msft marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
| 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 | ||
| 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 | ||
|
||
| 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 | ||
| 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. | ||
mayank-microsoft marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| 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 @@ | ||
| 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. | ||
|
|
||
| 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"); | ||
| } | ||
| ); |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| // Copyright (c) Microsoft Corporation. | ||
| // Licensed under the MIT License. | ||
|
|
||
| #![expect(unsafe_code)] | ||
|
Member
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. please annotate why we have unsafe in each file we allow it
Contributor
Author
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. I've fixed it as a part of lint fixes. maybe it's an older commit? |
||
|
|
||
| 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() { | ||
|
Contributor
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 uninitialize? Do we ever call it and/or jump to an OS kernel?
Contributor
Author
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. Its just for sanity if we do need to uninit the hypercall pages. |
||
| write_hypercall_msr(false); | ||
| report_os_id(0); | ||
| } | ||
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?
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.
Will work on versioning and package related changes as I resolve the merge conflicts.