KVM: x86: Fix emulated CPUID features being applied to wrong sub-leaf
PATCH 1/1 KVM: x86: Fix emulated CPUID features being applied to wrong sub-leaf
Pass the CPUID index into cpuid_func_emulated() and return no emulated features for indexed CPUID leaves with a non-zero index.
KVM currently emulates CPUID features only for index 0, but kvm_vcpu_after_set_cpuid() looks up emulated features by function alone. As a result, reverse_cpuid[] entries that share a function but use a non-zero index, e.g. CPUID.7.1:ECX, can inherit emulated features that belong to index 0. For example, RDPID, which is CPUID.7.0:ECX[22], can be incorrectly OR'd into CPUID.7.1:ECX.
This is benign today because the affected bits do not correspond to features KVM cares about, but it can become a real bug as new CPUID features are defined. Make the helper index-aware so emulated features are applied only to the CPUID entry they actually describe.
--- arch/x86/kvm/cpuid.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
arch/x86/kvm/cpuid.c +8 -4
@@ -369,7 +369,7 @@ static u32 cpuid_get_reg_unsafe(struct kvm_cpuid_entry2 *entry, u32 reg) } } -static int cpuid_func_emulated (struct kvm_cpuid_entry2 *entry,u32 func, +static int cpuid_func_emulated (struct kvm_cpuid_entry2 *entry,u32 func,u32 index,bool include_partially_emulated);void kvm_vcpu_after_set_cpuid (struct kvm_vcpu *vcpu)
@@ -399,7 +399,7 @@ void kvm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu)if (!entry)continue ; -cpuid_func_emulated (&emulated, cpuid.function, true); +cpuid_func_emulated (&emulated, cpuid.function, cpuid.index, true);/* * A vCPU has a feature if it's supported by KVM and is enabled
@@ -1368,11 +1368,15 @@ static struct kvm_cpuid_entry2 *do_host_cpuid(struct kvm_cpuid_array *array,return entry; } -static int cpuid_func_emulated (struct kvm_cpuid_entry2 *entry,u32 func, +static int cpuid_func_emulated (struct kvm_cpuid_entry2 *entry,u32 func,u32 index,bool include_partially_emulated) {memset (entry,0 ,sizeof (*entry)); +/* KVM doesn't currently emulate any non-zero indices. */ +if (cpuid_function_is_indexed (func) && index) +return 0 ; + entry->function = func; entry->index =0 ; entry->flags =0 ;
@@ -1410,7 +1414,7 @@ static int __do_cpuid_func_emulated(struct kvm_cpuid_array *array, u32 func)if (array->nent >= array->maxnent)return -E2BIG ; - array->nent +=cpuid_func_emulated (&array->entries[array->nent], func, false); + array->nent +=cpuid_func_emulated (&array->entries[array->nent], func,0 , false);return 0 ; }
base-commit: de3a35be92d2391ece4bf3143ef2887192625fd0
Signature · 1 line
2.46.0
Quoted 10 lines · Binbin Wu
Pass the CPUID index into
cpuid_func_emulated()and return no emulated features for indexed CPUID leaves with a non-zero index.KVM currently emulates CPUID features only for index 0, but
kvm_vcpu_after_set_cpuid()looks up emulated features by function alone. As a result, reverse_cpuid[] entries that share a function but use a non-zero index, e.g. CPUID.7.1:ECX, can inherit emulated features that belong to index 0. For example, RDPID, which is CPUID.7.0:ECX[22], can be incorrectly OR'd into CPUID.7.1:ECX.
Quoted 8 lines
This is benign today because the affected bits do not correspond to features KVM cares about, but it can become a real bug as new CPUID features are defined. Make the helper index-aware so emulated features are applied only to the CPUID entry they actually describe.
Fixes e592ec657d84 ("KVM: x86: Initialize guest cpu_caps based on KVM support")Suggested-by Sean Christopherson <[email protected]>Signed-off-by Binbin Wu <[email protected]>
Quoted 11 lines · Binbin Wu
Pass the CPUID index into
cpuid_func_emulated()and return no emulated features for indexed CPUID leaves with a non-zero index.KVM currently emulates CPUID features only for index 0, but
kvm_vcpu_after_set_cpuid()looks up emulated features by function alone. As a result, reverse_cpuid[] entries that share a function but use a non-zero index, e.g. CPUID.7.1:ECX, can inherit emulated features that belong to index 0. For example, RDPID, which is CPUID.7.0:ECX[22], can be incorrectly OR'd into CPUID.7.1:ECX.[...]
Applied to kvm-x86 misc, thanks!
[1/1] KVM: x86: Fix emulated CPUID features being applied to wrong sub-leaf
https://github.com/kvm-x86/linux/commit/8835a24a5608