Add much of the basic wiring for TDX Guest VSM support. (#541)

This is just most of the inner wiring, replacing hardcoded VTLs with the actual ones. Should introduce no functional changes just yet.
microsoft · Jan 8, 2025 · 8cf8aa4 · 8cf8aa4
1 parent 8171cea
commit 8cf8aa4
Show file tree

Hide file tree

Showing 7 changed files with 517 additions and 446 deletions.
diff --git a/openhcl/virt_mshv_vtl/src/processor/mod.rs b/openhcl/virt_mshv_vtl/src/processor/mod.rs
@@ -229,11 +229,7 @@ mod private {
         /// message slot.
         ///
         /// This is used for hypervisor-managed and untrusted SINTs.
-        fn request_untrusted_sint_readiness(
-            this: &mut UhProcessor<'_, Self>,
-            vtl: GuestVtl,
-            sints: u16,
-        );
+        fn request_untrusted_sint_readiness(this: &mut UhProcessor<'_, Self>, sints: u16);
 
         /// Returns whether this VP should be put to sleep in usermode, or
         /// whether it's ready to proceed into the kernel.
@@ -958,7 +954,8 @@ impl<'a, T: Backing> UhProcessor<'a, T> {
         };
 
         if sints & untrusted_sints != 0 {
-            T::request_untrusted_sint_readiness(self, vtl, sints & untrusted_sints);
+            assert_eq!(vtl, GuestVtl::Vtl0);
+            T::request_untrusted_sint_readiness(self, sints & untrusted_sints);
         }
     }
 

diff --git a/openhcl/virt_mshv_vtl/src/processor/mshv/arm64.rs b/openhcl/virt_mshv_vtl/src/processor/mshv/arm64.rs
@@ -190,11 +190,7 @@ impl BackingPrivate for HypervisorBackedArm64 {
             .set_interrupt_notification(true);
     }
 
-    fn request_untrusted_sint_readiness(
-        this: &mut UhProcessor<'_, Self>,
-        _vtl: GuestVtl,
-        sints: u16,
-    ) {
+    fn request_untrusted_sint_readiness(this: &mut UhProcessor<'_, Self>, sints: u16) {
         this.backing
             .next_deliverability_notifications
             .set_sints(this.backing.next_deliverability_notifications.sints() | sints);

diff --git a/openhcl/virt_mshv_vtl/src/processor/mshv/x64.rs b/openhcl/virt_mshv_vtl/src/processor/mshv/x64.rs
@@ -389,11 +389,7 @@ impl BackingPrivate for HypervisorBackedX86 {
             .set_interrupt_notification(true);
     }
 
-    fn request_untrusted_sint_readiness(
-        this: &mut UhProcessor<'_, Self>,
-        _vtl: GuestVtl,
-        sints: u16,
-    ) {
+    fn request_untrusted_sint_readiness(this: &mut UhProcessor<'_, Self>, sints: u16) {
         this.backing
             .next_deliverability_notifications
             .set_sints(this.backing.next_deliverability_notifications.sints() | sints);

diff --git a/openhcl/virt_mshv_vtl/src/processor/snp/mod.rs b/openhcl/virt_mshv_vtl/src/processor/snp/mod.rs
@@ -453,14 +453,7 @@ impl BackingPrivate for SnpBacked {
         unreachable!("extint managed through software apic")
     }
 
-    fn request_untrusted_sint_readiness(
-        this: &mut UhProcessor<'_, Self>,
-        vtl: GuestVtl,
-        sints: u16,
-    ) {
-        if vtl == GuestVtl::Vtl1 {
-            todo!("TODO: handle untrusted sints for VTL1");
-        }
+    fn request_untrusted_sint_readiness(this: &mut UhProcessor<'_, Self>, sints: u16) {
         if this.backing.hv_sint_notifications & !sints == 0 {
             return;
         }
@@ -470,7 +463,7 @@ impl BackingPrivate for SnpBacked {
         tracing::trace!(?notifications, "setting notifications");
         this.runner
             .set_vp_register(
-                vtl,
+                GuestVtl::Vtl0,
                 HvX64RegisterName::DeliverabilityNotifications,
                 u64::from(notifications).into(),
             )