Changeset 79073 in vbox for trunk/include/VBox

Timestamp:

Jun 11, 2019 5:26:37 AM (6 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:9180 With HM execution of nested-guests, we merge the guest/host mask of the guest and nested-guest. Hence, while constructing the read-shadow, we must use the merged mask. Pass the merged mask as a parameter to CPUMGetGuestVmxMasked[Cr0|Cr4] as otherwise it will continue to use the original mask from the nested-guest VMCS instead.

File:

• trunk/include/VBox/vmm/cpum.h (modified) (4 diffs)

trunk/include/VBox/vmm/cpum.h

@@ -2214 +2214 @@
  *
  * @returns The nested-guest CR0.
- * @param   pVCpu       The cross context virtual CPU structure of the calling EMT.
- * @param   pCtx        Pointer to the context.
- */
-DECLINLINE(uint64_t) CPUMGetGuestVmxMaskedCr0(PCVMCPU pVCpu, PCCPUMCTX pCtx)
+ * @param   pVCpu           The cross context virtual CPU structure of the calling EMT.
+ * @param   pCtx            Pointer to the context.
+ * @param   fGstHostMask    The CR0 guest/host mask to use.
+ */
+DECLINLINE(uint64_t) CPUMGetGuestVmxMaskedCr0(PCVMCPU pVCpu, PCCPUMCTX pCtx, uint64_t fGstHostMask)
 {
     /*
@@ -2231 +2232 @@
     Assert(pVmcs);
     uint64_t const uGstCr0      = pCtx->cr0;
-    uint64_t const fGstHostMask = pVmcs->u64Cr0Mask.u;
     uint64_t const fReadShadow  = pVmcs->u64Cr0ReadShadow.u;
     return (fReadShadow & fGstHostMask) | (uGstCr0 & ~fGstHostMask);
@@ -2240 +2240 @@
  *
  * @returns The nested-guest CR4.
- * @param   pVCpu       The cross context virtual CPU structure of the calling EMT.
- * @param   pCtx        Pointer to the context.
- */
-DECLINLINE(uint64_t) CPUMGetGuestVmxMaskedCr4(PCVMCPU pVCpu, PCCPUMCTX pCtx)
+ * @param   pVCpu           The cross context virtual CPU structure of the calling EMT.
+ * @param   pCtx            Pointer to the context.
+ * @param   fGstHostMask    The CR4 guest/host mask to use.
+ */
+DECLINLINE(uint64_t) CPUMGetGuestVmxMaskedCr4(PCVMCPU pVCpu, PCCPUMCTX pCtx, uint64_t fGstHostMask)
 {
     /*
@@ -2257 +2258 @@
     Assert(pVmcs);
     uint64_t const uGstCr4      = pCtx->cr4;
-    uint64_t const fGstHostMask = pVmcs->u64Cr4Mask.u;
     uint64_t const fReadShadow  = pVmcs->u64Cr4ReadShadow.u;
     return (fReadShadow & fGstHostMask) | (uGstCr4 & ~fGstHostMask);