kvm: arm64: use BUG() instead of BUG_ON(1)
PATCH 1/1 kvm: arm64: use BUG() instead of BUG_ON(1)
From: Arnd Bergmann <[email protected]>
The BUG_ON() macro adds a little bit of complexity over BUG(), and in some cases this ends up confusing the compiler's control flow analysis in a way that results in a warning. This one now shows up with clang-21:
arch/arm64/kvm/vgic/vgic-mmio.c:1094:3: error: variable 'len' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]
1094 | BUG_ON(1);
Change both instances of BUG_ON(1) to a plain BUG() in the arm64 kvm code, to avoid the false-positive warning.
--- arch/arm64/kvm/hyp/nvhe/list_debug.c | 2 +- arch/arm64/kvm/vgic/vgic-mmio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm64/kvm/hyp/nvhe/list_debug.c +1 -1
@@ -17,7 +17,7 @@ static inline __must_check bool nvhe_check_data_corruption(bool v)bool corruption =unlikely (condition); \if (corruption) { \if (IS_ENABLED (CONFIG_BUG_ON_DATA_CORRUPTION )) { \ -BUG_ON (1 ); \ +BUG (); \ }else \WARN_ON (1 ); \ } \
arch/arm64/kvm/vgic/vgic-mmio.c +1 -1
@@ -1091,7 +1091,7 @@ int vgic_register_dist_iodev(struct kvm *kvm, gpa_t dist_base_address, len =vgic_v3_init_dist_iodev (io_device);break ;default : -BUG_ON (1 ); +BUG (); } io_device->base_addr = dist_base_address;
Signature · 1 line
2.39.5
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The
BUG_ON()macro adds a little bit of complexity overBUG(), and in some cases this ends up confusing the compiler's control flow analysis in a way that results in a warning. This one now shows up with clang-21:
Quoted 7 lines
arch/arm64/kvm/vgic/vgic-mmio.c:1094:3: error: variable 'len' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]
1094 |BUG_ON(1);Change both instances of
BUG_ON(1)to a plainBUG()in the arm64 kvm code, to avoid the false-positive warning.Signed-off-by Arnd Bergmann <[email protected]>
Yeah I had responded to a build report around this but I never followed up on seeing if it got fixed.
https://lore.kernel.org/20250714171559.GA1364710@ax162/
Quoted 35 lines
--- arch/arm64/kvm/hyp/nvhe/list_debug.c | 2 +- arch/arm64/kvm/vgic/vgic-mmio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)arch/arm64/kvm/hyp/nvhe/list_debug.c +1
-1@@ -17,7 +17,7 @@ static inline __must_check bool nvhe_check_data_corruption(bool v)bool corruption =unlikely (condition); \if (corruption) { \if (IS_ENABLED (CONFIG_BUG_ON_DATA_CORRUPTION )) { \ -BUG_ON (1 ); \ +BUG (); \ }else \WARN_ON (1 ); \ } \arch/arm64/kvm/vgic/vgic-mmio.c +1
-1@@ -1091,7 +1091,7 @@ int vgic_register_dist_iodev(struct kvm *kvm, gpa_t dist_base_address, len =vgic_v3_init_dist_iodev (io_device);break ;default : -BUG_ON (1 ); +BUG (); } io_device->base_addr = dist_base_address;Signature · 1 line
2.39.5
Oliver Upton
AppliedQuoted 8 lines · Arnd Bergmann
The
BUG_ON()macro adds a little bit of complexity overBUG(), and in some cases this ends up confusing the compiler's control flow analysis in a way that results in a warning. This one now shows up with clang-21:
arch/arm64/kvm/vgic/vgic-mmio.c:1094:3: error: variable 'len' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]
1094 |BUG_ON(1);[...]
Applied to fixes, thanks!
[1/1] kvm: arm64: use BUG() instead of BUG_ON(1)
https://git.kernel.org/kvmarm/kvmarm/c/700d6868fee2
--
Best,
Oliver