Skip to content

Commit 54cd971

Browse files
ubizjakingomolnar
authored andcommitted
x86/percpu: Define {raw,this}_cpu_try_cmpxchg{64,128}
Define target-specific {raw,this}_cpu_try_cmpxchg64() and {raw,this}_cpu_try_cmpxchg128() macros. These definitions override the generic fallback definitions and enable target-specific optimized implementations. Several places in mm/slub.o improve from e.g.: 53bc: 48 8d 4f 40 lea 0x40(%rdi),%rcx 53c0: 48 89 fa mov %rdi,%rdx 53c3: 49 8b 5c 05 00 mov 0x0(%r13,%rax,1),%rbx 53c8: 4c 89 e8 mov %r13,%rax 53cb: 49 8d 30 lea (%r8),%rsi 53ce: e8 00 00 00 00 call 53d3 <...> 53cf: R_X86_64_PLT32 this_cpu_cmpxchg16b_emu-0x4 53d3: 48 31 d7 xor %rdx,%rdi 53d6: 4c 31 e8 xor %r13,%rax 53d9: 48 09 c7 or %rax,%rdi 53dc: 75 ae jne 538c <...> to: 53bc: 48 8d 4a 40 lea 0x40(%rdx),%rcx 53c0: 49 8b 1c 07 mov (%r15,%rax,1),%rbx 53c4: 4c 89 f8 mov %r15,%rax 53c7: 48 8d 37 lea (%rdi),%rsi 53ca: e8 00 00 00 00 call 53cf <...> 53cb: R_X86_64_PLT32 this_cpu_cmpxchg16b_emu-0x4 53cf: 75 bb jne 538c <...> reducing the size of mm/slub.o by 80 bytes: text data bss dec hex filename 39758 5337 4208 49303 c097 slub-new.o 39838 5337 4208 49383 c0e7 slub-old.o Signed-off-by: Uros Bizjak <ubizjak@gmail.com> Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: https://lore.kernel.org/r/20230906185941.53527-1-ubizjak@gmail.com
1 parent 3dae5c4 commit 54cd971

1 file changed

Lines changed: 67 additions & 0 deletions

File tree

arch/x86/include/asm/percpu.h

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,12 +237,47 @@ do { \
237237

238238
#define raw_cpu_cmpxchg64(pcp, oval, nval) percpu_cmpxchg64_op(8, , pcp, oval, nval)
239239
#define this_cpu_cmpxchg64(pcp, oval, nval) percpu_cmpxchg64_op(8, volatile, pcp, oval, nval)
240+
241+
#define percpu_try_cmpxchg64_op(size, qual, _var, _ovalp, _nval) \
242+
({ \
243+
bool success; \
244+
u64 *_oval = (u64 *)(_ovalp); \
245+
union { \
246+
u64 var; \
247+
struct { \
248+
u32 low, high; \
249+
}; \
250+
} old__, new__; \
251+
\
252+
old__.var = *_oval; \
253+
new__.var = _nval; \
254+
\
255+
asm qual (ALTERNATIVE("leal %P[var], %%esi; call this_cpu_cmpxchg8b_emu", \
256+
"cmpxchg8b " __percpu_arg([var]), X86_FEATURE_CX8) \
257+
CC_SET(z) \
258+
: CC_OUT(z) (success), \
259+
[var] "+m" (_var), \
260+
"+a" (old__.low), \
261+
"+d" (old__.high) \
262+
: "b" (new__.low), \
263+
"c" (new__.high) \
264+
: "memory", "esi"); \
265+
if (unlikely(!success)) \
266+
*_oval = old__.var; \
267+
likely(success); \
268+
})
269+
270+
#define raw_cpu_try_cmpxchg64(pcp, ovalp, nval) percpu_try_cmpxchg64_op(8, , pcp, ovalp, nval)
271+
#define this_cpu_try_cmpxchg64(pcp, ovalp, nval) percpu_try_cmpxchg64_op(8, volatile, pcp, ovalp, nval)
240272
#endif
241273

242274
#ifdef CONFIG_X86_64
243275
#define raw_cpu_cmpxchg64(pcp, oval, nval) percpu_cmpxchg_op(8, , pcp, oval, nval);
244276
#define this_cpu_cmpxchg64(pcp, oval, nval) percpu_cmpxchg_op(8, volatile, pcp, oval, nval);
245277

278+
#define raw_cpu_try_cmpxchg64(pcp, ovalp, nval) percpu_try_cmpxchg_op(8, , pcp, ovalp, nval);
279+
#define this_cpu_try_cmpxchg64(pcp, ovalp, nval) percpu_try_cmpxchg_op(8, volatile, pcp, ovalp, nval);
280+
246281
#define percpu_cmpxchg128_op(size, qual, _var, _oval, _nval) \
247282
({ \
248283
union { \
@@ -269,6 +304,38 @@ do { \
269304

270305
#define raw_cpu_cmpxchg128(pcp, oval, nval) percpu_cmpxchg128_op(16, , pcp, oval, nval)
271306
#define this_cpu_cmpxchg128(pcp, oval, nval) percpu_cmpxchg128_op(16, volatile, pcp, oval, nval)
307+
308+
#define percpu_try_cmpxchg128_op(size, qual, _var, _ovalp, _nval) \
309+
({ \
310+
bool success; \
311+
u128 *_oval = (u128 *)(_ovalp); \
312+
union { \
313+
u128 var; \
314+
struct { \
315+
u64 low, high; \
316+
}; \
317+
} old__, new__; \
318+
\
319+
old__.var = *_oval; \
320+
new__.var = _nval; \
321+
\
322+
asm qual (ALTERNATIVE("leaq %P[var], %%rsi; call this_cpu_cmpxchg16b_emu", \
323+
"cmpxchg16b " __percpu_arg([var]), X86_FEATURE_CX16) \
324+
CC_SET(z) \
325+
: CC_OUT(z) (success), \
326+
[var] "+m" (_var), \
327+
"+a" (old__.low), \
328+
"+d" (old__.high) \
329+
: "b" (new__.low), \
330+
"c" (new__.high) \
331+
: "memory", "rsi"); \
332+
if (unlikely(!success)) \
333+
*_oval = old__.var; \
334+
likely(success); \
335+
})
336+
337+
#define raw_cpu_try_cmpxchg128(pcp, ovalp, nval) percpu_try_cmpxchg128_op(16, , pcp, ovalp, nval)
338+
#define this_cpu_try_cmpxchg128(pcp, ovalp, nval) percpu_try_cmpxchg128_op(16, volatile, pcp, ovalp, nval)
272339
#endif
273340

274341
/*

0 commit comments

Comments
 (0)