diff options
| author |   Robert Hoo <robert.hu@linux.intel.com> | 2023-03-08 15:29:36 +0800 |
|---|---|---|
| committer |   Sean Christopherson <seanjc@google.com> | 2023-03-23 16:08:29 -0700 |
| commit | 99b30869804ea59d9596cdbefa5cc3aabd588521 (patch) | |
| tree | 16e728c6abcbdc94e4e28a0b3cea7a14484e0c06 | |
| parent | KVM: x86: Assert that the emulator doesn't load CS with garbage in !RM (diff) | |
| download | wireguard-linux-99b30869804ea59d9596cdbefa5cc3aabd588521.tar.xz wireguard-linux-99b30869804ea59d9596cdbefa5cc3aabd588521.zip | |
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: Xiaoyao Li <xiaoyao.li@intel.com>
Signed-off-by: Robert Hoo <robert.hu@linux.intel.com>
Fixes: 4683d758f48e ("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: Sean Christopherson <seanjc@google.com>
| -rw-r--r-- | arch/x86/kvm/x86.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 3fab192862d4..2e0933f510ee 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -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; |