KVM: x86: Fix implicit enum conversion goof in scattered reverse CPUID code
Sean Christopherson
maintainerPATCH 1/1 KVM: x86: Fix implicit enum conversion goof in scattered reverse CPUID code
Take "enum kvm_only_cpuid_leafs" in scattered specific CPUID helpers (which is obvious in hindsight), and use "unsigned int" for leafs that can be the kernel's standard "enum cpuid_leaf" or the aforementioned KVM-only variant. Loss of the enum params is a bit disapponting, but gcc obviously isn't providing any extra sanity checks, and the various BUILD_BUG_ON() assertions ensure the input is in range.
This fixes implicit enum conversions that are detected by clang-11.
---
Hopefully it's not too late to squash this...
arch/x86/kvm/cpuid.c | 5 +++-- arch/x86/kvm/cpuid.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
arch/x86/kvm/cpuid.c +3 -2
@@ -365,7 +365,7 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu, }/* Mask kvm_cpu_caps for @leaf with the raw CPUID capabilities of this CPU. */ -static __always_inline void __kvm_cpu_cap_mask(enum cpuid_leafs leaf) +static __always_inline void __kvm_cpu_cap_mask(unsigned int leaf) {const struct cpuid_reg cpuid =x86_feature_cpuid (leaf *32 );struct kvm_cpuid_entry2 entry;
@@ -378,7 +378,8 @@ static __always_inline void __kvm_cpu_cap_mask(enum cpuid_leafs leaf) kvm_cpu_caps[leaf] &= *__cpuid_entry_get_reg (&entry, cpuid.reg); } -static __always_inline void kvm_cpu_cap_init_scattered(enum cpuid_leafs leaf, u32 mask) +static __always_inline +void kvm_cpu_cap_init_scattered(enum kvm_only_cpuid_leafs leaf, u32 mask) {/* Use kvm_cpu_cap_mask for non-scattered leafs. */ BUILD_BUG_ON (leaf <NCAPINTS );
arch/x86/kvm/cpuid.h +1 -1
@@ -236,7 +236,7 @@ static __always_inline void cpuid_entry_change(struct kvm_cpuid_entry2 *entry, } static __always_inline void cpuid_entry_override(struct kvm_cpuid_entry2 *entry, -enum cpuid_leafs leaf) +unsigned int leaf) {u32 *reg =cpuid_entry_get_reg (entry, leaf *32 );
Signature · 1 line
2.31.1.368.gbe11c130af-goog
Quoted 5 lines · Sean Christopherson
Take "enum
kvm_only_cpuid_leafs" in scattered specific CPUID helpers (which is obvious in hindsight), and use "unsigned int" for leafs that can be the kernel's standard "enumcpuid_leaf" or the aforementioned KVM-only variant. Loss of the enum params is a bit disapponting, but gcc obviously isn't providing any extra sanity checks, and the various
Unfortunately, gcc's -Wenum-conversion is behind -Wextra rather than -Wall like clang. If you explicitly enable it with KCFLAGS=-Wenum-conversion to your make invocation, it will warn in the exact same way as clang:
arch/x86/kvm/cpuid.c: In function 'kvm_set_cpu_caps':arch/x86/kvm/cpuid.c:499:29: warning: implicit conversion from 'enum kvm_only_cpuid_leafs' to 'enum cpuid_leafs' [-Wenum-conversion]
499 | kvm_cpu_cap_init_scattered(CPUID_12_EAX,
| ^~~~~~~~~~~~
arch/x86/kvm/cpuid.c: In function '__do_cpuid_func':
arch/x86/kvm/cpuid.c:837:31: warning: implicit conversion from 'enum kvm_only_cpuid_leafs' to 'enum cpuid_leafs' [-Wenum-conversion]
837 | cpuid_entry_override(entry, CPUID_12_EAX);
| ^~~~~~~~~~~~clang's warning for comparison/posterity:
arch/x86/kvm/cpuid.c:499:29: warning: implicit conversion from enumeration type 'enum kvm_only_cpuid_leafs' to different enumeration type 'enum cpuid_leafs' [-Wenum-conversion]
kvm_cpu_cap_init_scattered(CPUID_12_EAX,
~~~~~~~~~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~
arch/x86/kvm/cpuid.c:837:31: warning: implicit conversion from enumeration type 'enum kvm_only_cpuid_leafs' to different enumeration type 'enum cpuid_leafs' [-Wenum-conversion]
cpuid_entry_override(entry, CPUID_12_EAX);
~~~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~2 warnings generated.
Quoted 7 lines
BUILD_BUG_ON()assertions ensure the input is in range.This fixes implicit enum conversions that are detected by clang-11.
Fixes 4e66c0cb79b7 ("KVM: x86: Add support for reverse CPUID lookup of scattered features")Cc Kai Huang <[email protected]>Signed-off-by Sean Christopherson <[email protected]>
This makes GCC and clang happy in my brief testing.
I assume this will get squashed but in case not, here are some tags:
Quoted 47 lines
---
Hopefully it's not too late to squash this...
arch/x86/kvm/cpuid.c | 5 +++-- arch/x86/kvm/cpuid.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)arch/x86/kvm/cpuid.c +3
-2@@ -365,7 +365,7 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu, }/* Mask kvm_cpu_caps for @leaf with the raw CPUID capabilities of this CPU. */ -static __always_inline void __kvm_cpu_cap_mask(enum cpuid_leafs leaf) +static __always_inline void __kvm_cpu_cap_mask(unsigned int leaf) {const struct cpuid_reg cpuid =x86_feature_cpuid (leaf *32 );struct kvm_cpuid_entry2 entry;@@ -378,7 +378,8 @@ static __always_inline void __kvm_cpu_cap_mask(enum cpuid_leafs leaf) kvm_cpu_caps[leaf] &= *__cpuid_entry_get_reg (&entry, cpuid.reg); } -static __always_inline void kvm_cpu_cap_init_scattered(enum cpuid_leafs leaf, u32 mask) +static __always_inline +void kvm_cpu_cap_init_scattered(enum kvm_only_cpuid_leafs leaf, u32 mask) {/* Use kvm_cpu_cap_mask for non-scattered leafs. */ BUILD_BUG_ON (leaf <NCAPINTS );arch/x86/kvm/cpuid.h +1
-1@@ -236,7 +236,7 @@ static __always_inline void cpuid_entry_change(struct kvm_cpuid_entry2 *entry, } static __always_inline void cpuid_entry_override(struct kvm_cpuid_entry2 *entry, -enum cpuid_leafs leaf) +unsigned int leaf) {u32 *reg =cpuid_entry_get_reg (entry, leaf *32 );Signature · 1 line
2.31.1.368.gbe11c130af-goog
Quoted 14 lines · Nathan Chancellor
Unfortunately, gcc's -Wenum-conversion is behind -Wextra rather than -Wall like clang. If you explicitly enable it with KCFLAGS=-Wenum-conversion to your make invocation, it will warn in the exact same way as clang:
arch/x86/kvm/cpuid.c: In function 'kvm_set_cpu_caps':arch/x86/kvm/cpuid.c:499:29: warning: implicit conversion from 'enumkvm_only_cpuid_leafs' to 'enumcpuid_leafs' [-Wenum-conversion]
499 | kvm_cpu_cap_init_scattered(CPUID_12_EAX,| ^~~~~~~~~~~~ arch/x86/kvm/cpuid.c: In function '__do_cpuid_func': arch/x86/kvm/cpuid.c:837:31: warning: implicit conversion from 'enum kvm_only_cpuid_leafs' to 'enum cpuid_leafs' [-Wenum-conversion] 837 | cpuid_entry_override(entry, CPUID_12_EAX); | ^~~~~~~~~~~~
Quoted 3 lines
clang's warning for comparison/posterity:
arch/x86/kvm/cpuid.c:499:29: warning: implicit conversion from enumeration type 'enumkvm_only_cpuid_leafs' to different enumeration type 'enumcpuid_leafs'
[-Wenum-conversion]
Quoted 3 lines
kvm_cpu_cap_init_scattered(CPUID_12_EAX, ~~~~~~~~~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~
arch/x86/kvm/cpuid.c:837:31: warning: implicit conversion from enumeration type 'enumkvm_only_cpuid_leafs' to different enumeration type 'enumcpuid_leafs'
[-Wenum-conversion]
Quoted 3 lines
cpuid_entry_override(entry, CPUID_12_EAX); ~~~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~2 warnings generated.
Note that this will kill the build if you have CONFIG_KVM_WERROR=y in effect (which was a reasonable thing to do when KVM built just fine with it in effect).
Paolo Bonzini
maintainerQuoted 7 lines · Nathan Chancellor
arch/x86/kvm/cpuid.c:499:29: warning: implicit conversion from enumeration type 'enumkvm_only_cpuid_leafs' to different enumeration type 'enumcpuid_leafs' [-Wenum-conversion]kvm_cpu_cap_init_scattered(CPUID_12_EAX, ~~~~~~~~~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~ arch/x86/kvm/cpuid.c:837:31: warning: implicit conversion from enumeration type 'enum kvm_only_cpuid_leafs' to different enumeration type 'enum cpuid_leafs' [-Wenum-conversion] cpuid_entry_override(entry, CPUID_12_EAX); ~~~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~2 warnings generated.
Added this to the commit message, thanks!
Paolo
Paolo Bonzini
maintainerQuoted 7 lines · Sean Christopherson
Take "enum
kvm_only_cpuid_leafs" in scattered specific CPUID helpers (which is obvious in hindsight), and use "unsigned int" for leafs that can be the kernel's standard "enumcpuid_leaf" or the aforementioned KVM-only variant. Loss of the enum params is a bit disapponting, but gcc obviously isn't providing any extra sanity checks, and the variousBUILD_BUG_ON()assertions ensure the input is in range.
Quoted 8 lines
This fixes implicit enum conversions that are detected by clang-11.
Fixes 4e66c0cb79b7 ("KVM: x86: Add support for reverse CPUID lookup of scattered features")Cc Kai Huang <[email protected]>Signed-off-by Sean Christopherson <[email protected]>---
Hopefully it's not too late to squash this...
Too late, but I queued this anyway.
Paolo
Quoted 42 lines
arch/x86/kvm/cpuid.c | 5 +++-- arch/x86/kvm/cpuid.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)arch/x86/kvm/cpuid.c +3
-2@@ -365,7 +365,7 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu, }/* Mask kvm_cpu_caps for @leaf with the raw CPUID capabilities of this CPU. */ -static __always_inline void __kvm_cpu_cap_mask(enum cpuid_leafs leaf) +static __always_inline void __kvm_cpu_cap_mask(unsigned int leaf) {const struct cpuid_reg cpuid =x86_feature_cpuid (leaf *32 );struct kvm_cpuid_entry2 entry;@@ -378,7 +378,8 @@ static __always_inline void __kvm_cpu_cap_mask(enum cpuid_leafs leaf) kvm_cpu_caps[leaf] &= *__cpuid_entry_get_reg (&entry, cpuid.reg); } -static __always_inline void kvm_cpu_cap_init_scattered(enum cpuid_leafs leaf, u32 mask) +static __always_inline +void kvm_cpu_cap_init_scattered(enum kvm_only_cpuid_leafs leaf, u32 mask) {/* Use kvm_cpu_cap_mask for non-scattered leafs. */ BUILD_BUG_ON (leaf <NCAPINTS );arch/x86/kvm/cpuid.h +1
-1@@ -236,7 +236,7 @@ static __always_inline void cpuid_entry_change(struct kvm_cpuid_entry2 *entry, } static __always_inline void cpuid_entry_override(struct kvm_cpuid_entry2 *entry, -enum cpuid_leafs leaf) +unsigned int leaf) {u32 *reg =cpuid_entry_get_reg (entry, leaf *32 );