KVM: x86: avoid warning with -Wbitwise-instead-of-logical
Paolo Bonzini
maintainerPATCH 1/1 KVM: x86: avoid warning with -Wbitwise-instead-of-logical
This is a new warning in clang top-of-tree (will be clang 14):
In file included from arch/x86/kvm/mmu/mmu.c:27:arch/x86/kvm/mmu/spte.h:318:9: error: use of bitwise '|' with boolean operands [-Werror,-Wbitwise-instead-of-logical]
return __is_bad_mt_xwr(rsvd_check, spte) |
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
||arch/x86/kvm/mmu/spte.h:318:9: note: cast one or both operands to int to silence this warning
--- arch/x86/kvm/mmu/spte.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
arch/x86/kvm/mmu/spte.h +5 -2
@@ -314,9 +314,12 @@ static __always_inline bool is_rsvd_spte(struct rsvd_bits_validate *rsvd_check,* Use a bitwise-OR instead of a logical-OR to aggregate the reserved * bits and EPT's invalid memtype/XWR checks to avoid an extra Jcc * (this is extremely unlikely to be short-circuited as true). +* +* (int) avoids clang's "use of bitwise '|' with boolean operands" +* warning. */ -return __is_bad_mt_xwr (rsvd_check, spte) | -__is_rsvd_bits_set (rsvd_check, spte, level); +return (int )__is_bad_mt_xwr (rsvd_check, spte) | + (int )__is_rsvd_bits_set (rsvd_check, spte, level); }static inline bool spte_can_locklessly_be_made_writable (u64 spte)
Signature · 1 line
2.27.0
Quoted 4 lines · Paolo Bonzini
This is a new warning in clang top-of-tree (will be clang 14):
In file included from
arch/x86/kvm/mmu/mmu.c:27:arch/x86/kvm/mmu/spte.h:318:9: error: use of bitwise '|' with boolean operands [-Werror,-Wbitwise-instead-of-logical]
Quoted 8 lines
return __is_bad_mt_xwr(rsvd_check, spte) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ||
arch/x86/kvm/mmu/spte.h:318:9: note: cast one or both operands to int to silence this warningReported-by [email protected]Suggested-by Jim Mattson <[email protected]>Signed-off-by Paolo Bonzini <[email protected]>
Quoted 27 lines
--- arch/x86/kvm/mmu/spte.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)arch/x86/kvm/mmu/spte.h +5
-2@@ -314,9 +314,12 @@ static __always_inline bool is_rsvd_spte(struct rsvd_bits_validate *rsvd_check,* Use a bitwise-OR instead of a logical-OR to aggregate the reserved * bits and EPT's invalid memtype/XWR checks to avoid an extra Jcc * (this is extremely unlikely to be short-circuited as true). +* +* (int) avoids clang's "use of bitwise '|' with boolean operands" +* warning. */ -return __is_bad_mt_xwr (rsvd_check, spte) | -__is_rsvd_bits_set (rsvd_check, spte, level); +return (int )__is_bad_mt_xwr (rsvd_check, spte) | + (int )__is_rsvd_bits_set (rsvd_check, spte, level); }static inline bool spte_can_locklessly_be_made_writable (u64 spte)Signature · 1 line
2.27.0
Nick Desaulniers
Acked-byQuoted 11 lines · Nathan Chancellor
Quoted 9 lines · Paolo Bonzini
This is a new warning in clang top-of-tree (will be clang 14):
In file included from
arch/x86/kvm/mmu/mmu.c:27:arch/x86/kvm/mmu/spte.h:318:9: error: use of bitwise '|' with boolean operands [-Werror,-Wbitwise-instead-of-logical]return __is_bad_mt_xwr(rsvd_check, spte) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ||
arch/x86/kvm/mmu/spte.h:318:9: note: cast one or both operands to int to silence this warning
Quoted 5 lines
Quoted 3 lines
Reported-by [email protected]Suggested-by Jim Mattson <[email protected]>Signed-off-by Paolo Bonzini <[email protected]>Reviewed-by Nathan Chancellor <[email protected]>
Quoted 29 lines
Quoted 28 lines
--- arch/x86/kvm/mmu/spte.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)arch/x86/kvm/mmu/spte.h +5
-3@@ -314,9 +314,12 @@ static __always_inline bool is_rsvd_spte(struct rsvd_bits_validate *rsvd_check,* Use a bitwise-OR instead of a logical-OR to aggregate the reserved * bits and EPT's invalid memtype/XWR checks to avoid an extra Jcc * (this is extremely unlikely to be short-circuited as true). +* +* (int) avoids clang's "use of bitwise '|' with boolean operands" +* warning. */ -return __is_bad_mt_xwr (rsvd_check, spte) | -__is_rsvd_bits_set (rsvd_check, spte, level); +return (int )__is_bad_mt_xwr (rsvd_check, spte) | + (int )__is_rsvd_bits_set (rsvd_check, spte, level); }static inline bool spte_can_locklessly_be_made_writable (u64 spte) --2.27.0
Signature · 2 lines
Thanks, ~Nick Desaulniers