Commit 2c9afa52 authored by Gleb Natapov's avatar Gleb Natapov Committed by Marcelo Tosatti
Browse files

KVM: MMU: set base_role.nxe during mmu initialization. 



Move base_role.nxe initialisation to where all other roles are initialized.

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 9bb4f6b1

arch/x86/kvm/mmu.c

+1 −0
Original line number Diff line number Diff line
@@ -3687,6 +3687,7 @@ int kvm_init_shadow_mmu(struct kvm_vcpu *vcpu, struct kvm_mmu *context) 
	else

		r = paging32_init_context(vcpu, context);



	vcpu->arch.mmu.base_role.nxe = is_nx(vcpu);

	vcpu->arch.mmu.base_role.cr4_pae = !!is_pae(vcpu);

	vcpu->arch.mmu.base_role.cr0_wp  = is_write_protection(vcpu);

	vcpu->arch.mmu.base_role.smep_andnot_wp

arch/x86/kvm/x86.c

+0 −2
Original line number Diff line number Diff line
@@ -870,8 +870,6 @@ static int set_efer(struct kvm_vcpu *vcpu, u64 efer) 


	kvm_x86_ops->set_efer(vcpu, efer);



	vcpu->arch.mmu.base_role.nxe = (efer & EFER_NX) && !tdp_enabled;



	/* Update reserved bits */

	if ((efer ^ old_efer) & EFER_NX)

		kvm_mmu_reset_context(vcpu);