Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 7693272

Browse files
committed
x86-32: fix cmpxchg8b_emu build error with clang
The kernel test robot reported that clang no longer compiles the 32-bit x86 kernel in some configurations due to commit 95ece48 ("locking/atomic/x86: Rewrite x86_32 arch_atomic64_{,fetch}_{and,or,xor}() functions"). The build fails with arch/x86/include/asm/cmpxchg_32.h:149:9: error: inline assembly requires more registers than available and the reason seems to be that not only does the cmpxchg8b instruction need four fixed registers (EDX:EAX and ECX:EBX), with the emulation fallback the inline asm also wants a fifth fixed register for the address (it uses %esi for that, but that's just a software convention with cmpxchg8b_emu). Avoiding using another pointer input to the asm (and just forcing it to use the "0(%esi)" addressing that we end up requiring for the sw fallback) seems to fix the issue. Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202406230912.F6XFIyA6-lkp@intel.com/ Fixes: 95ece48 ("locking/atomic/x86: Rewrite x86_32 arch_atomic64_{,fetch}_{and,or,xor}() functions") Link: https://lore.kernel.org/all/202406230912.F6XFIyA6-lkp@intel.com/ Suggested-by: Uros Bizjak <ubizjak@gmail.com> Reviewed-and-Tested-by: Uros Bizjak <ubizjak@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 84dd437 commit 7693272

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

arch/x86/include/asm/cmpxchg_32.h

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,9 @@ static __always_inline bool __try_cmpxchg64_local(volatile u64 *ptr, u64 *oldp,
9393
\
9494
asm volatile(ALTERNATIVE(_lock_loc \
9595
"call cmpxchg8b_emu", \
96-
_lock "cmpxchg8b %[ptr]", X86_FEATURE_CX8) \
97-
: [ptr] "+m" (*(_ptr)), \
98-
"+a" (o.low), "+d" (o.high) \
99-
: "b" (n.low), "c" (n.high), "S" (_ptr) \
96+
_lock "cmpxchg8b %a[ptr]", X86_FEATURE_CX8) \
97+
: "+a" (o.low), "+d" (o.high) \
98+
: "b" (n.low), "c" (n.high), [ptr] "S" (_ptr) \
10099
: "memory"); \
101100
\
102101
o.full; \
@@ -122,12 +121,11 @@ static __always_inline u64 arch_cmpxchg64_local(volatile u64 *ptr, u64 old, u64
122121
\
123122
asm volatile(ALTERNATIVE(_lock_loc \
124123
"call cmpxchg8b_emu", \
125-
_lock "cmpxchg8b %[ptr]", X86_FEATURE_CX8) \
124+
_lock "cmpxchg8b %a[ptr]", X86_FEATURE_CX8) \
126125
CC_SET(e) \
127126
: CC_OUT(e) (ret), \
128-
[ptr] "+m" (*(_ptr)), \
129127
"+a" (o.low), "+d" (o.high) \
130-
: "b" (n.low), "c" (n.high), "S" (_ptr) \
128+
: "b" (n.low), "c" (n.high), [ptr] "S" (_ptr) \
131129
: "memory"); \
132130
\
133131
if (unlikely(!ret)) \

0 commit comments

Comments
 (0)