mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-14 12:37:32 +00:00
KVM: x86: Check INVPCID feature bit in EBX of leaf 7
Checks and operations on the INVPCID feature bit should use EBX of CPUID leaf 7 instead of ECX. Signed-off-by: Junjie Mao <junjie.mao@intel.com> Signed-off-by: Yongjie Ren <yongjien.ren@intel.com> Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
parent
749c59fd15
commit
4f97704555
1 changed files with 2 additions and 2 deletions
|
@ -6575,7 +6575,7 @@ static void vmx_cpuid_update(struct kvm_vcpu *vcpu)
|
||||||
/* Exposing INVPCID only when PCID is exposed */
|
/* Exposing INVPCID only when PCID is exposed */
|
||||||
best = kvm_find_cpuid_entry(vcpu, 0x7, 0);
|
best = kvm_find_cpuid_entry(vcpu, 0x7, 0);
|
||||||
if (vmx_invpcid_supported() &&
|
if (vmx_invpcid_supported() &&
|
||||||
best && (best->ecx & bit(X86_FEATURE_INVPCID)) &&
|
best && (best->ebx & bit(X86_FEATURE_INVPCID)) &&
|
||||||
guest_cpuid_has_pcid(vcpu)) {
|
guest_cpuid_has_pcid(vcpu)) {
|
||||||
exec_control |= SECONDARY_EXEC_ENABLE_INVPCID;
|
exec_control |= SECONDARY_EXEC_ENABLE_INVPCID;
|
||||||
vmcs_write32(SECONDARY_VM_EXEC_CONTROL,
|
vmcs_write32(SECONDARY_VM_EXEC_CONTROL,
|
||||||
|
@ -6585,7 +6585,7 @@ static void vmx_cpuid_update(struct kvm_vcpu *vcpu)
|
||||||
vmcs_write32(SECONDARY_VM_EXEC_CONTROL,
|
vmcs_write32(SECONDARY_VM_EXEC_CONTROL,
|
||||||
exec_control);
|
exec_control);
|
||||||
if (best)
|
if (best)
|
||||||
best->ecx &= ~bit(X86_FEATURE_INVPCID);
|
best->ebx &= ~bit(X86_FEATURE_INVPCID);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue