Changeset 97178 in vbox for trunk/src/VBox/VMM/VMMR3/NEMR3Native-linux.cpp

Timestamp:

Oct 17, 2022 9:06:03 PM (2 years ago)

Author:

vboxsync

Message:

VMM/CPUM,EM,HM,IEM,++: Moved VMCPU_FF_INHIBIT_INTERRUPTS and VMCPU_FF_BLOCK_NMIS to CPUMCTX::fInhibit. Moved ldtr and tr up to the CPUMCTXCORE area in hope for better cache alignment of rip, rflags and crX register fields. bugref:9941

File:

• trunk/src/VBox/VMM/VMMR3/NEMR3Native-linux.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR3/NEMR3Native-linux.cpp

@@ -1476 +1476 @@
             pVCpu->cpum.GstCtx.rip = pRun->s.regs.regs.rip;
 
-        if (KvmEvents.interrupt.shadow)
-            EMSetInhibitInterruptsPC(pVCpu, pVCpu->cpum.GstCtx.rip);
-        else if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS))
-            VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS);
-
-        if (KvmEvents.nmi.masked)
-            VMCPU_FF_SET(pVCpu, VMCPU_FF_BLOCK_NMIS);
-        else if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_BLOCK_NMIS))
-            VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_BLOCK_NMIS);
+        CPUMUpdateInterruptShadowEx(&pVCpu->cpum.GstCtx, KvmEvents.interrupt.shadow != 0, pVCpu->cpum.GstCtx.rip);
+        CPUMUpdateInterruptInhibitingByNmi(&pVCpu->cpum.GstCtx, KvmEvents.nmi.masked != 0);
 
         if (KvmEvents.interrupt.injected)
@@ -1869 +1862 @@
 
         KvmEvents.flags = KVM_VCPUEVENT_VALID_SHADOW;
-        if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS))
-        {
-            if (pRun->s.regs.regs.rip == EMGetInhibitInterruptsPC(pVCpu))
-                KvmEvents.interrupt.shadow = KVM_X86_SHADOW_INT_MOV_SS | KVM_X86_SHADOW_INT_STI;
-            else
-                VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS);
-        }
+        if (!CPUMIsInInterruptShadowWithUpdate(&pVCpu->cpum.GstCtx))
+        { /* probably likely */ }
+        else
+            KvmEvents.interrupt.shadow = KVM_X86_SHADOW_INT_MOV_SS | KVM_X86_SHADOW_INT_STI;
 
         /* No flag - this is updated unconditionally. */
-        if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_BLOCK_NMIS))
-            KvmEvents.nmi.masked = 1;
+        KvmEvents.nmi.masked = CPUMAreInterruptsInhibitedByNmi(&pVCpu->cpum.GstCtx);
 
         if (TRPMHasTrap(pVCpu))
@@ -2059 +2048 @@
     KvmEvents.flags |= KVM_VCPUEVENT_VALID_SHADOW;
     if (!(pVCpu->cpum.GstCtx.fExtrn & CPUMCTX_EXTRN_INHIBIT_INT))
-    {
-        if (!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS))
-            KvmEvents.interrupt.shadow = 0;
-        else if (EMGetInhibitInterruptsPC(pVCpu) == pRun->s.regs.regs.rip)
-            KvmEvents.interrupt.shadow = KVM_X86_SHADOW_INT_MOV_SS | KVM_X86_SHADOW_INT_STI;
-        else
-        {
-            VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS);
-            KvmEvents.interrupt.shadow = 0;
-        }
-    }
-    else if (KvmEvents.interrupt.shadow)
-        EMSetInhibitInterruptsPC(pVCpu, pRun->s.regs.regs.rip);
-    else if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS))
-        VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS);
+        KvmEvents.interrupt.shadow = !CPUMIsInInterruptShadowWithUpdate(&pVCpu->cpum.GstCtx) ? 0
+                                   : KVM_X86_SHADOW_INT_MOV_SS | KVM_X86_SHADOW_INT_STI;
+    else
+        CPUMUpdateInterruptShadowEx(&pVCpu->cpum.GstCtx, KvmEvents.interrupt.shadow != 0, pRun->s.regs.regs.rip);
 
     if (!(pVCpu->cpum.GstCtx.fExtrn & CPUMCTX_EXTRN_INHIBIT_NMI))
-        KvmEvents.nmi.masked = VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_BLOCK_NMIS) ? 1 : 0;
-    else if (KvmEvents.nmi.masked)
-        VMCPU_FF_SET(pVCpu, VMCPU_FF_BLOCK_NMIS);
-    else if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_BLOCK_NMIS))
-        VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_BLOCK_NMIS);
+        KvmEvents.nmi.masked = CPUMAreInterruptsInhibitedByNmi(&pVCpu->cpum.GstCtx);
+    else
+        CPUMUpdateInterruptInhibitingByNmi(&pVCpu->cpum.GstCtx, KvmEvents.nmi.masked != 0);
 
     /* KVM will own the INT + NMI inhibit state soon: */