Avi Kivity wrote: > From: Avi Kivity <[email protected]> > > Don't allow a vcpu with cr4.pge cleared to use a shadow page created with > cr4.pge set; this might cause a cr3 switch not to sync ptes that have the > global bit set (the global bit has no effect if !cr4.pge). > > This can only occur on smp with different cr4.pge settings for different > vcpus (since a cr4 change will resync the shadow ptes), but there's no > cost to being correct here. > > Signed-off-by: Avi Kivity <[email protected]> > > diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h > index f49bfd0..ab8ef1d 100644 > --- a/arch/x86/include/asm/kvm_host.h > +++ b/arch/x86/include/asm/kvm_host.h > @@ -183,6 +183,7 @@ union kvm_mmu_page_role { > unsigned metaphysical:1; > unsigned access:3; > unsigned invalid:1; > + unsigned cr4_pge:1; > }; > }; > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index c4da7fb..aa4575c 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -363,6 +363,7 @@ void kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) > } > kvm_x86_ops->set_cr4(vcpu, cr4); > vcpu->arch.cr4 = cr4; > + vcpu->arch.mmu.base_role.cr4_pge = !!(cr4 & X86_CR4_PGE); >
This line broke VMware ESX bootup using NPT on one VCPU for me. If I comment it out and apply my patches to actually make ESX run, it boots again. Alex > kvm_mmu_sync_global(vcpu); > kvm_mmu_reset_context(vcpu); > } > -- > To unsubscribe from this list: send the line "unsubscribe kvm-commits" in > the body of a message to [email protected] > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
