Add a second global synic for VTL 1 (#64)

Pretty simple, just adding yet another VtlArray.

Author: smalis-msft

openhcl/virt_mshv_vtl/src/lib.rs

@@ -869,7 +869,7 @@ impl vmcore::synic::GuestEventPort for UhEventPort {
             };
             tracing::trace!(vp = vp.index(), sint, flag, "signal_event");
             if let Some(hv) = partition.hv.as_ref() {
-                match hv.synic.signal_event(
+                match hv.synic[vtl].signal_event(
                     &partition.gm[vtl],
                     vp,
                     sint,

openhcl/virt_mshv_vtl/src/processor/mod.rs

@@ -742,7 +742,7 @@ impl<'a, T: Backing> UhProcessor<'a, T> {
         let untrusted_synic = partition
             .untrusted_synic
             .as_ref()
-            .map(|synic| synic.add_vp(vp_info.base.vp_index, Vtl::Vtl0));
+            .map(|synic| synic.add_vp(vp_info.base.vp_index));
 
         let mut vp = Self {
             partition,

vm/hv1/hv1_emulator/src/hv.rs

@@ -30,8 +30,8 @@ pub struct GlobalHv {
     partition_state: Arc<GlobalHvState>,
     /// Mutable state, per VTL
     vtl_mutable_state: VtlArray<Arc<Mutex<MutableHvState>>, 2>,
-    /// The partition-wide synic state.
-    pub synic: GlobalSynic,
+    /// The per-vtl synic state.
+    pub synic: VtlArray<GlobalSynic, 2>,
 }
 
 #[derive(Inspect)]
@@ -89,7 +89,7 @@ impl GlobalHv {
             vtl_mutable_state: VtlArray::from_fn(|_| {
                 Arc::new(Mutex::new(MutableHvState::AT_RESET))
             }),
-            synic: GlobalSynic::new(params.max_vp_count),
+            synic: VtlArray::from_fn(|_| GlobalSynic::new(params.max_vp_count)),
         }
     }
 
@@ -104,7 +104,7 @@ impl GlobalHv {
             vp_index,
             partition_state: self.partition_state.clone(),
             vtl_state: self.vtl_mutable_state[vtl].clone(),
-            synic: self.synic.add_vp(vp_index, vtl),
+            synic: self.synic[vtl].add_vp(vp_index),
             vp_assist_page: 0.into(),
             guest_memory,
         }

vm/hv1/hv1_emulator/src/synic.rs

@@ -11,7 +11,6 @@ use hvdef::HvMessageType;
 use hvdef::HvSynicSimpSiefp;
 use hvdef::HvSynicStimerConfig;
 use hvdef::TimerMessagePayload;
-use hvdef::Vtl;
 use hvdef::HV_MESSAGE_SIZE;
 use hvdef::HV_PAGE_SIZE;
 use hvdef::HV_PAGE_SIZE_USIZE;
@@ -247,30 +246,15 @@ impl GlobalSynic {
     }
 
     /// Adds a virtual processor to the synthetic interrupt controller state.
-    pub fn add_vp(&self, vp_index: VpIndex, vtl: Vtl) -> ProcessorSynic {
-        match vtl {
-            Vtl::Vtl0 => {
-                let shared = self.vps[vp_index.index() as usize].clone();
-                let old_shared =
-                    std::mem::replace(&mut *shared.write(), SharedProcessorState::AT_RESET);
-                assert!(!old_shared.online);
-
-                ProcessorSynic {
-                    sints: SintState::AT_RESET,
-                    timers: array::from_fn(|_| Timer::default()),
-                    shared,
-                }
-            }
-            Vtl::Vtl1 => {
-                // TODO CVM GUEST VSM, these values are just placeholders to prevent
-                // messing with VTL 0's state
-                ProcessorSynic {
-                    sints: SintState::AT_RESET,
-                    timers: array::from_fn(|_| Timer::default()),
-                    shared: Arc::new(RwLock::new(SharedProcessorState::AT_RESET)),
-                }
-            }
-            Vtl::Vtl2 => unreachable!(),
+    pub fn add_vp(&self, vp_index: VpIndex) -> ProcessorSynic {
+        let shared = self.vps[vp_index.index() as usize].clone();
+        let old_shared = std::mem::replace(&mut *shared.write(), SharedProcessorState::AT_RESET);
+        assert!(!old_shared.online);
+
+        ProcessorSynic {
+            sints: SintState::AT_RESET,
+            timers: array::from_fn(|_| Timer::default()),
+            shared,
         }
     }
 }

vmm_core/virt_hvf/src/lib.rs

@@ -113,7 +113,7 @@ impl virt::ProtoPartition for HvfProtoPartition<'_> {
             .config
             .processor_topology
             .vps()
-            .map(|vp_info| hv1.synic.add_vp(vp_info.vp_index, Vtl::Vtl0))
+            .map(|vp_info| hv1.synic.add_vp(vp_info.vp_index))
             .collect::<Vec<_>>();
 
         let mut gicd = gic::Distributor::new(256);

vmm_core/virt_whp/src/hypercalls.rs

@@ -183,8 +183,7 @@ impl<T: CpuIo> hv1_hypercall::SignalEventDirect for WhpHypercallExit<'_, '_, T>
 
                 return Err(HvError::InvalidSynicState);
             }
-            Hv1State::Emulated(hv) => hv
-                .synic
+            Hv1State::Emulated(hv) => hv.synic[vtl]
                 .signal_event(
                     &self.vp.vp.partition.gm,
                     vp,

vmm_core/virt_whp/src/synic.rs

@@ -331,7 +331,7 @@ impl GuestEventPort for EmulatedGuestEventPort {
                     let Hv1State::Emulated(hv) = &partition.vtlp(vtl).hvstate else {
                         unreachable!()
                     };
-                    let _ = hv.synic.signal_event(
+                    let _ = hv.synic[vtl].signal_event(
                         &partition.gm,
                         vp,
                         sint,