Changeset 97183 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Oct 17, 2022 10:27:05 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

154158

Message:

VMM/CPUM,HMVMX,IEM: Use the individual CPUMCTX_INHIBIT_SHADOW_SS and CPUMCTX_INHIBIT_SHADOW_STI flags with IEM (only setting), VT-x and NEM/kvm. bugref:9941

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CPUM.cpp (modified) (3 diffs)
• NEMR3Native-linux.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR3/CPUM.cpp

@@ -3089 +3089 @@
  *
  * @param   pszEFlags   Where to write the mnemonics. (Assumes sufficient buffer space.)
- * @param   efl         The EFLAGS value.
+ * @param   efl         The EFLAGS value with fInhibit in bits 31:24.
  */
 static void cpumR3InfoFormatFlags(char *pszEFlags, uint32_t efl)
@@ -3116 +3116 @@
         { "po", "pe", X86_EFL_PF },
         { "cy", "nc", X86_EFL_CF },
+        { "inh-ss",  NULL, (uint32_t)CPUMCTX_INHIBIT_SHADOW_SS  << 24 },
+        { "inh-sti", NULL, (uint32_t)CPUMCTX_INHIBIT_SHADOW_STI << 24 },
+        { "inh-nmi", NULL, (uint32_t)CPUMCTX_INHIBIT_NMI        << 24 },
     };
     char *psz = pszEFlags;
@@ -3152 +3155 @@
     uint32_t efl = pCtxCore->eflags.u32;
     char szEFlags[80];
-    cpumR3InfoFormatFlags(&szEFlags[0], efl);
+    cpumR3InfoFormatFlags(&szEFlags[0], efl | ((uint32_t)pCtx->fInhibit << 24));
 
     /*

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

@@ -1476 +1476 @@
             pVCpu->cpum.GstCtx.rip = pRun->s.regs.regs.rip;
 
-        CPUMUpdateInterruptShadowEx(&pVCpu->cpum.GstCtx, KvmEvents.interrupt.shadow != 0, pVCpu->cpum.GstCtx.rip);
+        CPUMUpdateInterruptShadowSsStiEx(&pVCpu->cpum.GstCtx,
+                                         RT_BOOL(KvmEvents.interrupt.shadow & KVM_X86_SHADOW_INT_MOV_SS),
+                                         RT_BOOL(KvmEvents.interrupt.shadow & KVM_X86_SHADOW_INT_STI),
+                                         pVCpu->cpum.GstCtx.rip);
         CPUMUpdateInterruptInhibitingByNmi(&pVCpu->cpum.GstCtx, KvmEvents.nmi.masked != 0);
 
@@ -1865 +1868 @@
         { /* probably likely */ }
         else
-            KvmEvents.interrupt.shadow = KVM_X86_SHADOW_INT_MOV_SS | KVM_X86_SHADOW_INT_STI;
+            KvmEvents.interrupt.shadow = (CPUMIsInInterruptShadowAfterSs()  ? KVM_X86_SHADOW_INT_MOV_SS : 0)
+                                       | (CPUMIsInInterruptShadowAfterSti() ? KVM_X86_SHADOW_INT_STI    : 0);
 
         /* No flag - this is updated unconditionally. */
@@ -2049 +2053 @@
     if (!(pVCpu->cpum.GstCtx.fExtrn & CPUMCTX_EXTRN_INHIBIT_INT))
         KvmEvents.interrupt.shadow = !CPUMIsInInterruptShadowWithUpdate(&pVCpu->cpum.GstCtx) ? 0
-                                   : KVM_X86_SHADOW_INT_MOV_SS | KVM_X86_SHADOW_INT_STI;
+                                   :   (CPUMIsInInterruptShadowAfterSs()  ? KVM_X86_SHADOW_INT_MOV_SS : 0)
+                                     | (CPUMIsInInterruptShadowAfterSti() ? KVM_X86_SHADOW_INT_STI    : 0);
     else
-        CPUMUpdateInterruptShadowEx(&pVCpu->cpum.GstCtx, KvmEvents.interrupt.shadow != 0, pRun->s.regs.regs.rip);
+        CPUMUpdateInterruptShadowSsStiEx(&pVCpu->cpum.GstCtx,
+                                         RT_BOOL(KvmEvents.interrupt.shadow & KVM_X86_SHADOW_INT_MOV_SS),
+                                         RT_BOOL(KvmEvents.interrupt.shadow & KVM_X86_SHADOW_INT_MOV_STI),
+                                         pRun->s.regs.regs.rip);
 
     if (!(pVCpu->cpum.GstCtx.fExtrn & CPUMCTX_EXTRN_INHIBIT_NMI))