arm64: fix unreachable code issue with cmpxchg
PATCH v2 1/1 arm64: fix unreachable code issue with cmpxchg
On arm64 build with clang, sometimes the __cmpxchg_mb is not inlined when CONFIG_OPTIMIZE_INLINING is set.
Clang then fails a compile-time assertion, because it cannot tell at compile time what the size of the argument is:
mm/memcontrol.o: In function `__cmpxchg_mb':
memcontrol.c:(.text+0x1a4c): undefined reference to __compiletime_assert_175' memcontrol.c:(.text+0x1a4c): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol __compiletime_assert_175'
Mark all of the cmpxchg() style functions as __always_inline to ensure that the compiler can see the result.
---
v2: skip unneeded changes, as suggested by Andrew Murray
--- arch/arm64/include/asm/cmpxchg.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/include/asm/cmpxchg.h +3 -3
@@ -62,7 +62,7 @@ __XCHG_CASE( , , mb_, 64, dmb ish, nop, , a, l, "memory")#undef __XCHG_CASE#define __XCHG_GEN (sfx) \ -static inline unsigned long __xchg##sfx(unsigned long x, \ +static __always_inline unsigned long __xchg##sfx(unsigned long x, \ volatile void *ptr, \ int size) \ { \
@@ -148,7 +148,7 @@ __CMPXCHG_DBL(_mb)#undef __CMPXCHG_DBL#define __CMPXCHG_GEN (sfx) \ -static inline unsigned long __cmpxchg##sfx(volatile void *ptr, \ +static __always_inline unsigned long __cmpxchg##sfx(volatile void *ptr, \ unsigned long old, \ unsigned long new, \ int size) \
@@ -255,7 +255,7 @@ __CMPWAIT_CASE( , , 64);#undef __CMPWAIT_CASE#define __CMPWAIT_GEN (sfx) \ -static inline void __cmpwait##sfx(volatile void *ptr, \ +static __always_inline void __cmpwait##sfx(volatile void *ptr, \ unsigned long val, \ int size) \ { \
Signature · 7 lines
2.20.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 60 lines · Arnd Bergmann
On arm64 build with clang, sometimes the
__cmpxchg_mbis not inlined whenCONFIG_OPTIMIZE_INLININGis set.
Clang then fails a compile-time assertion, because it cannot tell at compile time what the size of the argument is:
mm/memcontrol.o: In function `__cmpxchg_mb':
memcontrol.c:(.text+0x1a4c): undefined reference to__compiletime_assert_175' memcontrol.c:(.text+0x1a4c): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol__compiletime_assert_175'Mark all of the
cmpxchg()style functions as__always_inlineto ensure that the compiler can see the result.Acked-by Nick Desaulniers <[email protected]>Reported-by Nathan Chancellor <[email protected]>Reviewed-by Nathan Chancellor <[email protected]>Tested-by Nathan Chancellor <[email protected]>Reviewed-by Andrew Murray <[email protected]>Tested-by Andrew Murray <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>---
v2: skip unneeded changes, as suggested by Andrew Murray--- arch/arm64/include/asm/cmpxchg.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)arch/arm64/include/asm/cmpxchg.h +3
-3@@ -62,7 +62,7 @@ __XCHG_CASE( , , mb_, 64, dmb ish, nop, , a, l, "memory")#undef __XCHG_CASE#define __XCHG_GEN (sfx) \ -static inline unsigned long __xchg##sfx(unsigned long x, \ +static __always_inline unsigned long __xchg##sfx(unsigned long x, \ volatile void *ptr, \ int size) \ { \@@ -148,7 +148,7 @@ __CMPXCHG_DBL(_mb)#undef __CMPXCHG_DBL#define __CMPXCHG_GEN (sfx) \ -static inline unsigned long __cmpxchg##sfx(volatile void *ptr, \ +static __always_inline unsigned long __cmpxchg##sfx(volatile void *ptr, \ unsigned long old, \ unsigned long new, \ int size) \@@ -255,7 +255,7 @@ __CMPWAIT_CASE( , , 64);#undef __CMPWAIT_CASE#define __CMPWAIT_GEN (sfx) \ -static inline void __cmpwait##sfx(volatile void *ptr, \ +static __always_inline void __cmpwait##sfx(volatile void *ptr, \ unsigned long val, \ int size) \ { \Signature · 1 line
2.20.0
Looks like the arm64 pull request happened without this patch so clang all{mod,yes}config builds are broken. Did the maintainers have any further comments on it or could this make it in with the next one?
Cheers,
Nathan
Will Deacon
maintainerQuoted 52 lines · Nathan Chancellor
Quoted 51 lines · Arnd Bergmann
On arm64 build with clang, sometimes the
__cmpxchg_mbis not inlined whenCONFIG_OPTIMIZE_INLININGis set.
Clang then fails a compile-time assertion, because it cannot tell at compile time what the size of the argument is:
mm/memcontrol.o: In function `__cmpxchg_mb':
memcontrol.c:(.text+0x1a4c): undefined reference to__compiletime_assert_175' memcontrol.c:(.text+0x1a4c): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol__compiletime_assert_175'Mark all of the
cmpxchg()style functions as__always_inlineto ensure that the compiler can see the result.Acked-by Nick Desaulniers <[email protected]>Reported-by Nathan Chancellor <[email protected]>Reviewed-by Nathan Chancellor <[email protected]>Tested-by Nathan Chancellor <[email protected]>Reviewed-by Andrew Murray <[email protected]>Tested-by Andrew Murray <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>---
v2: skip unneeded changes, as suggested by Andrew Murray--- arch/arm64/include/asm/cmpxchg.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)arch/arm64/include/asm/cmpxchg.h +2
-2@@ -62,7 +62,7 @@ __XCHG_CASE( , , mb_, 64, dmb ish, nop, , a, l, "memory")#undef __XCHG_CASE#define __XCHG_GEN (sfx) \ -static inline unsigned long __xchg##sfx(unsigned long x, \ +static __always_inline unsigned long __xchg##sfx(unsigned long x, \ volatile void *ptr, \ int size) \ { \@@ -148,7 +148,7 @@ __CMPXCHG_DBL(_mb)#undef __CMPXCHG_DBL#define __CMPXCHG_GEN (sfx) \ -static inline unsigned long __cmpxchg##sfx(volatile void *ptr, \ +static __always_inline unsigned long __cmpxchg##sfx(volatile void *ptr, \ unsigned long old, \ unsigned long new, \ int size) \@@ -255,7 +255,7 @@ __CMPWAIT_CASE( , , 64);#undef __CMPWAIT_CASE
Quoted 13 lines
Quoted 9 lines
arch/arm64/include/asm/cmpxchg.h +1
-1#define __CMPWAIT_GEN (sfx) \ -static inline void __cmpwait##sfx(volatile void *ptr, \ +static __always_inline void __cmpwait##sfx(volatile void *ptr, \ unsigned long val, \ int size) \ { \Signature · 1 line
2.20.0Looks like the arm64 pull request happened without this patch so clang all{mod,yes}config builds are broken. Did the maintainers have any further comments on it or could this make it in with the next one?
Fear not! I plan to send this with some other fixes we've got for -rc1. I just to get my CI scripts going again (new machine), but that shouldn't take long.
Will
Quoted 67 lines · Will Deacon
Quoted 52 lines · Nathan Chancellor
Quoted 51 lines · Arnd Bergmann
On arm64 build with clang, sometimes the
__cmpxchg_mbis not inlined whenCONFIG_OPTIMIZE_INLININGis set.
Clang then fails a compile-time assertion, because it cannot tell at compile time what the size of the argument is:
mm/memcontrol.o: In function `__cmpxchg_mb':
memcontrol.c:(.text+0x1a4c): undefined reference to__compiletime_assert_175' memcontrol.c:(.text+0x1a4c): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol__compiletime_assert_175'Mark all of the
cmpxchg()style functions as__always_inlineto ensure that the compiler can see the result.Acked-by Nick Desaulniers <[email protected]>Reported-by Nathan Chancellor <[email protected]>Reviewed-by Nathan Chancellor <[email protected]>Tested-by Nathan Chancellor <[email protected]>Reviewed-by Andrew Murray <[email protected]>Tested-by Andrew Murray <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>---
v2: skip unneeded changes, as suggested by Andrew Murray--- arch/arm64/include/asm/cmpxchg.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)arch/arm64/include/asm/cmpxchg.h +2
-2@@ -62,7 +62,7 @@ __XCHG_CASE( , , mb_, 64, dmb ish, nop, , a, l, "memory")#undef __XCHG_CASE#define __XCHG_GEN (sfx) \ -static inline unsigned long __xchg##sfx(unsigned long x, \ +static __always_inline unsigned long __xchg##sfx(unsigned long x, \ volatile void *ptr, \ int size) \ { \@@ -148,7 +148,7 @@ __CMPXCHG_DBL(_mb)#undef __CMPXCHG_DBL#define __CMPXCHG_GEN (sfx) \ -static inline unsigned long __cmpxchg##sfx(volatile void *ptr, \ +static __always_inline unsigned long __cmpxchg##sfx(volatile void *ptr, \ unsigned long old, \ unsigned long new, \ int size) \@@ -255,7 +255,7 @@ __CMPWAIT_CASE( , , 64);#undef __CMPWAIT_CASEQuoted 13 lines
Quoted 9 lines
arch/arm64/include/asm/cmpxchg.h +1
-1#define __CMPWAIT_GEN (sfx) \ -static inline void __cmpwait##sfx(volatile void *ptr, \ +static __always_inline void __cmpwait##sfx(volatile void *ptr, \ unsigned long val, \ int size) \ { \Signature · 1 line
2.20.0Looks like the arm64 pull request happened without this patch so clang all{mod,yes}config builds are broken. Did the maintainers have any further comments on it or could this make it in with the next one?
Quoted 5 lines
Fear not! I plan to send this with some other fixes we've got for -rc1. I just to get my CI scripts going again (new machine), but that shouldn't take long.
Will
Great, thank you!
Cheers,
Nathan
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel