From: Nick Desaulniers <ndesaulniers@google.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>
Cc: Dennis Zhou <dennis@kernel.org>, Tejun Heo <tj@kernel.org>,
Christoph Lameter <cl@linux.com>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Al Viro <viro@zeniv.linux.org.uk>,
Andrew Morton <akpm@linux-foundation.org>,
Peter Zijlstra <peterz@infradead.org>,
linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com,
Brian Gerst <brgerst@gmail.com>,
Nick Desaulniers <ndesaulniers@google.com>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH v3 09/11] x86/percpu: Clean up percpu_stable_op()
Date: Mon, 20 Jul 2020 13:49:23 -0700 [thread overview]
Message-ID: <20200720204925.3654302-10-ndesaulniers@google.com> (raw)
In-Reply-To: <20200720204925.3654302-1-ndesaulniers@google.com>
From: Brian Gerst <brgerst@gmail.com>
Use __pcpu_size_call_return() to simplify this_cpu_read_stable().
Also remove __bad_percpu_size() which is now unused.
Tested-by: Nick Desaulniers <ndesaulniers@google.com>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
---
arch/x86/include/asm/percpu.h | 41 ++++++++++-------------------------
1 file changed, 12 insertions(+), 29 deletions(-)
diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h
index 7efc0b5c4ff0..cf2b9c2a241e 100644
--- a/arch/x86/include/asm/percpu.h
+++ b/arch/x86/include/asm/percpu.h
@@ -85,7 +85,6 @@
/* For arch-specific code, we can use direct single-insn ops (they
* don't give an lvalue though). */
-extern void __bad_percpu_size(void);
#define __pcpu_type_1 u8
#define __pcpu_type_2 u16
@@ -167,33 +166,13 @@ do { \
(typeof(_var))(unsigned long) pfo_val__; \
})
-#define percpu_stable_op(op, var) \
-({ \
- typeof(var) pfo_ret__; \
- switch (sizeof(var)) { \
- case 1: \
- asm(op "b "__percpu_arg(P1)",%0" \
- : "=q" (pfo_ret__) \
- : "p" (&(var))); \
- break; \
- case 2: \
- asm(op "w "__percpu_arg(P1)",%0" \
- : "=r" (pfo_ret__) \
- : "p" (&(var))); \
- break; \
- case 4: \
- asm(op "l "__percpu_arg(P1)",%0" \
- : "=r" (pfo_ret__) \
- : "p" (&(var))); \
- break; \
- case 8: \
- asm(op "q "__percpu_arg(P1)",%0" \
- : "=r" (pfo_ret__) \
- : "p" (&(var))); \
- break; \
- default: __bad_percpu_size(); \
- } \
- pfo_ret__; \
+#define percpu_stable_op(size, op, _var) \
+({ \
+ __pcpu_type_##size pfo_val__; \
+ asm(__pcpu_op2_##size(op, __percpu_arg(P[var]), "%[val]") \
+ : [val] __pcpu_reg_##size("=", pfo_val__) \
+ : [var] "p" (&(_var))); \
+ (typeof(_var))(unsigned long) pfo_val__; \
})
/*
@@ -258,7 +237,11 @@ do { \
* per-thread variables implemented as per-cpu variables and thus
* stable for the duration of the respective task.
*/
-#define this_cpu_read_stable(var) percpu_stable_op("mov", var)
+#define this_cpu_read_stable_1(pcp) percpu_stable_op(1, "mov", pcp)
+#define this_cpu_read_stable_2(pcp) percpu_stable_op(2, "mov", pcp)
+#define this_cpu_read_stable_4(pcp) percpu_stable_op(4, "mov", pcp)
+#define this_cpu_read_stable_8(pcp) percpu_stable_op(8, "mov", pcp)
+#define this_cpu_read_stable(pcp) __pcpu_size_call_return(this_cpu_read_stable_, pcp)
#define raw_cpu_read_1(pcp) percpu_from_op(1, , "mov", pcp)
#define raw_cpu_read_2(pcp) percpu_from_op(2, , "mov", pcp)
--
2.28.0.rc0.105.gf9edc3c819-goog
next prev parent reply other threads:[~2020-07-20 20:50 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-20 20:49 [PATCH v3 00/11] i386 Clang support Nick Desaulniers
2020-07-20 20:49 ` [PATCH v3 01/11] x86/percpu: Introduce size abstraction macros Nick Desaulniers
2020-07-23 10:43 ` [tip: x86/asm] " tip-bot2 for Brian Gerst
2020-07-20 20:49 ` [PATCH v3 02/11] x86/percpu: Clean up percpu_to_op() Nick Desaulniers
2020-07-23 10:43 ` [tip: x86/asm] " tip-bot2 for Brian Gerst
2020-07-20 20:49 ` [PATCH v3 03/11] x86/percpu: Clean up percpu_from_op() Nick Desaulniers
2020-07-23 10:43 ` [tip: x86/asm] " tip-bot2 for Brian Gerst
2020-07-20 20:49 ` [PATCH v3 04/11] x86/percpu: Clean up percpu_add_op() Nick Desaulniers
2020-07-23 10:43 ` [tip: x86/asm] " tip-bot2 for Brian Gerst
2020-07-20 20:49 ` [PATCH v3 05/11] x86/percpu: Remove "e" constraint from XADD Nick Desaulniers
2020-07-23 10:43 ` [tip: x86/asm] " tip-bot2 for Brian Gerst
2020-07-20 20:49 ` [PATCH v3 06/11] x86/percpu: Clean up percpu_add_return_op() Nick Desaulniers
2020-07-23 10:43 ` [tip: x86/asm] " tip-bot2 for Brian Gerst
2020-07-20 20:49 ` [PATCH v3 07/11] x86/percpu: Clean up percpu_xchg_op() Nick Desaulniers
2020-07-23 10:43 ` [tip: x86/asm] " tip-bot2 for Brian Gerst
2020-07-20 20:49 ` [PATCH v3 08/11] x86/percpu: Clean up percpu_cmpxchg_op() Nick Desaulniers
2020-07-23 10:43 ` [tip: x86/asm] " tip-bot2 for Brian Gerst
2020-07-20 20:49 ` Nick Desaulniers [this message]
2020-07-23 10:43 ` [tip: x86/asm] x86/percpu: Clean up percpu_stable_op() tip-bot2 for Brian Gerst
2020-07-20 20:49 ` [PATCH v3 10/11] x86/percpu: Remove unused PER_CPU() macro Nick Desaulniers
2020-07-23 10:43 ` [tip: x86/asm] " tip-bot2 for Brian Gerst
2020-07-20 20:49 ` [PATCH v3 11/11] x86: support i386 with Clang Nick Desaulniers
2020-07-23 9:14 ` Thomas Gleixner
2020-07-23 9:17 ` Thomas Gleixner
2020-07-23 11:06 ` Sedat Dilek
2020-07-23 11:42 ` Arnd Bergmann
2020-07-23 13:14 ` Sedat Dilek
2020-07-23 13:55 ` Arnd Bergmann
2020-07-24 13:22 ` Sedat Dilek
2020-07-23 10:43 ` [tip: x86/asm] x86/uaccess: Make __get_user_size() Clang compliant on 32-bit tip-bot2 for Nick Desaulniers
2020-07-21 8:09 ` [PATCH v3 00/11] i386 Clang support Sedat Dilek
2020-07-21 22:27 ` Dennis Zhou
2020-07-22 23:08 ` Thomas Gleixner
2020-07-22 23:25 ` Dennis Zhou
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=20200720204925.3654302-10-ndesaulniers@google.com \
--to=ndesaulniers@google.com \
--cc=akpm@linux-foundation.org \
--cc=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=cl@linux.com \
--cc=clang-built-linux@googlegroups.com \
--cc=dennis@kernel.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
--cc=x86@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).