Commit 6c032f12 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

Revert "KVM: MMU: record maximum physical address width in kvm_mmu_extended_role" 



Drop MAXPHYADDR from mmu_role now that all MMUs have their role
invalidated after a CPUID update.  Invalidating the role forces all MMUs
to re-evaluate the guest's MAXPHYADDR, and the guest's MAXPHYADDR can
only be changed only through a CPUID update.

This reverts commit de3ccd26.

Cc: Yu Zhang <yu.c.zhang@linux.intel.com>
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210622175739.3610207-9-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 63f5a190

arch/x86/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -321,7 +321,6 @@ union kvm_mmu_extended_role { 
		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
@@ -4538,7 +4538,6 @@ static union kvm_mmu_extended_role kvm_calc_mmu_role_ext(struct kvm_vcpu *vcpu) 
	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;