Commit 99b30869 authored by Robert Hoo's avatar Robert Hoo Committed by Sean Christopherson
Browse files

KVM: x86: Remove a redundant guest cpuid check in kvm_set_cr4() 



If !guest_cpuid_has(vcpu, X86_FEATURE_PCID), CR4.PCIDE would have been in
vcpu->arch.cr4_guest_rsvd_bits and failed earlier kvm_is_valid_cr4() check.
Remove this meaningless check.

Reviewed-by: default avatarXiaoyao Li <xiaoyao.li@intel.com>
Signed-off-by: default avatarRobert Hoo <robert.hu@linux.intel.com>
Fixes: 4683d758 ("KVM: x86: Supplement __cr4_reserved_bits() with X86_FEATURE_PCID check")
Link: https://lore.kernel.org/r/20230308072936.1293101-1-robert.hu@intel.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 65966aac

arch/x86/kvm/x86.c

+0 −3
Original line number Diff line number Diff line
@@ -1196,9 +1196,6 @@ int kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) 
		return 1;



	if ((cr4 & X86_CR4_PCIDE) && !(old_cr4 & X86_CR4_PCIDE)) {

		if (!guest_cpuid_has(vcpu, X86_FEATURE_PCID))

			return 1;



		/* PCID can not be enabled when cr3[11:0]!=000H or EFER.LMA=0 */

		if ((kvm_read_cr3(vcpu) & X86_CR3_PCID_MASK) || !is_long_mode(vcpu))

			return 1;