powerpc: mm: radix_tlb: rearrange the if-else block
PATCH v2 1/1 powerpc: mm: radix_tlb: rearrange the if-else block
Clang warns:
arch/powerpc/mm/book3s64/radix_tlb.c:1191:23: error: variable 'hstart' is uninitialized when used here [-Werror,-Wuninitialized]
__tlbiel_va_range(hstart, hend, pid,
^~~~~~arch/powerpc/mm/book3s64/radix_tlb.c:1175:23: note: initialize the variable 'hstart' to silence this warning
unsigned long hstart, hend;
^
= 0arch/powerpc/mm/book3s64/radix_tlb.c:1191:31: error: variable 'hend' is uninitialized when used here [-Werror,-Wuninitialized]
__tlbiel_va_range(hstart, hend, pid,
^~~~arch/powerpc/mm/book3s64/radix_tlb.c:1175:29: note: initialize the variable 'hend' to silence this warning
unsigned long hstart, hend;
^
= 02 errors generated.
Rework the 'if (IS_ENABLE(CONFIG_TRANSPARENT_HUGEPAGE))' so hstart/hend always gets initialized, this will silence the warnings. That will also simplify the 'else' path. Clang is getting confused with these warnings, but the warnings is a false-positive.
--- arch/powerpc/mm/book3s64/radix_tlb.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
arch/powerpc/mm/book3s64/radix_tlb.c +3 -6
@@ -1174,12 +1174,9 @@ static inline void __radix__flush_tlb_range(struct mm_struct *mm,bool hflush = false;unsigned long hstart, hend; -if (IS_ENABLED (CONFIG_TRANSPARENT_HUGEPAGE )) { - hstart = (start +PMD_SIZE -1 ) &PMD_MASK ; - hend = end &PMD_MASK ; -if (hstart < hend) - hflush = true; - } + hstart = (start +PMD_SIZE -1 ) &PMD_MASK ; + hend = end &PMD_MASK ; + hflush =IS_ENABLED (CONFIG_TRANSPARENT_HUGEPAGE ) && hstart < hend;if (type ==FLUSH_TYPE_LOCAL ) { asmvolatile ("ptesync" : : :"memory" );
Signature · 1 line
2.34.1
Le 28/01/2022 à 11:08, Anders Roxell a écrit :
Quoted 35 lines
Clang warns:
arch/powerpc/mm/book3s64/radix_tlb.c:1191:23: error: variable 'hstart' is uninitialized when used here [-Werror,-Wuninitialized]
__tlbiel_va_range(hstart, hend, pid,
^~~~~~arch/powerpc/mm/book3s64/radix_tlb.c:1175:23: note: initialize the variable 'hstart' to silence this warningunsigned long hstart, hend; ^ = 0
arch/powerpc/mm/book3s64/radix_tlb.c:1191:31: error: variable 'hend' is uninitialized when used here [-Werror,-Wuninitialized]
__tlbiel_va_range(hstart, hend, pid,
^~~~arch/powerpc/mm/book3s64/radix_tlb.c:1175:29: note: initialize the variable 'hend' to silence this warningunsigned long hstart, hend; ^ = 02 errors generated.
Rework the 'if (
IS_ENABLE(CONFIG_TRANSPARENT_HUGEPAGE))' so hstart/hend always gets initialized, this will silence the warnings. That will also simplify the 'else' path. Clang is getting confused with these warnings, but the warnings is a false-positive.Suggested-by Arnd Bergmann <[email protected]>Suggested-by Nathan Chancellor <[email protected]>Signed-off-by Anders Roxell <[email protected]>--- arch/powerpc/mm/book3s64/radix_tlb.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)arch/powerpc/mm/book3s64/radix_tlb.c +0
-0
arch/powerpc/mm/book3s64/radix_tlb.c static inline void __radix__flush_tlb_range(struct mm_struct *mm, · line 1174
Quoted 1 line
arch/powerpc/mm/book3s64/radix_tlb.c +0
-0@@ -1174,12 +1174,9 @@ static inline void __radix__flush_tlb_range(struct mm_struct *mm,bool hflush = false;
You should then remove the default initialisation of hflush to false which has become pointless.
With that fixed,
Quoted 14 lines
arch/powerpc/mm/book3s64/radix_tlb.c +3
-6unsigned long hstart, hend; -if (IS_ENABLED (CONFIG_TRANSPARENT_HUGEPAGE )) { - hstart = (start +PMD_SIZE -1 ) &PMD_MASK ; - hend = end &PMD_MASK ; -if (hstart < hend) - hflush = true; - } + hstart = (start +PMD_SIZE -1 ) &PMD_MASK ; + hend = end &PMD_MASK ; + hflush =IS_ENABLED (CONFIG_TRANSPARENT_HUGEPAGE ) && hstart < hend;if (type ==FLUSH_TYPE_LOCAL ) { asmvolatile ("ptesync" : : :"memory" );
Quoted 44 lines · Christophe Leroy
Quoted 35 lines · Anders Roxell
Clang warns:
arch/powerpc/mm/book3s64/radix_tlb.c:1191:23: error: variable 'hstart' is uninitialized when used here [-Werror,-Wuninitialized]
__tlbiel_va_range(hstart, hend, pid,
^~~~~~arch/powerpc/mm/book3s64/radix_tlb.c:1175:23: note: initialize the variable 'hstart' to silence this warningunsigned long hstart, hend; ^ = 0
arch/powerpc/mm/book3s64/radix_tlb.c:1191:31: error: variable 'hend' is uninitialized when used here [-Werror,-Wuninitialized]
__tlbiel_va_range(hstart, hend, pid,
^~~~arch/powerpc/mm/book3s64/radix_tlb.c:1175:29: note: initialize the variable 'hend' to silence this warningunsigned long hstart, hend; ^ = 02 errors generated.
Rework the 'if (
IS_ENABLE(CONFIG_TRANSPARENT_HUGEPAGE))' so hstart/hend always gets initialized, this will silence the warnings. That will also simplify the 'else' path. Clang is getting confused with these warnings, but the warnings is a false-positive.Suggested-by Arnd Bergmann <[email protected]>Suggested-by Nathan Chancellor <[email protected]>Signed-off-by Anders Roxell <[email protected]>--- arch/powerpc/mm/book3s64/radix_tlb.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)arch/powerpc/mm/book3s64/radix_tlb.c +0
-0arch/powerpc/mm/book3s64/radix_tlb.c static inline void __radix__flush_tlb_range(struct mm_struct *mm, · line 1174
Quoted 1 line
arch/powerpc/mm/book3s64/radix_tlb.c +0
-0@@ -1174,12 +1174,9 @@ static inline void __radix__flush_tlb_range(struct mm_struct *mm,bool hflush = false;You should then remove the default initialisation of hflush to false which has become pointless.
Quoted 3 lines
With that fixed,
Reviewed-by Christophe Leroy <[email protected]>
Thank you for the review.
I will send a v3 shortly with that fixed.
Cheers,
Anders