Make interrupt counters visible in release for cvms

openhcl/underhill_core/src/lib.rs

@@ -275,6 +275,7 @@ impl DiagState {
 
 #[derive(Inspect)]
 struct Workers {
+    #[inspect(safe)]
     vm: WorkerHandle,
     #[inspect(skip)]
     vm_rpc: mesh::Sender<UhVmRpc>,

openhcl/underhill_core/src/worker.rs

@@ -3582,7 +3582,8 @@ async fn new_underhill_vm(
         state_units
             .add("partition")
             .depends_on(devices.chipset_unit())
-            .depends_on(vmtime.handle()),
+            .depends_on(vmtime.handle())
+            .inspect_sensitivity(inspect::SensitivityLevel::Safe),
         WrappedPartition(partition.clone()),
         PartitionUnitParams {
             processor_topology: &processor_topology,

openhcl/virt_mshv_vtl/src/lib.rs

@@ -377,6 +377,7 @@ struct UhCvmVpState {
     /// Hypervisor enlightenment emulator state.
     hv: VtlArray<ProcessorVtlHv, 2>,
     /// LAPIC state.
+    #[inspect(safe)]
     lapics: VtlArray<LapicState, 2>,
     /// Guest VSM state for this vp. Some when VTL 1 is enabled.
     vtl1: Option<GuestVsmVpState>,

openhcl/virt_mshv_vtl/src/processor/mod.rs

@@ -117,7 +117,7 @@ pub struct UhProcessor<'a, T: Backing> {
     // together by the compiler.
     #[inspect(skip)]
     runner: ProcessorRunner<'a, T::HclBacking<'a>>,
-    #[inspect(mut)]
+    #[inspect(mut, safe)]
     backing: T,
 }
 
@@ -157,6 +157,7 @@ impl VtlsTlbLocked {
 #[cfg(guest_arch = "x86_64")]
 #[derive(Inspect)]
 pub(crate) struct LapicState {
+    #[inspect(safe)]
     lapic: LocalApic,
     activity: MpState,
     nmi_pending: bool,

openhcl/virt_mshv_vtl/src/processor/snp/mod.rs

@@ -107,7 +107,7 @@ pub struct SnpBacked {
     hv_sint_notifications: u16,
     general_stats: VtlArray<GeneralStats, 2>,
     exit_stats: VtlArray<ExitStats, 2>,
-    #[inspect(flatten)]
+    #[inspect(flatten, safe)]
     cvm: UhCvmVpState,
 }
 

openhcl/virt_mshv_vtl/src/processor/tdx/mod.rs

@@ -516,7 +516,7 @@ pub struct TdxBacked {
     #[inspect(skip)]
     flush_page: user_driver::memory::MemoryBlock,
 
-    #[inspect(flatten)]
+    #[inspect(flatten, safe)]
     cvm: UhCvmVpState,
 
     /// Per-processor state for [`TdxTscDeadlineService`].

vmm_core/src/partition_unit/vp_set.rs

@@ -717,7 +717,7 @@ struct Inner {
 pub struct VpSet {
     #[inspect(flatten)]
     inner: Arc<Inner>,
-    #[inspect(rename = "vp", iter_by_index)]
+    #[inspect(rename = "vp", iter_by_index, safe)]
     vps: Vec<Vp>,
     #[inspect(skip)]
     started: bool,

vmm_core/state_unit/src/lib.rs

@@ -234,6 +234,7 @@ struct Unit {
     dependencies: Vec<u64>,
     dependents: Vec<u64>,
     state: State,
+    inspect_sensitivity: inspect::SensitivityLevel,
 }
 
 /// An error returned when a state unit name is already in use.
@@ -313,7 +314,7 @@ impl Inspect for Inner {
     fn inspect(&self, req: inspect::Request<'_>) {
         let mut resp = req.respond();
         for unit in self.units.values() {
-            resp.child(unit.name.as_ref(), |req| {
+            resp.sensitivity_child(unit.name.as_ref(), unit.inspect_sensitivity, |req| {
                 let mut resp = req.respond();
                 if !unit.dependencies.is_empty() {
                     resp.field_with("dependencies", || {
@@ -444,6 +445,7 @@ impl StateUnits {
             name: name.into(),
             dependencies: Vec::new(),
             dependents: Vec::new(),
+            inspect_sensitivity: inspect::SensitivityLevel::Unspecified,
         }
     }
 
@@ -827,6 +829,7 @@ pub struct UnitBuilder<'a> {
     name: Arc<str>,
     dependencies: Vec<u64>,
     dependents: Vec<u64>,
+    inspect_sensitivity: inspect::SensitivityLevel,
 }
 
 impl UnitBuilder<'_> {
@@ -848,6 +851,12 @@ impl UnitBuilder<'_> {
         self
     }
 
+    /// Sets the sensitivity level for this unit's inspect data. Defaults to Unspecified.
+    pub fn inspect_sensitivity(mut self, sensitivity: inspect::SensitivityLevel) -> Self {
+        self.inspect_sensitivity = sensitivity;
+        self
+    }
+
     fn handle_id(&self, handle: &UnitHandle) -> u64 {
         // Ensure this handle is associated with this set of state units.
         assert_eq!(
@@ -891,6 +900,7 @@ impl UnitBuilder<'_> {
                     dependencies: self.dependencies,
                     dependents: self.dependents,
                     state: State::Stopped,
+                    inspect_sensitivity: self.inspect_sensitivity,
                 },
             );
             let unit_id = UnitId {

vmm_core/virt_support_apic/src/lib.rs

@@ -114,24 +114,39 @@ pub struct LocalApic {
     needs_offload_reeval: bool,
     scan_irr: bool,
 
+    #[inspect(safe)]
     stats: Stats,
 }
 
 #[derive(Inspect, Default)]
 struct Stats {
+    #[inspect(safe)]
     eoi: Counter,
+    #[inspect(safe)]
     eoi_level: Counter,
+    #[inspect(safe)]
     spurious_eoi: Counter,
+    #[inspect(safe)]
     lazy_eoi: Counter,
+    #[inspect(safe)]
     interrupt: Counter,
+    #[inspect(safe)]
     nmi: Counter,
+    #[inspect(safe)]
     extint: Counter,
+    #[inspect(safe)]
     init: Counter,
+    #[inspect(safe)]
     sipi: Counter,
+    #[inspect(safe)]
     self_ipi: Counter,
+    #[inspect(safe)]
     broadcast_ipi: Counter,
+    #[inspect(safe)]
     other_ipi: Counter,
+    #[inspect(safe)]
     offload_push: Counter,
+    #[inspect(safe)]
     offload_pull: Counter,
 }