lib/siphash.c:: annotate implicit fall throughs
PATCH 1/1 lib/siphash.c:: annotate implicit fall throughs
There is a plan to build the kernel with -Wimplicit-fallthrough and these places in the code produced warnings (W=1). Fix them up.
This commit remove the following warnings:
lib/siphash.c:71:12: warning: this statement may fall through [-Wimplicit-fallthrough=] lib/siphash.c:72:12: warning: this statement may fall through [-Wimplicit-fallthrough=] lib/siphash.c:73:12: warning: this statement may fall through [-Wimplicit-fallthrough=] lib/siphash.c:75:12: warning: this statement may fall through [-Wimplicit-fallthrough=] lib/siphash.c:434:12: warning: this statement may fall through [-Wimplicit-fallthrough=]
--- lib/siphash.c | 5 +++++ 1 file changed, 5 insertions(+)
lib/siphash.c +5 -0
@@ -69,10 +69,14 @@ u64 __siphash_aligned(const void *data, size_t len, const siphash_key_t *key)#else switch (left) {case 7 : b |= ((u64 )end[6 ]) <<48 ; +/* fall through */ case 6 : b |= ((u64 )end[5 ]) <<40 ; +/* fall through */ case 5 : b |= ((u64 )end[4 ]) <<32 ; +/* fall through */ case 4 : b |=le32_to_cpup (data);break ;case 3 : b |= ((u64 )end[2 ]) <<16 ; +/* fall through */ case 2 : b |=le16_to_cpup (data);break ;case 1 : b |= end[0 ]; }
@@ -432,6 +436,7 @@ u32 __hsiphash_aligned(const void *data, size_t len, const hsiphash_key_t *key) }switch (left) {case 3 : b |= ((u32 )end[2 ]) <<16 ; +/* fall through */ case 2 : b |=le16_to_cpup (data);break ;case 1 : b |= end[0 ]; }
Signature · 1 line
2.19.2
Quoted 5 lines · Mathieu Malaterre
There is a plan to build the kernel with -Wimplicit-fallthrough and these places in the code produced warnings (W=1). Fix them up.
This commit remove the following warnings:
Quoted 7 lines
lib/siphash.c:71:12: warning: this statement may fall through [-Wimplicit-fallthrough=]lib/siphash.c:72:12: warning: this statement may fall through [-Wimplicit-fallthrough=]lib/siphash.c:73:12: warning: this statement may fall through [-Wimplicit-fallthrough=]lib/siphash.c:75:12: warning: this statement may fall through [-Wimplicit-fallthrough=]lib/siphash.c:434:12: warning: this statement may fall through [-Wimplicit-fallthrough=]Signed-off-by Mathieu Malaterre <[email protected]>
Quoted 32 lines
--- lib/siphash.c | 5 +++++ 1 file changed, 5 insertions(+)lib/siphash.c +5
-0@@ -69,10 +69,14 @@ u64 __siphash_aligned(const void *data, size_t len, const siphash_key_t *key)#else switch (left) {case 7 : b |= ((u64 )end[6 ]) <<48 ; +/* fall through */ case 6 : b |= ((u64 )end[5 ]) <<40 ; +/* fall through */ case 5 : b |= ((u64 )end[4 ]) <<32 ; +/* fall through */ case 4 : b |=le32_to_cpup (data);break ;case 3 : b |= ((u64 )end[2 ]) <<16 ; +/* fall through */ case 2 : b |=le16_to_cpup (data);break ;case 1 : b |= end[0 ]; }@@ -432,6 +436,7 @@ u32 __hsiphash_aligned(const void *data, size_t len, const hsiphash_key_t *key) }switch (left) {case 3 : b |= ((u32 )end[2 ]) <<16 ; +/* fall through */ case 2 : b |=le16_to_cpup (data);break ;case 1 : b |= end[0 ]; }
PATCH v2 1/1 lib/siphash.c: annotate implicit fall throughs
In reply to Mathieu MalaterreThere is a plan to build the kernel with -Wimplicit-fallthrough and these places in the code produced warnings (W=1). Fix them up.
This commit remove the following warnings:
lib/siphash.c:71:12: warning: this statement may fall through [-Wimplicit-fallthrough=] lib/siphash.c:72:12: warning: this statement may fall through [-Wimplicit-fallthrough=] lib/siphash.c:73:12: warning: this statement may fall through [-Wimplicit-fallthrough=] lib/siphash.c:75:12: warning: this statement may fall through [-Wimplicit-fallthrough=] lib/siphash.c:108:12: warning: this statement may fall through [-Wimplicit-fallthrough=] lib/siphash.c:109:12: warning: this statement may fall through [-Wimplicit-fallthrough=] lib/siphash.c:110:12: warning: this statement may fall through [-Wimplicit-fallthrough=] lib/siphash.c:112:12: warning: this statement may fall through [-Wimplicit-fallthrough=] lib/siphash.c:434:12: warning: this statement may fall through [-Wimplicit-fallthrough=] lib/siphash.c:462:12: warning: this statement may fall through [-Wimplicit-fallthrough=]
---
v2: some cases were missed in v1, update missing ones
lib/siphash.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
lib/siphash.c +10 -0
@@ -69,10 +69,14 @@ u64 __siphash_aligned(const void *data, size_t len, const siphash_key_t *key)#else switch (left) {case 7 : b |= ((u64 )end[6 ]) <<48 ; +/* fall through */ case 6 : b |= ((u64 )end[5 ]) <<40 ; +/* fall through */ case 5 : b |= ((u64 )end[4 ]) <<32 ; +/* fall through */ case 4 : b |=le32_to_cpup (data);break ;case 3 : b |= ((u64 )end[2 ]) <<16 ; +/* fall through */ case 2 : b |=le16_to_cpup (data);break ;case 1 : b |= end[0 ]; }
@@ -102,10 +106,14 @@ u64 __siphash_unaligned(const void *data, size_t len, const siphash_key_t *key)#else switch (left) {case 7 : b |= ((u64 )end[6 ]) <<48 ; +/* fall through */ case 6 : b |= ((u64 )end[5 ]) <<40 ; +/* fall through */ case 5 : b |= ((u64 )end[4 ]) <<32 ; +/* fall through */ case 4 : b |=get_unaligned_le32 (end);break ;case 3 : b |= ((u64 )end[2 ]) <<16 ; +/* fall through */ case 2 : b |=get_unaligned_le16 (end);break ;case 1 : b |= end[0 ]; }
@@ -432,6 +440,7 @@ u32 __hsiphash_aligned(const void *data, size_t len, const hsiphash_key_t *key) }switch (left) {case 3 : b |= ((u32 )end[2 ]) <<16 ; +/* fall through */ case 2 : b |=le16_to_cpup (data);break ;case 1 : b |= end[0 ]; }
@@ -455,6 +464,7 @@ u32 __hsiphash_unaligned(const void *data, size_t len, }switch (left) {case 3 : b |= ((u32 )end[2 ]) <<16 ; +/* fall through */ case 2 : b |=get_unaligned_le16 (end);break ;case 1 : b |= end[0 ]; }
Signature · 1 line
2.20.1
Re: [PATCH v2] lib/siphash.c: annotate implicit fall throughs
Conceptually this seems pretty reasonable. Though, style-wise, perhaps you might want to put those breaks on the next line too, i.e. s/; break;/;\n\t\tbreak;/?
Gustavo A. R. Silva
Acked-byRe: [PATCH v2] lib/siphash.c: annotate implicit fall throughs
Quoted 4 lines · Jason A. Donenfeld
Conceptually this seems pretty reasonable. Though, style-wise, perhaps you might want to put those breaks on the next line too, i.e. s/; break;/;\n\t\tbreak;/?
I agree.
With that, you can add my:
Thanks
--
Gustavo
Re: [PATCH v2] lib/siphash.c: annotate implicit fall throughs
In reply to Jason A. DonenfeldQuoted 4 lines · Jason A. Donenfeld
Conceptually this seems pretty reasonable. Though, style-wise, perhaps you might want to put those breaks on the next line too, i.e. s/; break;/;\n\t\tbreak;/?
Good point. This needs some more love since checkpatch complains now with:
ERROR: trailing statements should be on next line
#42: FILE: lib/siphash.c:77:
+ case 4: b |= le32_to_cpup(data);
Let me merge all that and send a v2.
Thanks
PATCH v3 1/1 lib/siphash.c: annotate implicit fall throughs
In reply to Mathieu MalaterreThere is a plan to build the kernel with -Wimplicit-fallthrough and these places in the code produced warnings (W=1). Fix them up.
This commit remove the following warnings:
lib/siphash.c:71:12: warning: this statement may fall through [-Wimplicit-fallthrough=] lib/siphash.c:72:12: warning: this statement may fall through [-Wimplicit-fallthrough=] lib/siphash.c:73:12: warning: this statement may fall through [-Wimplicit-fallthrough=] lib/siphash.c:75:12: warning: this statement may fall through [-Wimplicit-fallthrough=] lib/siphash.c:108:12: warning: this statement may fall through [-Wimplicit-fallthrough=] lib/siphash.c:109:12: warning: this statement may fall through [-Wimplicit-fallthrough=] lib/siphash.c:110:12: warning: this statement may fall through [-Wimplicit-fallthrough=] lib/siphash.c:112:12: warning: this statement may fall through [-Wimplicit-fallthrough=] lib/siphash.c:434:12: warning: this statement may fall through [-Wimplicit-fallthrough=] lib/siphash.c:462:12: warning: this statement may fall through [-Wimplicit-fallthrough=]
Move the break statement onto the next line to match the fall-through comment pattern. Also move the trailing statement onto the next line to pass checkpatch verification.
---
v3: move break statements onto next line and please checkpatch
v2: some cases were missed in v1, update missing ones
lib/siphash.c | 76 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 56 insertions(+), 20 deletions(-)
lib/siphash.c +56 -20
@@ -68,13 +68,26 @@ u64 __siphash_aligned(const void *data, size_t len, const siphash_key_t *key) bytemask_from_count(left)));#else switch (left) { -case 7 : b |= ((u64 )end[6 ]) <<48 ; -case 6 : b |= ((u64 )end[5 ]) <<40 ; -case 5 : b |= ((u64 )end[4 ]) <<32 ; -case 4 : b |=le32_to_cpup (data);break ; -case 3 : b |= ((u64 )end[2 ]) <<16 ; -case 2 : b |=le16_to_cpup (data);break ; -case 1 : b |= end[0 ]; +case 7 : + b |= ((u64 )end[6 ]) <<48 ; +/* fall through */ +case 6 : + b |= ((u64 )end[5 ]) <<40 ; +/* fall through */ +case 5 : + b |= ((u64 )end[4 ]) <<32 ; +/* fall through */ +case 4 : + b |=le32_to_cpup (data); +break ; +case 3 : + b |= ((u64 )end[2 ]) <<16 ; +/* fall through */ +case 2 : + b |=le16_to_cpup (data); +break ; +case 1 : + b |= end[0 ]; }#endif POSTAMBLE
@@ -101,13 +114,26 @@ u64 __siphash_unaligned(const void *data, size_t len, const siphash_key_t *key) bytemask_from_count(left)));#else switch (left) { -case 7 : b |= ((u64 )end[6 ]) <<48 ; -case 6 : b |= ((u64 )end[5 ]) <<40 ; -case 5 : b |= ((u64 )end[4 ]) <<32 ; -case 4 : b |=get_unaligned_le32 (end);break ; -case 3 : b |= ((u64 )end[2 ]) <<16 ; -case 2 : b |=get_unaligned_le16 (end);break ; -case 1 : b |= end[0 ]; +case 7 : + b |= ((u64 )end[6 ]) <<48 ; +/* fall through */ +case 6 : + b |= ((u64 )end[5 ]) <<40 ; +/* fall through */ +case 5 : + b |= ((u64 )end[4 ]) <<32 ; +/* fall through */ +case 4 : + b |=get_unaligned_le32 (end); +break ; +case 3 : + b |= ((u64 )end[2 ]) <<16 ; +/* fall through */ +case 2 : + b |=get_unaligned_le16 (end); +break ; +case 1 : + b |= end[0 ]; }#endif POSTAMBLE
@@ -431,9 +457,14 @@ u32 __hsiphash_aligned(const void *data, size_t len, const hsiphash_key_t *key) v0 ^= m; }switch (left) { -case 3 : b |= ((u32 )end[2 ]) <<16 ; -case 2 : b |=le16_to_cpup (data);break ; -case 1 : b |= end[0 ]; +case 3 : + b |= ((u32 )end[2 ]) <<16 ; +/* fall through */ +case 2 : + b |=le16_to_cpup (data); +break ; +case 1 : + b |= end[0 ]; } HPOSTAMBLE }
@@ -454,9 +485,14 @@ u32 __hsiphash_unaligned(const void *data, size_t len, v0 ^= m; }switch (left) { -case 3 : b |= ((u32 )end[2 ]) <<16 ; -case 2 : b |=get_unaligned_le16 (end);break ; -case 1 : b |= end[0 ]; +case 3 : + b |= ((u32 )end[2 ]) <<16 ; +/* fall through */ +case 2 : + b |=get_unaligned_le16 (end); +break ; +case 1 : + b |= end[0 ]; } HPOSTAMBLE }
Signature · 1 line
2.20.1
Re: [PATCH v3] lib/siphash.c: annotate implicit fall throughs
Quoted 16 lines · Mathieu Malaterre
There is a plan to build the kernel with -Wimplicit-fallthrough and these places in the code produced warnings (W=1). Fix them up.
This commit remove the following warnings:
lib/siphash.c:71:12: warning: this statement may fall through [-Wimplicit-fallthrough=]lib/siphash.c:72:12: warning: this statement may fall through [-Wimplicit-fallthrough=]lib/siphash.c:73:12: warning: this statement may fall through [-Wimplicit-fallthrough=]lib/siphash.c:75:12: warning: this statement may fall through [-Wimplicit-fallthrough=]lib/siphash.c:108:12: warning: this statement may fall through [-Wimplicit-fallthrough=]lib/siphash.c:109:12: warning: this statement may fall through [-Wimplicit-fallthrough=]lib/siphash.c:110:12: warning: this statement may fall through [-Wimplicit-fallthrough=]lib/siphash.c:112:12: warning: this statement may fall through [-Wimplicit-fallthrough=]lib/siphash.c:434:12: warning: this statement may fall through [-Wimplicit-fallthrough=]lib/siphash.c:462:12: warning: this statement may fall through [-Wimplicit-fallthrough=]
Quoted 3 lines
Move the break statement onto the next line to match the fall-through comment pattern. Also move the trailing statement onto the next line to pass checkpatch verification.
[]
lib/siphash.c
Quoted 1 line
lib/siphash.c +0
-0
[].
lib/siphash.c u64 __siphash_aligned(const void *data, size_t len, const siphash_key_t *key) · line 73
Quoted 7 lines
lib/siphash.c +0
-3@@ -68,13 +68,26 @@ u64 __siphash_aligned(const void *data, size_t len, const siphash_key_t *key) bytemask_from_count(left)));#else switch (left) { -case 7 : b |= ((u64 )end[6 ]) <<48 ; -case 6 : b |= ((u64 )end[5 ]) <<40 ; -case 5 : b |= ((u64 )end[4 ]) <<32 ;
It might also be worth not casting to u64 then shift as that can be
moderately expensive on 32 bit systems
and instead use ((char *)&b)[<appropriate_index>].
lib/siphash.c u64 __siphash_aligned(const void *data, size_t len, const siphash_key_t *key) · line 75
Quoted 2 lines
lib/siphash.c +0
-2-case 4 : b |=le32_to_cpup (data);break ; -case 3 : b |= ((u64 )end[2 ]) <<16 ;
Perhaps an unnecessary cast before shift
lib/siphash.c u64 __siphash_aligned(const void *data, size_t len, const siphash_key_t *key) · line 77
Quoted 2 lines
lib/siphash.c +0
-2-case 2 : b |=le16_to_cpup (data);break ; -case 1 : b |= end[0 ];
[]
lib/siphash.c u64 __siphash_unaligned(const void *data, size_t len, const siphash_key_t *key) · line 106
Quoted 7 lines
lib/siphash.c +0
-3@@ -101,13 +114,26 @@ u64 __siphash_unaligned(const void *data, size_t len, const siphash_key_t *key) bytemask_from_count(left)));#else switch (left) { -case 7 : b |= ((u64 )end[6 ]) <<48 ; -case 6 : b |= ((u64 )end[5 ]) <<40 ; -case 5 : b |= ((u64 )end[4 ]) <<32 ;
etc...
Quoted 4 lines
lib/siphash.c +0
-4-case 4 : b |=get_unaligned_le32 (end);break ; -case 3 : b |= ((u64 )end[2 ]) <<16 ; -case 2 : b |=get_unaligned_le16 (end);break ; -case 1 : b |= end[0 ];
Re: [PATCH v3] lib/siphash.c: annotate implicit fall throughs
In reply to Mathieu MalaterreHi Mathieu,
Thanks for getting this v3 into shape.
Quoted 138 lines · Mathieu Malaterre
There is a plan to build the kernel with -Wimplicit-fallthrough and these places in the code produced warnings (W=1). Fix them up.
This commit remove the following warnings:
lib/siphash.c:71:12: warning: this statement may fall through [-Wimplicit-fallthrough=]lib/siphash.c:72:12: warning: this statement may fall through [-Wimplicit-fallthrough=]lib/siphash.c:73:12: warning: this statement may fall through [-Wimplicit-fallthrough=]lib/siphash.c:75:12: warning: this statement may fall through [-Wimplicit-fallthrough=]lib/siphash.c:108:12: warning: this statement may fall through [-Wimplicit-fallthrough=]lib/siphash.c:109:12: warning: this statement may fall through [-Wimplicit-fallthrough=]lib/siphash.c:110:12: warning: this statement may fall through [-Wimplicit-fallthrough=]lib/siphash.c:112:12: warning: this statement may fall through [-Wimplicit-fallthrough=]lib/siphash.c:434:12: warning: this statement may fall through [-Wimplicit-fallthrough=]lib/siphash.c:462:12: warning: this statement may fall through [-Wimplicit-fallthrough=]Move the break statement onto the next line to match the fall-through comment pattern. Also move the trailing statement onto the next line to pass checkpatch verification.
Signed-off-by Mathieu Malaterre <[email protected]>---
v3: move break statements onto next line and please checkpatch
v2: some cases were missed in v1, update missing oneslib/siphash.c | 76 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 56 insertions(+), 20 deletions(-)lib/siphash.c +56
-21@@ -68,13 +68,26 @@ u64 __siphash_aligned(const void *data, size_t len, const siphash_key_t *key) bytemask_from_count(left)));#else switch (left) { -case 7 : b |= ((u64 )end[6 ]) <<48 ; -case 6 : b |= ((u64 )end[5 ]) <<40 ; -case 5 : b |= ((u64 )end[4 ]) <<32 ; -case 4 : b |=le32_to_cpup (data);break ; -case 3 : b |= ((u64 )end[2 ]) <<16 ; -case 2 : b |=le16_to_cpup (data);break ; -case 1 : b |= end[0 ]; +case 7 : + b |= ((u64 )end[6 ]) <<48 ; +/* fall through */ +case 6 : + b |= ((u64 )end[5 ]) <<40 ; +/* fall through */ +case 5 : + b |= ((u64 )end[4 ]) <<32 ; +/* fall through */ +case 4 : + b |=le32_to_cpup (data); +break ; +case 3 : + b |= ((u64 )end[2 ]) <<16 ; +/* fall through */ +case 2 : + b |=le16_to_cpup (data); +break ; +case 1 : + b |= end[0 ]; }#endif POSTAMBLE @@ -101,13 +114,26 @@ u64 __siphash_unaligned(const void *data, size_t len, const siphash_key_t *key) bytemask_from_count(left)));#else switch (left) { -case 7 : b |= ((u64 )end[6 ]) <<48 ; -case 6 : b |= ((u64 )end[5 ]) <<40 ; -case 5 : b |= ((u64 )end[4 ]) <<32 ; -case 4 : b |=get_unaligned_le32 (end);break ; -case 3 : b |= ((u64 )end[2 ]) <<16 ; -case 2 : b |=get_unaligned_le16 (end);break ; -case 1 : b |= end[0 ]; +case 7 : + b |= ((u64 )end[6 ]) <<48 ; +/* fall through */ +case 6 : + b |= ((u64 )end[5 ]) <<40 ; +/* fall through */ +case 5 : + b |= ((u64 )end[4 ]) <<32 ; +/* fall through */ +case 4 : + b |=get_unaligned_le32 (end); +break ; +case 3 : + b |= ((u64 )end[2 ]) <<16 ; +/* fall through */ +case 2 : + b |=get_unaligned_le16 (end); +break ; +case 1 : + b |= end[0 ]; }#endif POSTAMBLE @@ -431,9 +457,14 @@ u32 __hsiphash_aligned(const void *data, size_t len, const hsiphash_key_t *key) v0 ^= m; }switch (left) { -case 3 : b |= ((u32 )end[2 ]) <<16 ; -case 2 : b |=le16_to_cpup (data);break ; -case 1 : b |= end[0 ]; +case 3 : + b |= ((u32 )end[2 ]) <<16 ; +/* fall through */ +case 2 : + b |=le16_to_cpup (data); +break ; +case 1 : + b |= end[0 ]; } HPOSTAMBLE }@@ -454,9 +485,14 @@ u32 __hsiphash_unaligned(const void *data, size_t len, v0 ^= m; }switch (left) { -case 3 : b |= ((u32 )end[2 ]) <<16 ; -case 2 : b |=get_unaligned_le16 (end);break ; -case 1 : b |= end[0 ]; +case 3 : + b |= ((u32 )end[2 ]) <<16 ; +/* fall through */ +case 2 : + b |=get_unaligned_le16 (end); +break ; +case 1 : + b |= end[0 ]; } HPOSTAMBLE } --
Quoted 1 line
2.20.1
Greg - would you take this through your tree?
Jason