KVM: x86: Make sure KVM_CPUID_FEATURES really are KVM_CPUID_FEATURES
PATCH 1/1 KVM: x86: Make sure KVM_CPUID_FEATURES really are KVM_CPUID_FEATURES
From: Paul Durrant <[email protected]>
Currently when kvm_update_cpuid_runtime() runs, it assumes that the KVM_CPUID_FEATURES leaf is located at 0x40000001. This is not true, however, if Hyper-V support is enabled. In this case the KVM leaves will be offset.
This patch introdues as new 'kvm_cpuid_base' field into struct kvm_vcpu_arch to track the location of the KVM leaves and function kvm_update_cpuid_base() (called from kvm_update_cpuid_runtime()) to locate the leaves using the 'KVMKVMKVM\0\0\0' signature. Adjustment of KVM_CPUID_FEATURES will hence now target the correct leaf.
---
Cc: Paolo Bonzini <[email protected]>
Cc: Sean Christopherson <[email protected]>
Cc: Vitaly Kuznetsov <[email protected]>
Cc: Wanpeng Li <[email protected]>
Cc: Jim Mattson <[email protected]>
Cc: Joerg Roedel <[email protected]>
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/cpuid.c | 50 +++++++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 5 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -725,6 +725,7 @@ struct kvm_vcpu_arch {int cpuid_nent;struct kvm_cpuid_entry2 *cpuid_entries; +u32 kvm_cpuid_base;u64 reserved_gpa_bits;int maxphyaddr;
arch/x86/kvm/cpuid.c +45 -5
72 lines not on this page · raw message
Signature · 1 line
2.20.1
Sean Christopherson
maintainerQuoted 13 lines · Paul Durrant
From: Paul Durrant <[email protected]>
Currently when
kvm_update_cpuid_runtime()runs, it assumes that theKVM_CPUID_FEATURESleaf is located at0x40000001. This is not true, however, if Hyper-V support is enabled. In this case the KVM leaves will be offset.This patch introdues as new '
kvm_cpuid_base' field into structkvm_vcpu_archto track the location of the KVM leaves and functionkvm_update_cpuid_base()(called fromkvm_update_cpuid_runtime()) to locate the leaves using the 'KVMKVMKVM\0\0\0' signature. Adjustment ofKVM_CPUID_FEATURESwill hence now target the correct leaf.
Quoted 8 lines
Signed-off-by Paul Durrant <[email protected]>---
Cc: Paolo Bonzini <[email protected]>
Cc: Sean Christopherson <[email protected]>
Cc: Vitaly Kuznetsov <[email protected]>
Cc: Wanpeng Li <[email protected]>
Cc: Jim Mattson <[email protected]>
Cc: Joerg Roedel <[email protected]>
scripts/get_maintainer.pl is your friend :-)
Quoted 22 lines
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/cpuid.c | 50 +++++++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 5 deletions(-)arch/x86/include/asm/kvm_host.h +1
-0@@ -725,6 +725,7 @@ struct kvm_vcpu_arch {int cpuid_nent;struct kvm_cpuid_entry2 *cpuid_entries; +u32 kvm_cpuid_base;u64 reserved_gpa_bits;int maxphyaddr;arch/x86/kvm/cpuid.c +0
-0
arch/x86/kvm/cpuid.c static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent) · line 106
Quoted 8 lines
arch/x86/kvm/cpuid.c +5
-0@@ -99,11 +99,46 @@ static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent)return 0 ; } +static void kvm_update_cpuid_base (struct kvm_vcpu *vcpu) +{ +u32 function; + +for (function =0x40000000 ; function <0x40010000 ; function +=0x100 ) {
No small part of me wants to turn hypervisor_cpuid_base() into a macro, but that's probably more pain than gain. But I do think it would be worth providing a macro to iterate over possible bases and share that with the guest-side code.
arch/x86/kvm/cpuid.c static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent) · line 107
Quoted 1 line
arch/x86/kvm/cpuid.c +1
-0+struct kvm_cpuid_entry2 *best =kvm_find_cpuid_entry (vcpu, function,0 );
Declare "struct kvm_cpuid_entry2 *best" outside of the loop to shorten this line. I'd also vote to rename "best" to "entry". KVM's "best" terminology is a remnant of misguided logic that applied Intel's bizarre out-of-range behavior to internal KVM lookups.
arch/x86/kvm/cpuid.c static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent) · line 112
Quoted 5 lines
arch/x86/kvm/cpuid.c +5
-0+ +if (best) { +char signature[12 ]; + + *(u32 *)&signature[0 ] = best->ebx;
Just make signature a u32[3], then the casting craziness goes away.
arch/x86/kvm/cpuid.c static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent) · line 116
Quoted 4 lines
arch/x86/kvm/cpuid.c +4
-0+ *(u32 *)&signature[4 ] = best->ecx; + *(u32 *)&signature[8 ] = best->edx; + +if (!memcmp (signature,"KVMKVMKVM\0\0\0" ,12 ))
The "KVMKVMKVM\0\0\0" magic string belongs in a #define that's shared with the guest-side code. I
arch/x86/kvm/cpuid.c static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent) · line 120
Quoted 4 lines
arch/x86/kvm/cpuid.c +4
-0+break ; + } + } + vcpu->arch.kvm_cpuid_base = function;
Unconditionally setting kvm_cpuid_base is silly because then kvm_get_cpuid_base() needs to check multiple "error" values.
E.g. all of the above can be done as:
struct kvm_cpuid_entry2 *entry;
u32 base, signature[3];
vcpu->arch.kvm_cpuid_base = 0;
virt_for_each_possible_hypervisor_base(base) {
entry = kvm_find_cpuid_entry(vcpu, base, 0);
if (!entry)
continue;
signature[0] = entry->ebx;
signature[1] = entry->ecx;
signature[2] = entry->edx;
if (!memcmp(signature, KVM_CPUID_SIG, sizeof(signature))) {
vcpu->arch.kvm_cpuid_base = base;
break;
}
}arch/x86/kvm/cpuid.c static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent) · line 130
Quoted 10 lines
arch/x86/kvm/cpuid.c +10
-0+} + +static inline bool kvm_get_cpuid_base (struct kvm_vcpu *vcpu,u32 *function) +{ +if (vcpu->arch.kvm_cpuid_base <0x40000000 || + vcpu->arch.kvm_cpuid_base >=0x40010000 ) +return false; + + *function = vcpu->arch.kvm_cpuid_base; +return true;
If '0' is the "doesn't exist" value, then this helper goes away.
arch/x86/kvm/cpuid.c static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent) · line 139
Quoted 10 lines
arch/x86/kvm/cpuid.c +5
-1+} +void kvm_update_pv_runtime (struct kvm_vcpu *vcpu) { +u32 base;struct kvm_cpuid_entry2 *best; - best =kvm_find_cpuid_entry (vcpu,KVM_CPUID_FEATURES ,0 ); +if (!kvm_get_cpuid_base (vcpu, &base)) +return ;
... and then this becomes:
if (!vcpu->arch.kvm_cpuid_base) return;
Actually, since this is a repated pattern and is likely going to be limited to getting KVM_CPUID_FEATURES, just add:
struct kvm_find_cpuid_entry kvm_find_kvm_cpuid_features(void)
{
u32 base = vcpu->arch.kvm_cpuid_base;
if (!base)
return NULL;
return kvm_find_cpuid_entry(vcpu, base | KVM_CPUID_FEATURES, 0);
}and then all of the indentation churn goes away.
Quoted 14 lines
arch/x86/kvm/cpuid.c +3
-0+ + best =kvm_find_cpuid_entry (vcpu, base +KVM_CPUID_FEATURES ,0 );/* * save the feature bitmap to avoid cpuid lookup for every PV @@ -116,6 +151,7 @@ void kvm_update_pv_runtime(struct kvm_vcpu *vcpu)void kvm_update_cpuid_runtime (struct kvm_vcpu *vcpu) {struct kvm_cpuid_entry2 *best; +u32 base; best =kvm_find_cpuid_entry (vcpu,1 ,0 );if (best) {
arch/x86/kvm/cpuid.c void kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu) · line 181
Quoted 8 lines
arch/x86/kvm/cpuid.c +1
-4@@ -142,10 +178,14 @@ void kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu) cpuid_entry_has(best, X86_FEATURE_XSAVEC))) best->ebx = xstate_required_size(vcpu->arch.xcr0, true); - best =kvm_find_cpuid_entry (vcpu,KVM_CPUID_FEATURES ,0 ); -if (kvm_hlt_in_guest (vcpu->kvm) && best && - (best->eax & (1 <<KVM_FEATURE_PV_UNHALT ))) - best->eax &= ~(1 <<KVM_FEATURE_PV_UNHALT ); +kvm_update_cpuid_base (vcpu);
The KVM base doesn't need to be rechecked for runtime updates. Runtime updates are to handle changes in guest state, e.g. reported XSAVE size in response to a CR4.OSXSAVE change. The raw CPUID entries themselves cannot change at runtime. I suspect you did this here because kvm_update_cpuid_runtime() is called before kvm_vcpu_after_set_cpuid(), but that has the very bad side effect of doing an _expensive_ lookup on every runtime update, which can get very painful if there's no KVM_CPUID_FEATURES to be found.
If you include the prep patch (pasted at the bottom), then this can simply be (note the somewhat silly name; I think it's worth clarifying that it's the KVM_CPUID_* base that's being updated):
arch/x86/kvm/cpuid.c +1 -0
@@ -245,6 +245,7 @@ static int kvm_set_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *e2, vcpu->arch.cpuid_entries = e2; vcpu->arch.cpuid_nent = nent; +kvm_update_kvm_cpuid_base (vcpu);kvm_update_cpuid_runtime (vcpu);kvm_vcpu_after_set_cpuid (vcpu);
arch/x86/kvm/cpuid.c void kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu) · line 184
Quoted 3 lines
arch/x86/kvm/cpuid.c +3
-0+ +if (kvm_get_cpuid_base (vcpu, &base)) { + best =kvm_find_cpuid_entry (vcpu, base +KVM_CPUID_FEATURES ,0 );
This is wrong. base will be >0x40000000 and <0x40010000, and KVM_CPUID_FEATURES is 0x40000001, i.e. this will lookup 0x80000001 for the default base. The '+' needs to be an '|'.
Quoted 9 lines
arch/x86/kvm/cpuid.c +4
-0+if (kvm_hlt_in_guest (vcpu->kvm) && best && + (best->eax & (1 <<KVM_FEATURE_PV_UNHALT ))) + best->eax &= ~(1 <<KVM_FEATURE_PV_UNHALT ); + }if (!kvm_check_has_quirk (vcpu->kvm,KVM_X86_QUIRK_MISC_ENABLE_NO_MWAIT )) { best =kvm_find_cpuid_entry (vcpu,0x1 ,0 );Signature · 1 line
2.20.1
From 02d58c124f5aab1b0ef28cfc8a6ff6b6c58df969 Mon Sep 17 00:00:00 2001
From: Sean Christopherson <[email protected]>
Date: Thu, 4 Nov 2021 12:17:23 -0700
Subject: [PATCH] KVM: x86: Add helper to consolidate core logic of
SET_CPUID{2} flows
Move the core logic of SET_CPUID and SET_CPUID2 to a common helper, the only difference between the two ioctls() is the format of the userspace struct. A future fix will add yet more code to the core logic.
No functional change intended.
--- arch/x86/kvm/cpuid.c | 47 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 23 deletions(-)
arch/x86/kvm/cpuid.c +24 -23
68 lines not on this page · raw message
--
Quoted 32 lines
-----Original Message-----
From: Sean Christopherson <[email protected]>
Sent: 04 November 2021 19:23
To: Paul Durrant <[email protected]>
Cc: [email protected]; [email protected]; Durrant, Paul <[email protected]>; Paolo Bonzini <[email protected]>; Vitaly Kuznetsov <[email protected]>; Wanpeng Li <[email protected]>; Jim Mattson <[email protected]>; Joerg Roedel <[email protected]>
Subject: RE: [EXTERNAL] [PATCH] KVM: x86: Make sureKVM_CPUID_FEATURESreally areKVM_CPUID_FEATURESQuoted 13 lines · Paul Durrant
From: Paul Durrant <[email protected]>
Currently when
kvm_update_cpuid_runtime()runs, it assumes that theKVM_CPUID_FEATURESleaf is located at0x40000001. This is not true, however, if Hyper-V support is enabled. In this case the KVM leaves will be offset.This patch introdues as new '
kvm_cpuid_base' field into structkvm_vcpu_archto track the location of the KVM leaves and functionkvm_update_cpuid_base()(called fromkvm_update_cpuid_runtime()) to locate the leaves using the 'KVMKVMKVM\0\0\0' signature. Adjustment ofKVM_CPUID_FEATURESwill hence now target the correct leaf.Quoted 8 lines
Signed-off-by Paul Durrant <[email protected]>---
Cc: Paolo Bonzini <[email protected]>
Cc: Sean Christopherson <[email protected]>
Cc: Vitaly Kuznetsov <[email protected]>
Cc: Wanpeng Li <[email protected]>
Cc: Jim Mattson <[email protected]>
Cc: Joerg Roedel <[email protected]>
Quoted 1 line
scripts/get_maintainer.plis your friend :-)
That's what I used, but thought it prudent to trim the list to just KVM reviewers.
Quoted 26 lines
Quoted 26 lines
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/cpuid.c | 50 +++++++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 5 deletions(-)arch/x86/include/asm/kvm_host.h +1
-0@@ -725,6 +725,7 @@ struct kvm_vcpu_arch {int cpuid_nent;struct kvm_cpuid_entry2 *cpuid_entries; +u32 kvm_cpuid_base;u64 reserved_gpa_bits;int maxphyaddr;arch/x86/kvm/cpuid.c +0
-0@@ -99,11 +99,46 @@ static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent)return 0 ; }
Quoted 10 lines
arch/x86/kvm/cpuid.c static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent) · line 106
Quoted 5 lines
arch/x86/kvm/cpuid.c +5
-0+static void kvm_update_cpuid_base (struct kvm_vcpu *vcpu) +{ +u32 function; + +for (function =0x40000000 ; function <0x40010000 ; function +=0x100 ) {No small part of me wants to turn
hypervisor_cpuid_base()into a macro, but that's probably more pain than gain. But I do think it would be worth providing a macro to iterate over possible bases and share that with the guest-side code.
Ok.
Quoted 7 lines
arch/x86/kvm/cpuid.c static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent) · line 107
Quoted 1 line
arch/x86/kvm/cpuid.c +1
-0+struct kvm_cpuid_entry2 *best =kvm_find_cpuid_entry (vcpu, function,0 );Declare "struct
kvm_cpuid_entry2*best" outside of the loop to shorten this line. I'd also vote to rename "best" to "entry". KVM's "best" terminology is a remnant of misguided logic that applied Intel's bizarre out-of-range behavior to internal KVM lookups.
Sure.
Quoted 8 lines
arch/x86/kvm/cpuid.c static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent) · line 112
Quoted 5 lines
arch/x86/kvm/cpuid.c +5
-0+ +if (best) { +char signature[12 ]; + + *(u32 *)&signature[0 ] = best->ebx;Just make signature a u32[3], then the casting craziness goes away.
True.
Quoted 8 lines
arch/x86/kvm/cpuid.c static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent) · line 116
Quoted 4 lines
arch/x86/kvm/cpuid.c +4
-0+ *(u32 *)&signature[4 ] = best->ecx; + *(u32 *)&signature[8 ] = best->edx; + +if (!memcmp (signature,"KVMKVMKVM\0\0\0" ,12 ))The "KVMKVMKVM\0\0\0" magic string belongs in a #define that's shared with the guest-side code. I
It's in a few places, so yes a #define is a good idea.
Quoted 50 lines
arch/x86/kvm/cpuid.c static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent) · line 120
Quoted 4 lines
arch/x86/kvm/cpuid.c +4
-0+break ; + } + } + vcpu->arch.kvm_cpuid_base = function;Unconditionally setting
kvm_cpuid_baseis silly because thenkvm_get_cpuid_base()needs to check multiple "error" values.E.g. all of the above can be done as:
struct kvm_cpuid_entry2 *entry; u32 base, signature[3]; vcpu->arch.kvm_cpuid_base = 0; virt_for_each_possible_hypervisor_base(base) { entry = kvm_find_cpuid_entry(vcpu, base, 0); if (!entry) continue; signature[0] = entry->ebx; signature[1] = entry->ecx; signature[2] = entry->edx; if (!memcmp(signature, KVM_CPUID_SIG, sizeof(signature))) { vcpu->arch.kvm_cpuid_base = base; break; } }arch/x86/kvm/cpuid.c static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent) · line 130
Quoted 10 lines
arch/x86/kvm/cpuid.c +10
-0+} + +static inline bool kvm_get_cpuid_base (struct kvm_vcpu *vcpu,u32 *function) +{ +if (vcpu->arch.kvm_cpuid_base <0x40000000 || + vcpu->arch.kvm_cpuid_base >=0x40010000 ) +return false; + + *function = vcpu->arch.kvm_cpuid_base; +return true;If '0' is the "doesn't exist" value, then this helper goes away.
Quoted 7 lines
arch/x86/kvm/cpuid.c +3
-0+} +void kvm_update_pv_runtime (struct kvm_vcpu *vcpu) { +u32 base;struct kvm_cpuid_entry2 *best;
Quoted 9 lines
arch/x86/kvm/cpuid.c static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent) · line 139
Quoted 3 lines
arch/x86/kvm/cpuid.c +2
-1- best =kvm_find_cpuid_entry (vcpu,KVM_CPUID_FEATURES ,0 ); +if (!kvm_get_cpuid_base (vcpu, &base)) +return ;... and then this becomes:
if (!vcpu->arch.kvm_cpuid_base) return;
Ok.
Quoted 13 lines
Actually, since this is a repated pattern and is likely going to be limited to getting
KVM_CPUID_FEATURES, just add:struct
kvm_find_cpuid_entrykvm_find_kvm_cpuid_features(void){ u32 base = vcpu->arch.kvm_cpuid_base; if (!base) return NULL; return kvm_find_cpuid_entry(vcpu, base | KVM_CPUID_FEATURES, 0); }
Quoted 2 lines
and then all of the indentation churn goes away.
Yeah, probably neater.
Quoted 51 lines
Quoted 14 lines
arch/x86/kvm/cpuid.c +3
-0+ + best =kvm_find_cpuid_entry (vcpu, base +KVM_CPUID_FEATURES ,0 );/* * save the feature bitmap to avoid cpuid lookup for every PV @@ -116,6 +151,7 @@ void kvm_update_pv_runtime(struct kvm_vcpu *vcpu)void kvm_update_cpuid_runtime (struct kvm_vcpu *vcpu) {struct kvm_cpuid_entry2 *best; +u32 base; best =kvm_find_cpuid_entry (vcpu,1 ,0 );if (best) {arch/x86/kvm/cpuid.c void kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu) · line 181
Quoted 8 lines
arch/x86/kvm/cpuid.c +1
-4@@ -142,10 +178,14 @@ void kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu) cpuid_entry_has(best, X86_FEATURE_XSAVEC))) best->ebx =xstate_required_size (vcpu->arch.xcr0, true); - best =kvm_find_cpuid_entry (vcpu,KVM_CPUID_FEATURES ,0 ); -if (kvm_hlt_in_guest (vcpu->kvm) && best && - (best->eax & (1 <<KVM_FEATURE_PV_UNHALT ))) - best->eax &= ~(1 <<KVM_FEATURE_PV_UNHALT ); +kvm_update_cpuid_base (vcpu);The KVM base doesn't need to be rechecked for runtime updates. Runtime updates are to handle changes in guest state, e.g. reported XSAVE size in response to a CR4.OSXSAVE change. The raw CPUID entries themselves cannot change at runtime. I suspect you did this here because
kvm_update_cpuid_runtime()is called beforekvm_vcpu_after_set_cpuid(), but that has the very bad side effect of doing an _expensive_ lookup on every runtime update, which can get very painful if there's noKVM_CPUID_FEATURESto be found.If you include the prep patch (pasted at the bottom), then this can simply be (note the somewhat silly name; I think it's worth clarifying that it's the KVM_CPUID_* base that's being updated):
arch/x86/kvm/cpuid.c +1
-0@@ -245,6 +245,7 @@ static int kvm_set_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *e2, vcpu->arch.cpuid_entries = e2; vcpu->arch.cpuid_nent = nent; +kvm_update_kvm_cpuid_base (vcpu);kvm_update_cpuid_runtime (vcpu);kvm_vcpu_after_set_cpuid (vcpu);arch/x86/kvm/cpuid.c void kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu) · line 184
Quoted 3 lines
arch/x86/kvm/cpuid.c +3
-0+ +if (kvm_get_cpuid_base (vcpu, &base)) { + best =kvm_find_cpuid_entry (vcpu, base +KVM_CPUID_FEATURES ,0 );
Quoted 4 lines
This is wrong. base will be >0x40000000 and <
0x40010000, andKVM_CPUID_FEATURESis0x40000001, i.e. this will lookup0x80000001for the default base. The '+' needs to be an '|'.
Yes, it does.
Quoted 10 lines
Quoted 9 lines
arch/x86/kvm/cpuid.c +4
-1+if (kvm_hlt_in_guest (vcpu->kvm) && best && + (best->eax & (1 <<KVM_FEATURE_PV_UNHALT ))) + best->eax &= ~(1 <<KVM_FEATURE_PV_UNHALT ); + }if (!kvm_check_has_quirk (vcpu->kvm,KVM_X86_QUIRK_MISC_ENABLE_NO_MWAIT )) { best =kvm_find_cpuid_entry (vcpu,0x1 ,0 ); --2.20.1
Thanks,
Paul
Quoted 95 lines
From
02d58c124f5aab1b0ef28cfc8a6ff6b6c58df969Mon Sep 17 00:00:00 2001
From: Sean Christopherson <[email protected]>
Date: Thu, 4 Nov 2021 12:17:23 -0700
Subject: [PATCH] KVM: x86: Add helper to consolidate core logic of
SET_CPUID{2} flowsMove the core logic of
SET_CPUIDandSET_CPUID2to a common helper, the only difference between the twoioctls()is the format of the userspace struct. A future fix will add yet more code to the core logic.No functional change intended.
Signed-off-by Sean Christopherson <[email protected]>--- arch/x86/kvm/cpuid.c | 47 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 23 deletions(-)arch/x86/kvm/cpuid.c +24
-24@@ -232,6 +232,25 @@ u64 kvm_vcpu_reserved_gpa_bits_raw(struct kvm_vcpu *vcpu)return rsvd_bits (cpuid_maxphyaddr (vcpu),63 ); } +static int kvm_set_cpuid (struct kvm_vcpu *vcpu,struct kvm_cpuid_entry2 *e2, +int nent) +{ +int r; + + r =kvm_check_cpuid (e2, nent); +if (r) +return r; + +kvfree (vcpu->arch.cpuid_entries); + vcpu->arch.cpuid_entries = e2; + vcpu->arch.cpuid_nent = nent; + +kvm_update_cpuid_runtime (vcpu); +kvm_vcpu_after_set_cpuid (vcpu); + +return 0 ; +} +/* when an old userspace process fills a new kernel module */ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid *cpuid,@@ -268,18 +287,9 @@ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu, e2[i].padding[2 ] =0 ; } - r =kvm_check_cpuid (e2, cpuid->nent); -if (r) { + r =kvm_set_cpuid (vcpu, e2, cpuid->nent); +if (r)kvfree (e2); - goto out_free_cpuid; - } - -kvfree (vcpu->arch.cpuid_entries); - vcpu->arch.cpuid_entries = e2; - vcpu->arch.cpuid_nent = cpuid->nent; - -kvm_update_cpuid_runtime (vcpu); -kvm_vcpu_after_set_cpuid (vcpu); out_free_cpuid:kvfree (e);@@ -303,20 +313,11 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,return PTR_ERR (e2); } - r =kvm_check_cpuid (e2, cpuid->nent); -if (r) { + r =kvm_set_cpuid (vcpu, e2, cpuid->nent); +if (r)kvfree (e2); -return r; - } -kvfree (vcpu->arch.cpuid_entries); - vcpu->arch.cpuid_entries = e2; - vcpu->arch.cpuid_nent = cpuid->nent; - -kvm_update_cpuid_runtime (vcpu); -kvm_vcpu_after_set_cpuid (vcpu); - -return 0 ; +return r; } int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu, --
Sean Christopherson
maintainerQuoted 32 lines · Paul
Quoted 32 lines
-----Original Message-----
From: Sean Christopherson <[email protected]>
Sent: 04 November 2021 19:23
To: Paul Durrant <[email protected]>
Cc: [email protected]; [email protected]; Durrant, Paul <[email protected]>; Paolo Bonzini <[email protected]>; Vitaly Kuznetsov <[email protected]>; Wanpeng Li <[email protected]>; Jim Mattson <[email protected]>; Joerg Roedel <[email protected]>
Subject: RE: [EXTERNAL] [PATCH] KVM: x86: Make sureKVM_CPUID_FEATURESreally areKVM_CPUID_FEATURESQuoted 21 lines · Paul Durrant
From: Paul Durrant <[email protected]>
Currently when
kvm_update_cpuid_runtime()runs, it assumes that theKVM_CPUID_FEATURESleaf is located at0x40000001. This is not true, however, if Hyper-V support is enabled. In this case the KVM leaves will be offset.This patch introdues as new '
kvm_cpuid_base' field into structkvm_vcpu_archto track the location of the KVM leaves and functionkvm_update_cpuid_base()(called fromkvm_update_cpuid_runtime()) to locate the leaves using the 'KVMKVMKVM\0\0\0' signature. Adjustment ofKVM_CPUID_FEATURESwill hence now target the correct leaf.Signed-off-by Paul Durrant <[email protected]>---
Cc: Paolo Bonzini <[email protected]>
Cc: Sean Christopherson <[email protected]>
Cc: Vitaly Kuznetsov <[email protected]>
Cc: Wanpeng Li <[email protected]>
Cc: Jim Mattson <[email protected]>
Cc: Joerg Roedel <[email protected]>
Quoted 3 lines
Quoted 1 line
scripts/get_maintainer.plis your friend :-)That's what I used, but thought it prudent to trim the list to just KVM reviewers.
Ah, yeah, I run get_maintainer.pl with "--pattern-depth=1" when I'm sending KVM patches/series. That tells the script to stop recursing once its found a match.
Quoted 139 lines · Sean Christopherson
Quoted 13 lines · Paul Durrant
From: Paul Durrant <[email protected]>
Currently when
kvm_update_cpuid_runtime()runs, it assumes that theKVM_CPUID_FEATURESleaf is located at0x40000001. This is not true, however, if Hyper-V support is enabled. In this case the KVM leaves will be offset.This patch introdues as new '
kvm_cpuid_base' field into structkvm_vcpu_archto track the location of the KVM leaves and functionkvm_update_cpuid_base()(called fromkvm_update_cpuid_runtime()) to locate the leaves using the 'KVMKVMKVM\0\0\0' signature. Adjustment ofKVM_CPUID_FEATURESwill hence now target the correct leaf.Quoted 8 lines
Signed-off-by Paul Durrant <[email protected]>---
Cc: Paolo Bonzini <[email protected]>
Cc: Sean Christopherson <[email protected]>
Cc: Vitaly Kuznetsov <[email protected]>
Cc: Wanpeng Li <[email protected]>
Cc: Jim Mattson <[email protected]>
Cc: Joerg Roedel <[email protected]>
scripts/get_maintainer.plis your friend :-)Quoted 22 lines
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/cpuid.c | 50 +++++++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 5 deletions(-)arch/x86/include/asm/kvm_host.h +1
-0@@ -725,6 +725,7 @@ struct kvm_vcpu_arch {int cpuid_nent;struct kvm_cpuid_entry2 *cpuid_entries; +u32 kvm_cpuid_base;u64 reserved_gpa_bits;int maxphyaddr;arch/x86/kvm/cpuid.c +0
-0arch/x86/kvm/cpuid.c static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent) · line 106
Quoted 8 lines
arch/x86/kvm/cpuid.c +5
-0@@ -99,11 +99,46 @@ static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent)return 0 ; } +static void kvm_update_cpuid_base (struct kvm_vcpu *vcpu) +{ +u32 function; + +for (function =0x40000000 ; function <0x40010000 ; function +=0x100 ) {No small part of me wants to turn
hypervisor_cpuid_base()into a macro, but that's probably more pain than gain. But I do think it would be worth providing a macro to iterate over possible bases and share that with the guest-side code.arch/x86/kvm/cpuid.c static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent) · line 107
Quoted 1 line
arch/x86/kvm/cpuid.c +1
-0+struct kvm_cpuid_entry2 *best =kvm_find_cpuid_entry (vcpu, function,0 );Declare "struct
kvm_cpuid_entry2*best" outside of the loop to shorten this line. I'd also vote to rename "best" to "entry". KVM's "best" terminology is a remnant of misguided logic that applied Intel's bizarre out-of-range behavior to internal KVM lookups.arch/x86/kvm/cpuid.c static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent) · line 112
Quoted 5 lines
arch/x86/kvm/cpuid.c +5
-0+ +if (best) { +char signature[12 ]; + + *(u32 *)&signature[0 ] = best->ebx;Just make signature a u32[3], then the casting craziness goes away.
arch/x86/kvm/cpuid.c static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent) · line 116
Quoted 4 lines
arch/x86/kvm/cpuid.c +4
-0+ *(u32 *)&signature[4 ] = best->ecx; + *(u32 *)&signature[8 ] = best->edx; + +if (!memcmp (signature,"KVMKVMKVM\0\0\0" ,12 ))The "KVMKVMKVM\0\0\0" magic string belongs in a #define that's shared with the guest-side code. I
arch/x86/kvm/cpuid.c static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent) · line 120
Quoted 4 lines
arch/x86/kvm/cpuid.c +4
-0+break ; + } + } + vcpu->arch.kvm_cpuid_base = function;Unconditionally setting
kvm_cpuid_baseis silly because thenkvm_get_cpuid_base()needs to check multiple "error" values.E.g. all of the above can be done as:
struct kvm_cpuid_entry2 *entry; u32 base, signature[3]; vcpu->arch.kvm_cpuid_base = 0; virt_for_each_possible_hypervisor_base(base) { entry = kvm_find_cpuid_entry(vcpu, base, 0); if (!entry) continue; signature[0] = entry->ebx; signature[1] = entry->ecx; signature[2] = entry->edx; if (!memcmp(signature, KVM_CPUID_SIG, sizeof(signature))) { vcpu->arch.kvm_cpuid_base = base; break; } }arch/x86/kvm/cpuid.c static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent) · line 130
Quoted 10 lines
arch/x86/kvm/cpuid.c +10
-0+} + +static inline bool kvm_get_cpuid_base (struct kvm_vcpu *vcpu,u32 *function) +{ +if (vcpu->arch.kvm_cpuid_base <0x40000000 || + vcpu->arch.kvm_cpuid_base >=0x40010000 ) +return false; + + *function = vcpu->arch.kvm_cpuid_base; +return true;If '0' is the "doesn't exist" value, then this helper goes away.
arch/x86/kvm/cpuid.c static int kvm_check_cpuid(struct kvm_cpuid_entry2 *entries, int nent) · line 139
Quoted 10 lines
arch/x86/kvm/cpuid.c +5
-1+} +void kvm_update_pv_runtime (struct kvm_vcpu *vcpu) { +u32 base;struct kvm_cpuid_entry2 *best; - best =kvm_find_cpuid_entry (vcpu,KVM_CPUID_FEATURES ,0 ); +if (!kvm_get_cpuid_base (vcpu, &base)) +return ;... and then this becomes:
Quoted 7 lines
if (!vcpu->arch.kvm_cpuid_base) return;Actually, since this is a repated pattern and is likely going to be limited to getting
KVM_CPUID_FEATURES, just add:struct
kvm_find_cpuid_entrykvm_find_kvm_cpuid_features(void)
FWIW, if 'kvm_find_kvm_*' sounds too weird we can probably use 'kvm_find_pv_*' instead.
Quoted 172 lines
{ u32 base = vcpu->arch.kvm_cpuid_base; if (!base) return NULL; return kvm_find_cpuid_entry(vcpu, base | KVM_CPUID_FEATURES, 0); }and then all of the indentation churn goes away.
Quoted 14 lines
arch/x86/kvm/cpuid.c +3
-0+ + best =kvm_find_cpuid_entry (vcpu, base +KVM_CPUID_FEATURES ,0 );/* * save the feature bitmap to avoid cpuid lookup for every PV @@ -116,6 +151,7 @@ void kvm_update_pv_runtime(struct kvm_vcpu *vcpu)void kvm_update_cpuid_runtime (struct kvm_vcpu *vcpu) {struct kvm_cpuid_entry2 *best; +u32 base; best =kvm_find_cpuid_entry (vcpu,1 ,0 );if (best) {arch/x86/kvm/cpuid.c void kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu) · line 181
Quoted 8 lines
arch/x86/kvm/cpuid.c +1
-4@@ -142,10 +178,14 @@ void kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu) cpuid_entry_has(best, X86_FEATURE_XSAVEC))) best->ebx = xstate_required_size(vcpu->arch.xcr0, true); - best =kvm_find_cpuid_entry (vcpu,KVM_CPUID_FEATURES ,0 ); -if (kvm_hlt_in_guest (vcpu->kvm) && best && - (best->eax & (1 <<KVM_FEATURE_PV_UNHALT ))) - best->eax &= ~(1 <<KVM_FEATURE_PV_UNHALT ); +kvm_update_cpuid_base (vcpu);The KVM base doesn't need to be rechecked for runtime updates. Runtime updates are to handle changes in guest state, e.g. reported XSAVE size in response to a CR4.OSXSAVE change. The raw CPUID entries themselves cannot change at runtime. I suspect you did this here because
kvm_update_cpuid_runtime()is called beforekvm_vcpu_after_set_cpuid(), but that has the very bad side effect of doing an _expensive_ lookup on every runtime update, which can get very painful if there's noKVM_CPUID_FEATURESto be found.If you include the prep patch (pasted at the bottom), then this can simply be (note the somewhat silly name; I think it's worth clarifying that it's the KVM_CPUID_* base that's being updated):
arch/x86/kvm/cpuid.c +1
-0@@ -245,6 +245,7 @@ static int kvm_set_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *e2, vcpu->arch.cpuid_entries = e2; vcpu->arch.cpuid_nent = nent; +kvm_update_kvm_cpuid_base (vcpu);kvm_update_cpuid_runtime (vcpu);kvm_vcpu_after_set_cpuid (vcpu);arch/x86/kvm/cpuid.c void kvm_update_cpuid_runtime(struct kvm_vcpu *vcpu) · line 184
Quoted 3 lines
arch/x86/kvm/cpuid.c +3
-0+ +if (kvm_get_cpuid_base (vcpu, &base)) { + best =kvm_find_cpuid_entry (vcpu, base +KVM_CPUID_FEATURES ,0 );This is wrong. base will be >0x40000000 and <
0x40010000, andKVM_CPUID_FEATURESis0x40000001, i.e. this will lookup0x80000001for the default base. The '+' needs to be an '|'.Quoted 9 lines
arch/x86/kvm/cpuid.c +4
-0+if (kvm_hlt_in_guest (vcpu->kvm) && best && + (best->eax & (1 <<KVM_FEATURE_PV_UNHALT ))) + best->eax &= ~(1 <<KVM_FEATURE_PV_UNHALT ); + }if (!kvm_check_has_quirk (vcpu->kvm,KVM_X86_QUIRK_MISC_ENABLE_NO_MWAIT )) { best =kvm_find_cpuid_entry (vcpu,0x1 ,0 );Signature · 1 line
2.20.1From
02d58c124f5aab1b0ef28cfc8a6ff6b6c58df969Mon Sep 17 00:00:00 2001
From: Sean Christopherson <[email protected]>
Date: Thu, 4 Nov 2021 12:17:23 -0700
Subject: [PATCH] KVM: x86: Add helper to consolidate core logic of
SET_CPUID{2} flowsMove the core logic of
SET_CPUIDandSET_CPUID2to a common helper, the only difference between the twoioctls()is the format of the userspace struct. A future fix will add yet more code to the core logic.No functional change intended.
Signed-off-by Sean Christopherson <[email protected]>--- arch/x86/kvm/cpuid.c | 47 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 23 deletions(-)arch/x86/kvm/cpuid.c +24
-24@@ -232,6 +232,25 @@ u64 kvm_vcpu_reserved_gpa_bits_raw(struct kvm_vcpu *vcpu)return rsvd_bits (cpuid_maxphyaddr (vcpu),63 ); } +static int kvm_set_cpuid (struct kvm_vcpu *vcpu,struct kvm_cpuid_entry2 *e2, +int nent) +{ +int r; + + r =kvm_check_cpuid (e2, nent); +if (r) +return r; + +kvfree (vcpu->arch.cpuid_entries); + vcpu->arch.cpuid_entries = e2; + vcpu->arch.cpuid_nent = nent; + +kvm_update_cpuid_runtime (vcpu); +kvm_vcpu_after_set_cpuid (vcpu); + +return 0 ; +} +/* when an old userspace process fills a new kernel module */ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid *cpuid,@@ -268,18 +287,9 @@ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu, e2[i].padding[2 ] =0 ; } - r =kvm_check_cpuid (e2, cpuid->nent); -if (r) { + r =kvm_set_cpuid (vcpu, e2, cpuid->nent); +if (r)kvfree (e2); - goto out_free_cpuid; - } - -kvfree (vcpu->arch.cpuid_entries); - vcpu->arch.cpuid_entries = e2; - vcpu->arch.cpuid_nent = cpuid->nent; - -kvm_update_cpuid_runtime (vcpu); -kvm_vcpu_after_set_cpuid (vcpu); out_free_cpuid:kvfree (e);@@ -303,20 +313,11 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,return PTR_ERR (e2); } - r =kvm_check_cpuid (e2, cpuid->nent); -if (r) { + r =kvm_set_cpuid (vcpu, e2, cpuid->nent); +if (r)kvfree (e2); -return r; - } -kvfree (vcpu->arch.cpuid_entries); - vcpu->arch.cpuid_entries = e2; - vcpu->arch.cpuid_nent = cpuid->nent; - -kvm_update_cpuid_runtime (vcpu); -kvm_vcpu_after_set_cpuid (vcpu); - -return 0 ; +return r; } int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu, --
Signature · 1 line
Vitaly