Changeset 50918 in vbox

Timestamp:

Mar 28, 2014 2:37:18 PM (11 years ago)

Author:

vboxsync

Message:

VMM/HM: Fix some selector limit checks, comments.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMVMXR0.cpp (modified) (4 diffs)
• VMMR3/HM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -2955 +2955 @@
      * is effectively what the CPU does for "scaling by 8". TI is always 0 and RPL should be too in most cases.
      */
-    if ((uSelTR & X86_SEL_MASK) > Gdtr.cbGdt)
+    if ((uSelTR | X86_SEL_RPL_LDT) > Gdtr.cbGdt)
     {
         AssertMsgFailed(("hmR0VmxSaveHostSegmentRegs: TR selector exceeds limit. TR=%RTsel cbGdt=%#x\n", uSelTR, Gdtr.cbGdt));
@@ -7043 +7043 @@
             hmR0VmxSetIntWindowExitVmcs(pVCpu);
     }
+    /*
+     * Check if the guest can receive external interrupts (PIC/APIC). Once we do PDMGetInterrupt() we -must- deliver
+     * the interrupt ASAP. We must not execute any guest code until we inject the interrupt.
+     */
     else if (   VMCPU_FF_IS_PENDING(pVCpu, (VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC))
              && !pVCpu->hm.s.fSingleInstruction)
     {
-        /*
-         * Check if the guest can receive external interrupts (PIC/APIC). Once we do PDMGetInterrupt() we -must- deliver
-         * the interrupt ASAP. We must not execute any guest code until we inject the interrupt which is why it is
-         * evaluated here and not set as pending, solely based on the force-flags.
-         */
         int rc = hmR0VmxSaveGuestRflags(pVCpu, pMixedCtx);
         AssertRC(rc);
@@ -7626 +7625 @@
     rc = VMXWriteVmcs32(VMX_VMCS_GUEST_PENDING_DEBUG_EXCEPTIONS, 0);
     AssertRC(rc);
+
+    /* We deliberately don't clear "hm.s.Event.fPending" here, it's taken
+       care of in hmR0VmxExitToRing3() converting the pending event to TRPM. */
 }
 
@@ -8121 +8123 @@
         return VINF_EM_RAW_TO_R3;
     }
+
     if (RTThreadPreemptIsPending(NIL_RTTHREAD))
     {

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

@@ -2523 +2523 @@
                 if (pCtx->gdtr.cbGdt)
                 {
-                    if (pCtx->tr.Sel > pCtx->gdtr.cbGdt)
+                    if ((pCtx->tr.Sel | X86_SEL_RPL_LDT) > pCtx->gdtr.cbGdt)
                     {
                         STAM_COUNTER_INC(&pVCpu->hm.s.StatVmxCheckBadTr);
                         return false;
                     }
-                    else if (pCtx->ldtr.Sel > pCtx->gdtr.cbGdt)
+                    else if ((pCtx->ldtr.Sel | X86_SEL_RPL_LDT) > pCtx->gdtr.cbGdt)
                     {
                         STAM_COUNTER_INC(&pVCpu->hm.s.StatVmxCheckBadLdt);