Changeset 38816 in vbox for trunk/src/VBox

Timestamp:

Sep 21, 2011 1:50:57 PM (13 years ago)

Author:

vboxsync

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

74111

Message:

HWSVMR0.cpp: Addendum to r73226 and #5666 - Since we update SS.DPL with the CPL, we must always read the CPL from SS.DPL.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/CPUMAllRegs.cpp (modified) (1 diff)
• VMMR0/HWSVMR0.cpp (modified) (2 diffs)

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

@@ -2341 +2341 @@
          * This only seems to apply to AMD-V; in the VT-x case we *do* need to look
          * at SS. (ACP2 regression during install after a far call to ring 2)
+         * 
+         * Seems it isn't necessiarly true for newer AMD-V CPUs even, we have
+         * to move the VMCB.guest.u8CPL into Attr.n.u2Dpl to make this (and
+         * other) code work right.  So, forget CS.DPL, always use SS.DPL.
          */
         if (RT_LIKELY(pVCpu->cpum.s.Guest.cr0 & X86_CR0_PE))

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

@@ -863 +863 @@
 
     /* Set CPL */
-    pVMCB->guest.u8CPL     = pCtx->csHid.Attr.n.u2Dpl;
+    pVMCB->guest.u8CPL     = pCtx->ssHid.Attr.n.u2Dpl;
 
     /* RAX/EAX too, as VMRUN uses RAX as an implicit parameter. */
@@ -1092 +1092 @@
      * Note! Interrupts must be disabled done *before* we check for TLB flushes; TLB
      *       shootdowns rely on this.
-     */
+     */                                               
     uOldEFlags = ASMIntDisableFlags();
     if (RTThreadPreemptIsPending(NIL_RTTHREAD))