rbd: avoid clang -Wuninitialized warning
Subsystems (2)
PATCH 1/1 rbd: avoid clang -Wuninitialized warning
clang fails to see that rbd_assert(0) ends in an unreachable code path and warns about a subsequent use of an uninitialized variable when CONFIG_PROFILE_ANNOTATED_BRANCHES is set:
drivers/block/rbd.c:2402:4: error: variable 'ret' is used uninitialized whenever 'if' condition is false
[-Werror,-Wsometimes-uninitialized]
rbd_assert(0);
^~~~~~~~~~~~~
drivers/block/rbd.c:563:7: note: expanded from macro 'rbd_assert'
if (unlikely(!(expr))) { \
^~~~~~~~~~~~~~~~~
include/linux/compiler.h:48:23: note: expanded from macro 'unlikely'
# define unlikely(x) (__branch_check__(x, 0, __builtin_constant_p(x)))
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/block/rbd.c:2410:6: note: uninitialized use occurs here
if (ret) {
^~~
drivers/block/rbd.c:2402:4: note: remove the 'if' if its condition is always true
rbd_assert(0);
^
drivers/block/rbd.c:563:3: note: expanded from macro 'rbd_assert'
if (unlikely(!(expr))) { \
^
drivers/block/rbd.c:2376:9: note: initialize the variable 'ret' to silence this warning
int ret;
^
= 01 error generated.
This seems to be a bug in clang, but is easy to work around by using an unconditional BUG().
--- drivers/block/rbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/rbd.c +1 -1
@@ -2399,7 +2399,7 @@ static int rbd_obj_read_from_parent(struct rbd_obj_request *obj_req) &obj_req->bvec_pos);break ;default : -rbd_assert (0 ); +BUG (); } }else { ret = rbd_img_fill_from_bvecs(child_img_req,
Signature · 1 line
2.20.0
Ilya Dryomov
maintainerQuoted 43 lines · Arnd Bergmann
clang fails to see that
rbd_assert(0)ends in an unreachable code path and warns about a subsequent use of an uninitialized variable whenCONFIG_PROFILE_ANNOTATED_BRANCHESis set:
drivers/block/rbd.c:2402:4: error: variable 'ret' is used uninitialized whenever 'if' condition is false[-Werror,-Wsometimes-uninitialized] rbd_assert(0); ^~~~~~~~~~~~~ drivers/block/rbd.c:563:7: note: expanded from macro 'rbd_assert' if (unlikely(!(expr))) { \ ^~~~~~~~~~~~~~~~~ include/linux/compiler.h:48:23: note: expanded from macro 'unlikely' # define unlikely(x) (__branch_check__(x, 0, __builtin_constant_p(x))) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/block/rbd.c:2410:6: note: uninitialized use occurs here if (ret) { ^~~ drivers/block/rbd.c:2402:4: note: remove the 'if' if its condition is always true rbd_assert(0); ^ drivers/block/rbd.c:563:3: note: expanded from macro 'rbd_assert' if (unlikely(!(expr))) { \ ^ drivers/block/rbd.c:2376:9: note: initialize the variable 'ret' to silence this warning int ret; ^ = 01 error generated.
This seems to be a bug in clang, but is easy to work around by using an unconditional
BUG().Signed-off-by Arnd Bergmann <[email protected]>--- drivers/block/rbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/block/rbd.c +0
-0
drivers/block/rbd.c static int rbd_obj_read_from_parent(struct rbd_obj_request *obj_req) · line 2405
Quoted 8 lines
drivers/block/rbd.c +1
-1@@ -2399,7 +2399,7 @@ static int rbd_obj_read_from_parent(struct rbd_obj_request *obj_req) &obj_req->bvec_pos);break ;default : -rbd_assert (0 ); +BUG (); } }else { ret = rbd_img_fill_from_bvecs(child_img_req,
Hi Arnd,
You did a couple of these last year in commit c6244b3b2377 ("rbd: avoid Wreturn-type warnings"). Let's change all of those default cases to BUG in one go. Do you want to do that or should I?
Thanks,
Ilya
Quoted 19 lines · Ilya Dryomov
Quoted 6 lines · Arnd Bergmann
drivers/block/rbd.c +0
-0drivers/block/rbd.c static int rbd_obj_read_from_parent(struct rbd_obj_request *obj_req) · line 2405
Quoted 8 lines
drivers/block/rbd.c +1
-1@@ -2399,7 +2399,7 @@ static int rbd_obj_read_from_parent(struct rbd_obj_request *obj_req) &obj_req->bvec_pos);break ;default : -rbd_assert (0 ); +BUG (); } }else { ret = rbd_img_fill_from_bvecs(child_img_req,Hi Arnd,
Quoted 2 lines
You did a couple of these last year in commit
c6244b3b2377("rbd: avoid Wreturn-type warnings").
Ah, I had completely forgotten about that. Different bug and different compiler, but same solution ;-)
Quoted 2 lines
Let's change all of those default cases to BUG
in one go. Do you want to do that or should I?
I've prepared another patch now and sent it out, please apply it on top. I'd like this one-line patch to stay separate though since it captures the warning message and may need to
be backported to stable kernels later.
Arnd
Quoted 27 lines · Arnd Bergmann
Quoted 19 lines · Ilya Dryomov
Quoted 6 lines · Arnd Bergmann
drivers/block/rbd.c +0
-0drivers/block/rbd.c static int rbd_obj_read_from_parent(struct rbd_obj_request *obj_req) · line 2405
Quoted 8 lines
drivers/block/rbd.c +1
-1@@ -2399,7 +2399,7 @@ static int rbd_obj_read_from_parent(struct rbd_obj_request *obj_req) &obj_req->bvec_pos);break ;default : -rbd_assert (0 ); +BUG (); } }else { ret = rbd_img_fill_from_bvecs(child_img_req,Hi Arnd,
Quoted 2 lines
You did a couple of these last year in commit
c6244b3b2377("rbd: avoid Wreturn-type warnings").Ah, I had completely forgotten about that. Different bug and different compiler, but same solution ;-)
Quoted 7 lines
Quoted 2 lines
Let's change all of those default cases to BUG
in one go. Do you want to do that or should I?I've prepared another patch now and sent it out, please apply it on top. I'd like this one-line patch to stay separate though since it captures the warning message and may need to
be backported to stable kernels later.
Applied.
Thanks,
Ilya