Changeset 92520 in vbox

Timestamp:

Nov 20, 2021 2:19:53 AM (3 years ago)

Author:

vboxsync

Message:

VMM/NEM-linux,EM: The interrupt injection code in emR3ForcedActions is ASSUMING that no interrupt state is external when it's considering calling TRPMR3InjectEvent. So, make sure the NEM-linux code import this state when returning to the EM loop and make sure we don't try inject more than one interrupt at a time. bugref:9044

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• EM.cpp (modified) (1 diff)
• NEMR3Native-linux.cpp (modified) (2 diffs)

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

@@ -1902 +1902 @@
          * Guest event injection.
          */
+        Assert(!(pVCpu->cpum.GstCtx.fExtrn & (CPUMCTX_EXTRN_INHIBIT_INT | CPUMCTX_EXTRN_INHIBIT_NMI)));
         bool fWakeupPending = false;
         if (   !VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY)

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

@@ -1905 +1905 @@
 static VBOXSTRICTRC nemHCLnxHandleInterruptFF(PVM pVM, PVMCPU pVCpu, struct kvm_run *pRun)
 {
-    Assert(!TRPMHasTrap(pVCpu));
     RT_NOREF_PV(pVM);
+
+    /*
+     * Do not doing anything if TRPM has something pending already as we can
+     * only inject one event per KVM_RUN call.  This can only happend if we
+     * can directly from the loop in EM, so the inhibit bits must be internal.
+     */
+    if (!TRPMHasTrap(pVCpu))
+    { /* semi likely */ }
+    else
+    {
+        Assert(!(pVCpu->cpum.GstCtx.fExtrn & (CPUMCTX_EXTRN_INHIBIT_INT | CPUMCTX_EXTRN_INHIBIT_NMI)));
+        Log8(("nemHCLnxHandleInterruptFF: TRPM has an pending event already\n"));
+        return VINF_SUCCESS;
+    }
 
     /*
@@ -2537 +2550 @@
     {
         /* Try anticipate what we might need. */
-        uint64_t fImport = IEM_CPUMCTX_EXTRN_MUST_MASK;
+        uint64_t fImport = CPUMCTX_EXTRN_INHIBIT_INT | CPUMCTX_EXTRN_INHIBIT_NMI /* Required for processing APIC,PIC,NMI & SMI FFs. */
+                         | IEM_CPUMCTX_EXTRN_MUST_MASK /*?*/;
         if (   (rcStrict >= VINF_EM_FIRST && rcStrict <= VINF_EM_LAST)
             || RT_FAILURE(rcStrict))