Commit c237d765 authored by Sean Christopherson's avatar Sean Christopherson Committed by Zheng Zengkai
Browse files

KVM: SVM: Drop VMXE check from svm_set_cr4() 

stable inclusion
from stable-v5.10.137
commit 2f04a04d06509fbba0a4069dba5d71010139d921
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I60PLB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2f04a04d06509fbba0a4069dba5d71010139d921



--------------------------------

[ Upstream commit 311a0659 ]

Drop svm_set_cr4()'s explicit check CR4.VMXE now that common x86 handles
the check by incorporating VMXE into the CR4 reserved bits, via
kvm_cpu_caps.  SVM obviously does not set X86_FEATURE_VMX.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20201007014417.29276-4-sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: default avatarWei Li <liwei391@huawei.com>
parent 26296e1c

arch/x86/kvm/svm/svm.c

+0 −3
Original line number Diff line number Diff line
@@ -1697,9 +1697,6 @@ int svm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) 
	unsigned long host_cr4_mce = cr4_read_shadow() & X86_CR4_MCE;

	unsigned long old_cr4 = to_svm(vcpu)->vmcb->save.cr4;



	if (cr4 & X86_CR4_VMXE)

		return 1;



	if (npt_enabled && ((old_cr4 ^ cr4) & X86_CR4_PGE))

		svm_flush_tlb(vcpu);