Skip to content

Commit 39190ac

Browse files
committed
powerpc/atomic: Use YZ constraints for DS-form instructions
The 'ld' and 'std' instructions require a 4-byte aligned displacement because they are DS-form instructions. But the "m" asm constraint doesn't enforce that. That can lead to build errors if the compiler chooses a non-aligned displacement, as seen with GCC 14: /tmp/ccuSzwiR.s: Assembler messages: /tmp/ccuSzwiR.s:2579: Error: operand out of domain (39 is not a multiple of 4) make[5]: *** [scripts/Makefile.build:229: net/core/page_pool.o] Error 1 Dumping the generated assembler shows: ld 8,39(8) # MEM[(const struct atomic64_t *)_29].counter, t Use the YZ constraints to tell the compiler either to generate a DS-form displacement, or use an X-form instruction, either of which prevents the build error. See commit 2d43cc7 ("powerpc/uaccess: Fix build errors seen with GCC 13/14") for more details on the constraint letters. Fixes: 9f0cbea ("[POWERPC] Implement atomic{, 64}_{read, write}() without volatile") Cc: stable@vger.kernel.org # v2.6.24+ Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Closes: https://lore.kernel.org/all/20240913125302.0a06b4c7@canb.auug.org.au Tested-by: Mina Almasry <almasrymina@google.com> Reviewed-by: Segher Boessenkool <segher@kernel.crashing.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://msgid.link/20240916120510.2017749-1-mpe@ellerman.id.au
1 parent b77d36b commit 39190ac

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

arch/powerpc/include/asm/asm-compat.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@
3737
#define STDX_BE stringify_in_c(stdbrx)
3838
#endif
3939

40+
#ifdef CONFIG_CC_IS_CLANG
41+
#define DS_FORM_CONSTRAINT "Z<>"
42+
#else
43+
#define DS_FORM_CONSTRAINT "YZ<>"
44+
#endif
45+
4046
#else /* 32-bit */
4147

4248
/* operations for longs and pointers */

arch/powerpc/include/asm/atomic.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <asm/cmpxchg.h>
1212
#include <asm/barrier.h>
1313
#include <asm/asm-const.h>
14+
#include <asm/asm-compat.h>
1415

1516
/*
1617
* Since *_return_relaxed and {cmp}xchg_relaxed are implemented with
@@ -197,7 +198,7 @@ static __inline__ s64 arch_atomic64_read(const atomic64_t *v)
197198
if (IS_ENABLED(CONFIG_PPC_KERNEL_PREFIXED))
198199
__asm__ __volatile__("ld %0,0(%1)" : "=r"(t) : "b"(&v->counter));
199200
else
200-
__asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : "m<>"(v->counter));
201+
__asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : DS_FORM_CONSTRAINT (v->counter));
201202

202203
return t;
203204
}
@@ -208,7 +209,7 @@ static __inline__ void arch_atomic64_set(atomic64_t *v, s64 i)
208209
if (IS_ENABLED(CONFIG_PPC_KERNEL_PREFIXED))
209210
__asm__ __volatile__("std %1,0(%2)" : "=m"(v->counter) : "r"(i), "b"(&v->counter));
210211
else
211-
__asm__ __volatile__("std%U0%X0 %1,%0" : "=m<>"(v->counter) : "r"(i));
212+
__asm__ __volatile__("std%U0%X0 %1,%0" : "=" DS_FORM_CONSTRAINT (v->counter) : "r"(i));
212213
}
213214

214215
#define ATOMIC64_OP(op, asm_op) \

arch/powerpc/include/asm/uaccess.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <asm/page.h>
77
#include <asm/extable.h>
88
#include <asm/kup.h>
9+
#include <asm/asm-compat.h>
910

1011
#ifdef __powerpc64__
1112
/* We use TASK_SIZE_USER64 as TASK_SIZE is not constant */
@@ -92,12 +93,6 @@ __pu_failed: \
9293
: label)
9394
#endif
9495

95-
#ifdef CONFIG_CC_IS_CLANG
96-
#define DS_FORM_CONSTRAINT "Z<>"
97-
#else
98-
#define DS_FORM_CONSTRAINT "YZ<>"
99-
#endif
100-
10196
#ifdef __powerpc64__
10297
#ifdef CONFIG_PPC_KERNEL_PREFIXED
10398
#define __put_user_asm2_goto(x, ptr, label) \

0 commit comments

Comments
 (0)