Commit 8053f924 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86/mmu: Drop kvm_mmu_extended_role.cr4_la57 hack 



Drop kvm_mmu_extended_role.cr4_la57 now that mmu_role doesn't mask off
level, which already incorporates the guest's CR4.LA57 for a shadow MMU
by querying is_la57_mode().

Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a102a674

arch/x86/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -300,7 +300,6 @@ union kvm_mmu_extended_role { 
		unsigned int cr4_pke:1;

		unsigned int cr4_smap:1;

		unsigned int cr4_smep:1;

		unsigned int cr4_la57:1;

		unsigned int maxphyaddr:6;

	};

};

arch/x86/kvm/mmu/mmu.c

+0 −1
Original line number Diff line number Diff line
@@ -4873,7 +4873,6 @@ static union kvm_mmu_extended_role kvm_calc_mmu_role_ext(struct kvm_vcpu *vcpu) 
	ext.cr4_smap = !!kvm_read_cr4_bits(vcpu, X86_CR4_SMAP);

	ext.cr4_pse = !!is_pse(vcpu);

	ext.cr4_pke = !!kvm_read_cr4_bits(vcpu, X86_CR4_PKE);

	ext.cr4_la57 = !!kvm_read_cr4_bits(vcpu, X86_CR4_LA57);

	ext.maxphyaddr = cpuid_maxphyaddr(vcpu);



	ext.valid = 1;