[PATCH] powerpc/mm/hash: Remove unnecessary do { }while(0) loop

Subsystems: linux for powerpc (32-bit and 64-bit), the rest

STALE2916d

2 messages, 2 authors, 2018-08-13 · open the first message on its own page

[PATCH] powerpc/mm/hash: Remove unnecessary do { }while(0) loop

From: Aneesh Kumar K.V <hidden>
Date: 2018-08-09 13:36:57

Avoid coverity false warnings like

*** CID 187347:  Control flow issues  (UNREACHABLE)
/arch/powerpc/mm/hash_native_64.c: 819 in native_flush_hash_range()
813        slot += hidx & _PTEIDX_GROUP_IX;
814        hptep = htab_address + slot;
815        want_v = hpte_encode_avpn(vpn, psize, ssize);
816        hpte_v = hpte_get_old_v(hptep);
817
818        if (!HPTE_V_COMPARE(hpte_v, want_v) || !(hpte_v & HPTE_V_VALID))
quoted
quoted
    CID 187347:  Control flow issues  (UNREACHABLE)
Signed-off-by: Aneesh Kumar K.V <redacted>
---
 arch/powerpc/include/asm/book3s/64/hash-64k.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/include/asm/book3s/64/hash-64k.h b/arch/powerpc/include/asm/book3s/64/hash-64k.h
index c81793d47af9..f82ee8a3b561 100644
--- a/arch/powerpc/include/asm/book3s/64/hash-64k.h
+++ b/arch/powerpc/include/asm/book3s/64/hash-64k.h
@@ -137,10 +137,9 @@ extern bool __rpte_sub_valid(real_pte_t rpte, unsigned long index);
 		shift = mmu_psize_defs[psize].shift;			\
 		for (index = 0; vpn < __end; index++,			\
 			     vpn += (1L << (shift - VPN_SHIFT))) {	\
-			if (!__split || __rpte_sub_valid(rpte, index))	\
-				do {
+		if (!__split || __rpte_sub_valid(rpte, index))
 
-#define pte_iterate_hashed_end() } while(0); } } while(0)
+#define pte_iterate_hashed_end()  } } while(0)
 
 #define pte_pagesize_index(mm, addr, pte)	\
 	(((pte) & H_PAGE_COMBO)? MMU_PAGE_4K: MMU_PAGE_64K)
-- 
2.17.1

Re: powerpc/mm/hash: Remove unnecessary do { }while(0) loop

From: Michael Ellerman <hidden>
Date: 2018-08-13 11:23:19

On Thu, 2018-08-09 at 13:36:42 UTC, "Aneesh Kumar K.V" wrote:
Avoid coverity false warnings like

*** CID 187347:  Control flow issues  (UNREACHABLE)
/arch/powerpc/mm/hash_native_64.c: 819 in native_flush_hash_range()
813        slot += hidx & _PTEIDX_GROUP_IX;
814        hptep = htab_address + slot;
815        want_v = hpte_encode_avpn(vpn, psize, ssize);
816        hpte_v = hpte_get_old_v(hptep);
817
818        if (!HPTE_V_COMPARE(hpte_v, want_v) || !(hpte_v & HPTE_V_VALID))
quoted
quoted
quoted
    CID 187347:  Control flow issues  (UNREACHABLE)
Signed-off-by: Aneesh Kumar K.V <redacted>
Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/f405b510c93eeb7390d0e2c6ef8d12

cheers
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help