Skip to contentSkip to conversation

powerpc: mm: radix_tlb: rearrange the if-else block

PATCH Superseded Anders Roxell 2 participants 3 messages Jan 28, 2022 PowerPC

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

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;
                                    ^
                                     = 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 warning

                unsigned long hstart, hend;
                                          ^
                                           = 0

2 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
index 7724af19ed7e..7d65965a0688 100644
@@ -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) {
 			asm volatile("ptesync": : :"memory");
Signature · 1 line
2.34.1
Reviewed-by on v2 1/1
#1 lore raw

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 warning

                 unsigned 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 warning

                 unsigned long hstart, hend;
                                           ^
                                            = 0

2 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 +0 -0
index 7724af19ed7e..7d65965a0688 100644

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 -6
  		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) {
  			asm volatile("ptesync": : :"memory");
#2 lore raw
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 warning

                 unsigned 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 warning

                 unsigned long hstart, hend;
                                           ^
                                            = 0

2 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 +0 -0
index 7724af19ed7e..7d65965a0688 100644

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.

Quoted 3 lines

With that fixed,

Thank you for the review.
I will send a v3 shortly with that fixed.

Cheers,
Anders