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

Timestamp:

Nov 21, 2021 12:08:49 AM (3 years ago)

Author:

vboxsync

Message:

VMM/NEM-linux: Exit history updates. bugref:9044

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• NEMR3.cpp (modified) (2 diffs)
• NEMR3Native-linux.cpp (modified) (10 diffs)

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

@@ -393 +393 @@
     switch ((NEMEXITTYPE)uExit)
     {
+        case NEMEXITTYPE_INTTERRUPT_WINDOW:             return "NEM interrupt window";
+        case NEMEXITTYPE_HALT:                          return "NEM halt";
+
         case NEMEXITTYPE_UNRECOVERABLE_EXCEPTION:       return "NEM unrecoverable exception";
         case NEMEXITTYPE_INVALID_VP_REGISTER_VALUE:     return "NEM invalid vp register value";
-        case NEMEXITTYPE_INTTERRUPT_WINDOW:             return "NEM interrupt window";
-        case NEMEXITTYPE_HALT:                          return "NEM halt";
         case NEMEXITTYPE_XCPT_UD:                       return "NEM #UD";
         case NEMEXITTYPE_XCPT_DB:                       return "NEM #DB";
@@ -402 +403 @@
         case NEMEXITTYPE_CANCELED:                      return "NEM canceled";
         case NEMEXITTYPE_MEMORY_ACCESS:                 return "NEM memory access";
+
+        case NEMEXITTYPE_INTERNAL_ERROR_EMULATION:      return "NEM emulation IPE";
+        case NEMEXITTYPE_INTERNAL_ERROR_FATAL:          return "NEM fatal IPE";
+        case NEMEXITTYPE_INTERRUPTED:                   return "NEM interrupted";
+        case NEMEXITTYPE_FAILED_ENTRY:                  return "NEM failed VT-x/AMD-V entry";
+
+        case NEMEXITTYPE_INVALID:
+        case NEMEXITTYPE_END:
+            break;
     }
 

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

@@ -621 +621 @@
  *
  * The KVM_SET_CPUID2 call replaces any previous leaves, so we have to redo
- * everything when there really just are single bit changes.
+ * everything when there really just are single bit changes.  That said, it
+ * looks like KVM update the XCR/XSAVE related stuff as well as the APIC enabled
+ * bit(s), so it should suffice if we do this at startup, I hope.
  */
 static int nemR3LnxUpdateCpuIdsLeaves(PVM pVM, PVMCPU pVCpu)
@@ -2066 +2068 @@
          pRun->internal.suberror, pRun->internal.ndata, sizeof(pRun->internal.data), &pRun->internal.data[0]));
 
-    EMHistoryAddExit(pVCpu, EMEXIT_MAKE_FT(EMEXIT_F_KIND_NEM, KVM_EXIT_INTERNAL_ERROR),
-                     pRun->s.regs.regs.rip + pRun->s.regs.sregs.cs.base, ASMReadTSC());
-
     /*
      * Deal with each suberror, returning if we don't want IEM to handle it.
@@ -2076 +2075 @@
         case KVM_INTERNAL_ERROR_EMULATION:
         {
+            EMHistoryAddExit(pVCpu, EMEXIT_MAKE_FT(EMEXIT_F_KIND_NEM, NEMEXITTYPE_INTERNAL_ERROR_EMULATION),
+                             pRun->s.regs.regs.rip + pRun->s.regs.sregs.cs.base, ASMReadTSC());
             STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatExitInternalErrorEmulation);
             break;
@@ -2085 +2086 @@
         default:
         {
+            EMHistoryAddExit(pVCpu, EMEXIT_MAKE_FT(EMEXIT_F_KIND_NEM, NEMEXITTYPE_INTERNAL_ERROR_FATAL),
+                             pRun->s.regs.regs.rip + pRun->s.regs.sregs.cs.base, ASMReadTSC());
+            STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatExitInternalErrorFatal);
             const char *pszName;
             switch (pRun->internal.suberror)
@@ -2094 +2098 @@
                 default:                                        pszName = "unknown"; break;
             }
-            STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatExitInternalErrorFatal);
             LogRel(("NEM: KVM_EXIT_INTERNAL_ERROR! suberror=%#x (%s) ndata=%u data=%.*Rhxs\n", pRun->internal.suberror, pszName,
                     pRun->internal.ndata, sizeof(pRun->internal.data), &pRun->internal.data[0]));
@@ -2268 +2271 @@
 
         case KVM_EXIT_IRQ_WINDOW_OPEN:
-            EMHistoryAddExit(pVCpu, EMEXIT_MAKE_FT(EMEXIT_F_KIND_NEM, KVM_EXIT_IRQ_WINDOW_OPEN),
+            EMHistoryAddExit(pVCpu, EMEXIT_MAKE_FT(EMEXIT_F_KIND_NEM, NEMEXITTYPE_INTTERRUPT_WINDOW),
                              pRun->s.regs.regs.rip + pRun->s.regs.sregs.cs.base, ASMReadTSC());
             STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatExitIrqWindowOpen);
@@ -2296 +2299 @@
 
         case KVM_EXIT_HLT:
-            EMHistoryAddExit(pVCpu, EMEXIT_MAKE_FT(EMEXIT_F_KIND_NEM, KVM_EXIT_HLT),
+            EMHistoryAddExit(pVCpu, EMEXIT_MAKE_FT(EMEXIT_F_KIND_NEM, NEMEXITTYPE_HALT),
                              pRun->s.regs.regs.rip + pRun->s.regs.sregs.cs.base, ASMReadTSC());
             STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatExitHalt);
@@ -2303 +2306 @@
 
         case KVM_EXIT_INTR: /* EINTR */
-            EMHistoryAddExit(pVCpu, EMEXIT_MAKE_FT(EMEXIT_F_KIND_NEM, KVM_EXIT_INTR),
+            EMHistoryAddExit(pVCpu, EMEXIT_MAKE_FT(EMEXIT_F_KIND_NEM, NEMEXITTYPE_INTERRUPTED),
                              pRun->s.regs.regs.rip + pRun->s.regs.sregs.cs.base, ASMReadTSC());
             STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatExitIntr);
@@ -2348 +2351 @@
             LogRel(("NEM: KVM_EXIT_FAIL_ENTRY! hardware_entry_failure_reason=%#x cpu=%#x\n",
                     pRun->fail_entry.hardware_entry_failure_reason, pRun->fail_entry.cpu));
+            EMHistoryAddExit(pVCpu, EMEXIT_MAKE_FT(EMEXIT_F_KIND_NEM, NEMEXITTYPE_FAILED_ENTRY),
+                             pRun->s.regs.regs.rip + pRun->s.regs.sregs.cs.base, ASMReadTSC());
             return VERR_NEM_IPE_1;
 
@@ -2556 +2561 @@
         int rcLnx = ioctl(pVCpu->nem.s.fdVCpu, KVM_RUN, 0UL);
         pRun->immediate_exit = 0;
-        Log(("NEM/%u: Flushed stateful exit -> %d/%d exit_reason=%d\n", pVCpu->idCpu, rcLnx, errno, pRun->exit_reason));
+        Log(("NEM/%u: Flushed stateful exit -> %d/%d exit_reason=%d\n", pVCpu->idCpu, rcLnx, errno, pRun->exit_reason)); RT_NOREF(rcLnx);
         STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatFlushExitOnReturn);
     }