KVM: allow KVM_BUG/KVM_BUG_ON to handle 64-bit cond
authorWei Wang <wei.w.wang@intel.com>
Tue, 7 Mar 2023 13:52:33 +0000 (21:52 +0800)
committerSean Christopherson <seanjc@google.com>
Thu, 1 Jun 2023 20:36:37 +0000 (13:36 -0700)
Current KVM_BUG and KVM_BUG_ON assume that 'cond' passed from callers is
32-bit as it casts 'cond' to the type of int. This will be wrong if 'cond'
provided by a caller is 64-bit, e.g. an error code of 0xc0000d0300000000
will be converted to 0, which is not expected.

Improves the implementation by using bool in KVM_BUG and KVM_BUG_ON.
'bool' is preferred to 'int' as __ret is essentially used as a boolean
and coding-stytle.rst documents that use of bool is encouraged to improve
readability and is often a better option than 'int' for storing boolean
values.

Fixes: 0b8f11737cff ("KVM: Add infrastructure and macro to mark VM as bugged")
Signed-off-by: Wei Wang <wei.w.wang@intel.com>
Reviewed-by: Mingwei Zhang <mizhang@google.com>
Reviewed-by: Sean Christopherson <seanjc@google.com>
Link: https://lore.kernel.org/r/20230307135233.54684-1-wei.w.wang@intel.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
include/linux/kvm_host.h

index 0e571e9..2dc604a 100644 (file)
@@ -849,7 +849,7 @@ static inline void kvm_vm_bugged(struct kvm *kvm)
 
 #define KVM_BUG(cond, kvm, fmt...)                             \
 ({                                                             \
-       int __ret = (cond);                                     \
+       bool __ret = !!(cond);                                  \
                                                                \
        if (WARN_ONCE(__ret && !(kvm)->vm_bugged, fmt))         \
                kvm_vm_bugged(kvm);                             \
@@ -858,7 +858,7 @@ static inline void kvm_vm_bugged(struct kvm *kvm)
 
 #define KVM_BUG_ON(cond, kvm)                                  \
 ({                                                             \
-       int __ret = (cond);                                     \
+       bool __ret = !!(cond);                                  \
                                                                \
        if (WARN_ON_ONCE(__ret && !(kvm)->vm_bugged))           \
                kvm_vm_bugged(kvm);                             \