Feedback

Author: smalis-msft

openhcl/virt_mshv_vtl/src/processor/mshv/tlb_lock.rs

@@ -30,7 +30,7 @@ impl UhProcessor<'_, HypervisorBacked> {
     pub(crate) fn set_tlb_lock(&mut self, requesting_vtl: Vtl, target_vtl: GuestVtl) {
         debug_assert_eq!(requesting_vtl, Vtl::Vtl2);
 
-        if self.is_tlb_locked(requesting_vtl, target_vtl) {
+        if self.vtls_tlb_locked.get(requesting_vtl, target_vtl) {
             return;
         }
 
@@ -52,19 +52,26 @@ impl UhProcessor<'_, HypervisorBacked> {
         debug_assert_eq!(requesting_vtl, Vtl::Vtl2);
         let locally_locked = self.vtls_tlb_locked.get(requesting_vtl, target_vtl);
         // The hypervisor may lock the TLB without us knowing, but the inverse should never happen.
-        #[expect(
-            clippy::debug_assert_with_mut_call,
-            reason = "just sanity checking, but the function can update the cached value in the non-debug-assert branch"
-        )]
         if locally_locked {
-            debug_assert!(self.is_tlb_locked_in_hypervisor(requesting_vtl, target_vtl));
+            debug_assert!(self.is_tlb_locked_in_hypervisor_noncaching(target_vtl));
             true
         } else {
             self.is_tlb_locked_in_hypervisor(requesting_vtl, target_vtl)
         }
     }
 
     fn is_tlb_locked_in_hypervisor(&mut self, requesting_vtl: Vtl, target_vtl: GuestVtl) -> bool {
+        let result = self.is_tlb_locked_in_hypervisor_noncaching(target_vtl);
+        // The hypervisor may lock the TLB without us knowing, but the inverse should never happen.
+        if result {
+            self.vtls_tlb_locked.set(requesting_vtl, target_vtl, true);
+        } else {
+            assert!(!self.vtls_tlb_locked.get(requesting_vtl, target_vtl));
+        }
+        result
+    }
+
+    fn is_tlb_locked_in_hypervisor_noncaching(&self, target_vtl: GuestVtl) -> bool {
         let name = HvAllArchRegisterName(
             HvAllArchRegisterName::VsmVpSecureConfigVtl0.0 + target_vtl as u32,
         );
@@ -74,14 +81,7 @@ impl UhProcessor<'_, HypervisorBacked> {
             .get_vp_register(name, HvInputVtl::CURRENT_VTL)
             .expect("failure is a misconfiguration");
         let config = hvdef::HvRegisterVsmVpSecureVtlConfig::from(result.as_u64());
-        let result = config.tlb_locked();
-        // The hypervisor may lock the TLB without us knowing, but the inverse should never happen.
-        if result {
-            self.vtls_tlb_locked.set(requesting_vtl, target_vtl, true);
-        } else {
-            assert!(!self.vtls_tlb_locked.get(requesting_vtl, target_vtl));
-        }
-        result
+        config.tlb_locked()
     }
 
     /// Marks the TLBs of all lower VTLs as unlocked.