From: Heiko Carstens <hca@linux.ibm.com>
To: Alexander Gordeev <agordeev@linux.ibm.com>,
Sven Schnelle <svens@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Christian Borntraeger <borntraeger@linux.ibm.com>,
Mete Durlu <meted@linux.ibm.com>,
Peter Zijlstra <peterz@infradead.org>,
Mark Rutland <mark.rutland@arm.com>,
Juergen Christ <jchrist@linux.ibm.com>,
Ilya Leoshkevich <iii@linux.ibm.com>
Cc: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org
Subject: [PATCH v4 04/11] s390/percpu: Let MVIY_PERCPU() calculate alternative displacement
Date: Mon, 21 Sep 2026 17:57:58 +0200 [thread overview]
Message-ID: <20260921155806.2447506-5-hca@linux.ibm.com> (raw)
In-Reply-To: <20260921155806.2447506-1-hca@linux.ibm.com>
Let MVIY_PERCPU() calculate the alternative lowcore displacement instead
of passing the same value(s) again and again in all percpu inline
assemblies.
This shortens the inline assemblies and makes them a bit more readable.
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
---
arch/s390/include/asm/percpu.h | 68 +++++++++++++++-------------------
1 file changed, 29 insertions(+), 39 deletions(-)
diff --git a/arch/s390/include/asm/percpu.h b/arch/s390/include/asm/percpu.h
index 9888b38dedab..3bc448c4c2dd 100644
--- a/arch/s390/include/asm/percpu.h
+++ b/arch/s390/include/asm/percpu.h
@@ -99,7 +99,9 @@
* MVIY_ALT(...) <- end of percpu code section
*/
-#define MVIY_PERCPU(disp, dispalt, reg) \
+#define LC_ALT_ADDR __stringify(LOWCORE_ALT_ADDRESS)
+
+#define MVIY_PERCPU(disp, reg) \
".macro GEN_MVIY disp, reg\n" \
".set .Lreg,255\n" \
".irp rs,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15\n" \
@@ -112,19 +114,19 @@
".endif\n" \
"mviy \\disp(%%r0),.Lreg\n" \
".endm\n" \
- ALTERNATIVE("GEN_MVIY " disp ", " reg "\n", \
- "GEN_MVIY " dispalt ", " reg "\n", \
+ ALTERNATIVE("GEN_MVIY " disp " , " reg "\n", \
+ "GEN_MVIY " disp "+" LC_ALT_ADDR " , " reg "\n", \
ALT_FEATURE(MFEATURE_LOWCORE)) \
".purgem GEN_MVIY\n"
-#define MVIY_ALT(disp, dispalt) \
- ALTERNATIVE(" mviy " disp "(%%r0),0\n", \
- " mviy " dispalt "(%%r0),0\n", \
+#define MVIY_ALT(disp) \
+ ALTERNATIVE(" mviy " disp "(%%r0),0\n", \
+ " mviy " disp "+" LC_ALT_ADDR "(%%r0),0\n", \
ALT_FEATURE(MFEATURE_LOWCORE))
-#define AG_ALT(disp, dispalt, reg) \
- ALTERNATIVE(" ag " reg ", " disp "(%%r0)\n", \
- " ag " reg ", " dispalt "(%%r0)\n", \
+#define AG_ALT(disp, reg) \
+ ALTERNATIVE(" ag " reg ", " disp "(%%r0)\n", \
+ " ag " reg ", " disp "+" LC_ALT_ADDR "(%%r0)\n", \
ALT_FEATURE(MFEATURE_LOWCORE))
#ifndef MARCH_HAS_Z196_FEATURES
@@ -153,33 +155,29 @@ do { \
if (__builtin_constant_p(val__) && \
((szcast)val__ > -129) && ((szcast)val__ < 128)) { \
asm volatile( \
- MVIY_PERCPU("%[disppcpr]", "%[dispaltpcpr]", "%[ptr__]")\
- AG_ALT("%[disppcpo]", "%[dispaltpcpo]", "%[ptr__]") \
+ MVIY_PERCPU("%[disppcpr]","%[ptr__]") \
+ AG_ALT("%[disppcpo]", "%[ptr__]") \
op2 " 0(%[ptr__]),%[val__]\n" \
- MVIY_ALT("%[disppcpr]", "%[dispaltpcpr]") \
+ MVIY_ALT("%[disppcpr]") \
: [ptr__] "+&a" (ptr__), "+m" (*ptr__), \
"=m" (((struct lowcore *)0)->percpu_register) \
: [val__] "i" ((szcast)val__), \
[disppcpr] "i" (lc_pcpr), \
[disppcpo] "i" (lc_pcpo), \
- [dispaltpcpr] "i" (lc_pcpr + LOWCORE_ALT_ADDRESS), \
- [dispaltpcpo] "i" (lc_pcpo + LOWCORE_ALT_ADDRESS), \
"m" (((struct lowcore *)0)->percpu_offset) \
: "cc"); \
} else { \
asm volatile( \
- MVIY_PERCPU("%[disppcpr]", "%[dispaltpcpr]", "%[ptr__]")\
- AG_ALT("%[disppcpo]", "%[dispaltpcpo]", "%[ptr__]") \
+ MVIY_PERCPU("%[disppcpr]", "%[ptr__]") \
+ AG_ALT("%[disppcpo]", "%[ptr__]") \
op1 " %[old__],%[val__],0(%[ptr__])\n" \
- MVIY_ALT("%[disppcpr]", "%[dispaltpcpr]") \
+ MVIY_ALT("%[disppcpr]") \
: [old__] "=&d" (old__), \
[ptr__] "+&a" (ptr__), "+m" (*ptr__), \
"=m" (((struct lowcore *)0)->percpu_register) \
: [val__] "d" (val__), \
[disppcpr] "i" (lc_pcpr), \
[disppcpo] "i" (lc_pcpo), \
- [dispaltpcpr] "i" (lc_pcpr + LOWCORE_ALT_ADDRESS), \
- [dispaltpcpo] "i" (lc_pcpo + LOWCORE_ALT_ADDRESS), \
"m" (((struct lowcore *)0)->percpu_offset) \
: "cc"); \
} \
@@ -199,18 +197,16 @@ do { \
lc_pcpo = offsetof(struct lowcore, percpu_offset); \
ptr__ = PERCPU_PTR(&(pcp)); \
asm_inline volatile( \
- MVIY_PERCPU("%[disppcpr]", "%[dispaltpcpr]", "%[ptr__]")\
- AG_ALT("%[disppcpo]", "%[dispaltpcpo]", "%[ptr__]") \
+ MVIY_PERCPU("%[disppcpr]","%[ptr__]") \
+ AG_ALT("%[disppcpo]","%[ptr__]") \
op " %[old__],%[val__],0(%[ptr__])\n" \
- MVIY_ALT("%[disppcpr]", "%[dispaltpcpr]") \
+ MVIY_ALT("%[disppcpr]") \
: [old__] "=&d" (old__), \
[ptr__] "+&a" (ptr__), "+m" (*ptr__), \
"=m" (((struct lowcore *)0)->percpu_register) \
: [val__] "d" (val__), \
[disppcpr] "i" (lc_pcpr), \
[disppcpo] "i" (lc_pcpo), \
- [dispaltpcpr] "i" (lc_pcpr + LOWCORE_ALT_ADDRESS), \
- [dispaltpcpo] "i" (lc_pcpo + LOWCORE_ALT_ADDRESS), \
"m" (((struct lowcore *)0)->percpu_offset) \
: "cc"); \
old__ + val__; \
@@ -230,18 +226,16 @@ do { \
lc_pcpo = offsetof(struct lowcore, percpu_offset); \
ptr__ = PERCPU_PTR(&(pcp)); \
asm_inline volatile( \
- MVIY_PERCPU("%[disppcpr]", "%[dispaltpcpr]", "%[ptr__]")\
- AG_ALT("%[disppcpo]", "%[dispaltpcpo]", "%[ptr__]") \
+ MVIY_PERCPU("%[disppcpr]","%[ptr__]") \
+ AG_ALT("%[disppcpo]","%[ptr__]") \
op " %[old__],%[val__],0(%[ptr__])\n" \
- MVIY_ALT("%[disppcpr]", "%[dispaltpcpr]") \
+ MVIY_ALT("%[disppcpr]") \
: [old__] "=&d" (old__), \
[ptr__] "+&a" (ptr__), "+m" (*ptr__), \
"=m" (((struct lowcore *)0)->percpu_register) \
: [val__] "d" (val__), \
[disppcpr] "i" (lc_pcpr), \
[disppcpo] "i" (lc_pcpo), \
- [dispaltpcpr] "i" (lc_pcpr + LOWCORE_ALT_ADDRESS), \
- [dispaltpcpo] "i" (lc_pcpo + LOWCORE_ALT_ADDRESS), \
"m" (((struct lowcore *)0)->percpu_offset) \
: "cc"); \
} while (0)
@@ -263,16 +257,14 @@ do { \
lc_pcpo = offsetof(struct lowcore, percpu_offset); \
ptr__ = PERCPU_PTR(&(pcp)); \
asm_inline volatile( \
- MVIY_PERCPU("%[disppcpr]", "%[dispaltpcpr]", "%[ptr__]")\
- AG_ALT("%[disppcpo]", "%[dispaltpcpo]", "%[ptr__]") \
+ MVIY_PERCPU("%[disppcpr]","%[ptr__]") \
+ AG_ALT("%[disppcpo]","%[ptr__]") \
op " %[res__],0(%[ptr__])\n" \
- MVIY_ALT("%[disppcpr]", "%[dispaltpcpr]") \
+ MVIY_ALT("%[disppcpr]") \
: [res__] "=&d" (res__), [ptr__] "+&a" (ptr__), \
"=m" (((struct lowcore *)0)->percpu_register) \
: [disppcpr] "i" (lc_pcpr), \
[disppcpo] "i" (lc_pcpo), \
- [dispaltpcpr] "i" (lc_pcpr + LOWCORE_ALT_ADDRESS), \
- [dispaltpcpo] "i" (lc_pcpo + LOWCORE_ALT_ADDRESS), \
"m" (*ptr__), \
"m" (((struct lowcore *)0)->percpu_offset) \
: "cc"); \
@@ -294,17 +286,15 @@ do { \
lc_pcpo = offsetof(struct lowcore, percpu_offset); \
ptr__ = PERCPU_PTR(&(pcp)); \
asm_inline volatile( \
- MVIY_PERCPU("%[disppcpr]", "%[dispaltpcpr]", "%[ptr__]")\
- AG_ALT("%[disppcpo]", "%[dispaltpcpo]", "%[ptr__]") \
+ MVIY_PERCPU("%[disppcpr]","%[ptr__]") \
+ AG_ALT("%[disppcpo]","%[ptr__]") \
op " %[val__],0(%[ptr__])\n" \
- MVIY_ALT("%[disppcpr]", "%[dispaltpcpr]") \
+ MVIY_ALT("%[disppcpr]") \
: [ptr__] "+&a" (ptr__), "=m" (*ptr__), \
"=m" (((struct lowcore *)0)->percpu_register) \
: [val__] "d" (val__), \
[disppcpr] "i" (lc_pcpr), \
[disppcpo] "i" (lc_pcpo), \
- [dispaltpcpr] "i" (lc_pcpr + LOWCORE_ALT_ADDRESS), \
- [dispaltpcpo] "i" (lc_pcpo + LOWCORE_ALT_ADDRESS), \
"m" (((struct lowcore *)0)->percpu_offset) \
: "cc"); \
} while (0)
--
2.53.0
next prev parent reply other threads:[~2026-09-21 15:58 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-21 15:57 [PATCH v4 00/11] s390: More this_cpu_*() changes Heiko Carstens
2026-09-21 15:57 ` [PATCH v4 01/11] s390/percpu: Fix comment typo Heiko Carstens
2026-09-21 16:00 ` sashiko-bot
2026-09-21 15:57 ` [PATCH v4 02/11] s390/percpu: Add sanity check to GEN_MVIY macro Heiko Carstens
2026-09-21 16:03 ` sashiko-bot
2026-09-21 15:57 ` [PATCH v4 03/11] s390/lowcore: Remove _AC() from LOWCORE_ALT_ADDRESS Heiko Carstens
2026-09-21 16:07 ` sashiko-bot
2026-09-21 15:57 ` Heiko Carstens [this message]
2026-09-21 16:15 ` [PATCH v4 04/11] s390/percpu: Let MVIY_PERCPU() calculate alternative displacement sashiko-bot
2026-09-21 15:57 ` [PATCH v4 05/11] s390/percpu/lowcore: Add and use LC_PERCPU lowcore offset defines Heiko Carstens
2026-09-21 16:18 ` sashiko-bot
2026-09-21 15:58 ` [PATCH v4 06/11] s390/percpu: Rename inline assembly symbolic names Heiko Carstens
2026-09-21 16:19 ` sashiko-bot
2026-09-21 15:58 ` [PATCH v4 07/11] s390/percpu: Use __PCPU_BEGIN() and __PCPU_END() for inline assemblies Heiko Carstens
2026-09-21 16:23 ` sashiko-bot
2026-09-21 15:58 ` [PATCH v4 08/11] s390/percpu: Use percpu code section for this_cpu_cmpxchg128() Heiko Carstens
2026-09-21 16:29 ` sashiko-bot
2026-09-21 15:58 ` [PATCH v4 09/11] s390/percpu: Use percpu code section for this_cpu_xchg() Heiko Carstens
2026-09-21 16:34 ` sashiko-bot
2026-09-21 15:58 ` [PATCH v4 10/11] s390/percpu: Use percpu code section for this_cpu_cmpxchg() Heiko Carstens
2026-09-21 16:42 ` sashiko-bot
2026-09-21 15:58 ` [PATCH v4 11/11] s390/percpu: Rework to simplify percpu_entry() and percpu_exit() Heiko Carstens
2026-09-21 16:48 ` sashiko-bot
2026-09-22 15:37 ` [PATCH v4 00/11] s390: More this_cpu_*() changes Mete Durlu
2026-09-22 18:22 ` Heiko Carstens
2026-09-23 6:02 ` Mete Durlu
2026-09-26 6:53 ` Alexander Gordeev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260921155806.2447506-5-hca@linux.ibm.com \
--to=hca@linux.ibm.com \
--cc=agordeev@linux.ibm.com \
--cc=borntraeger@linux.ibm.com \
--cc=gor@linux.ibm.com \
--cc=iii@linux.ibm.com \
--cc=jchrist@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=meted@linux.ibm.com \
--cc=peterz@infradead.org \
--cc=svens@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.