Changeset 96821 in vbox

Timestamp:

Sep 22, 2022 12:35:59 AM (2 years ago)

Author:

vboxsync

Message:

VMM/IEM: Define separate log groups for the VMX and SVM code in IEM since we're more or less out of log levels to use in IEM (and the code isn't following the assignments). Defined Log2 to be for logging vmexits. Needs more cleaning up.

Location:

trunk

Files:

• include/VBox/log.h (modified) (2 diffs)
• src/VBox/VMM/VMMAll/IEMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/IEMAllCImplSvmInstr.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp (modified) (4 diffs)

trunk/include/VBox/log.h

@@ -303 +303 @@
     /** IEM group. */
     LOG_GROUP_IEM,
+    /** IEM AMD-V group. */
+    LOG_GROUP_IEM_SVM,
+    /** IEM VT-x group. */
+    LOG_GROUP_IEM_VMX,
     /** I/O buffer management group. */
     LOG_GROUP_IOBUFMGMT,
@@ -963 +967 @@
     "HM", \
     "IEM", \
+    "IEM_SVM", \
+    "IEM_VMX", \
     "IOBUFMGMT", \
     "IOM", \

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -83 +83 @@
  *      - Level 10 (Log10): TLBs.
  *      - Level 11 (Log11): Unmasked FPU exceptions.
+ *
+ * The SVM (AMD-V) and VMX (VT-x) code has the following assignments:
+ *      - Level 1  (Log)  : Errors and other major events.
+ *      - Flow (LogFlow)  : Misc flow stuff (cleanup?)
+ *      - Level 2  (Log2) : VM exits.
  */
 

trunk/src/VBox/VMM/VMMAll/IEMAllCImplSvmInstr.cpp

@@ -30 +30 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#define LOG_GROUP   LOG_GROUP_IEM
+#define LOG_GROUP   LOG_GROUP_IEM_SVM
 #define VMCPU_INCL_CPUM_GST_CTX
 #include <VBox/vmm/iem.h>
@@ -120 +120 @@
  * Performs an SVM world-switch (VMRUN, \#VMEXIT) updating PGM and IEM internals.
  *
- * @returns Strict VBox status code.
+ * @returns Strict VBox status code from PGMChangeMode.
  * @param   pVCpu   The cross context virtual CPU structure.
  */
@@ -165 +165 @@
         || uExitCode == SVM_EXIT_INVALID)
     {
-        LogFlow(("iemSvmVmexit: CS:RIP=%04x:%08RX64 uExitCode=%#RX64 uExitInfo1=%#RX64 uExitInfo2=%#RX64\n",
-                 pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip, uExitCode, uExitInfo1, uExitInfo2));
+        Log2(("iemSvmVmexit: CS:RIP=%04x:%08RX64 uExitCode=%#RX64 uExitInfo1=%#RX64 uExitInfo2=%#RX64\n",
+              pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip, uExitCode, uExitInfo1, uExitInfo2));
 
         /*

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp

@@ -30 +30 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#define LOG_GROUP   LOG_GROUP_IEM
+#define LOG_GROUP   LOG_GROUP_IEM_VMX
 #define VMCPU_INCL_CPUM_GST_CTX
 #include <VBox/vmm/iem.h>
@@ -2462 +2462 @@
     pVmcs->u64RoExitQual.u = u64ExitQual;
 
-    LogFlow(("vmexit: reason=%u qual=%#RX64 cs:rip=%04x:%#RX64 cr0=%#RX64 cr3=%#RX64 cr4=%#RX64 eflags=%#RX32\n", uExitReason,
-             pVmcs->u64RoExitQual.u, pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip, pVCpu->cpum.GstCtx.cr0,
-             pVCpu->cpum.GstCtx.cr3, pVCpu->cpum.GstCtx.cr4, pVCpu->cpum.GstCtx.eflags.u32));
+    Log2(("vmexit: reason=%u qual=%#RX64 cs:rip=%04x:%#RX64 cr0=%#RX64 cr3=%#RX64 cr4=%#RX64 eflags=%#RX32\n", uExitReason,
+          pVmcs->u64RoExitQual.u, pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip, pVCpu->cpum.GstCtx.cr0,
+          pVCpu->cpum.GstCtx.cr3, pVCpu->cpum.GstCtx.cr4, pVCpu->cpum.GstCtx.eflags.u32));
 
     /*
@@ -2497 +2497 @@
                 iemVmxVmcsSetIdtVectoringInfo(pVCpu, uIdtVectoringInfo);
                 iemVmxVmcsSetIdtVectoringErrCode(pVCpu, uErrCode);
-                LogFlow(("vmexit: idt_info=%#RX32 idt_err_code=%#RX32 cr2=%#RX64\n", uIdtVectoringInfo, uErrCode,
-                         pVCpu->cpum.GstCtx.cr2));
+                Log2(("vmexit: idt_info=%#RX32 idt_err_code=%#RX32 cr2=%#RX64\n", uIdtVectoringInfo, uErrCode,
+                      pVCpu->cpum.GstCtx.cr2));
             }
         }
@@ -2604 +2604 @@
     }
     else
-        Log3(("vmexit: Loading host-state failed. uExitReason=%u rc=%Rrc\n", uExitReason, VBOXSTRICTRC_VAL(rcStrict)));
+        Log(("vmexit: Loading host-state failed. uExitReason=%u rc=%Rrc\n", uExitReason, VBOXSTRICTRC_VAL(rcStrict)));
 
     if (VM_IS_HM_ENABLED(pVCpu->CTX_SUFF(pVM)))