From: Sami Tolvanen <samitolvanen@google.com>
To: Alex Matveev <alxmtvv@gmail.com>, Andi Kleen <ak@linux.intel.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Greg Hackmann <ghackmann@google.com>,
Kees Cook <keescook@chromium.org>,
linux-arm-kernel@lists.infradead.org,
linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
Mark Rutland <mark.rutland@arm.com>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>,
Michal Marek <michal.lkml@markovi.net>,
Nick Desaulniers <ndesaulniers@google.com>,
Yury Norov <ynorov@caviumnetworks.com>,
Matthias Kaehlcke <mka@chromium.org>
Cc: Sami Tolvanen <samitolvanen@google.com>
Subject: [PATCH v2 11/18] arm64: make mrs_s and msr_s macros work with LTO
Date: Wed, 15 Nov 2017 13:34:21 -0800 [thread overview]
Message-ID: <20171115213428.22559-12-samitolvanen@google.com> (raw)
In-Reply-To: <20171115213428.22559-1-samitolvanen@google.com>
From: Alex Matveev <alxmtvv@gmail.com>
Use UNDEFINE_MRS_S and UNDEFINE_MSR_S to define corresponding macros
in-place and workaround gcc and clang limitations on redefining macros
across different assembler blocks.
Signed-off-by: Alex Matveev <alxmtvv@gmail.com>
Signed-off-by: Yury Norov <ynorov@caviumnetworks.com>
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
---
arch/arm64/include/asm/kvm_hyp.h | 8 ++++--
arch/arm64/include/asm/sysreg.h | 55 +++++++++++++++++++++++++++-------------
2 files changed, 43 insertions(+), 20 deletions(-)
diff --git a/arch/arm64/include/asm/kvm_hyp.h b/arch/arm64/include/asm/kvm_hyp.h
index 4572a9b560fa..20bfb8e676e0 100644
--- a/arch/arm64/include/asm/kvm_hyp.h
+++ b/arch/arm64/include/asm/kvm_hyp.h
@@ -29,7 +29,9 @@
({ \
u64 reg; \
asm volatile(ALTERNATIVE("mrs %0, " __stringify(r##nvh),\
- "mrs_s %0, " __stringify(r##vh),\
+ DEFINE_MRS_S \
+ "mrs_s %0, " __stringify(r##vh) "\n"\
+ UNDEFINE_MRS_S, \
ARM64_HAS_VIRT_HOST_EXTN) \
: "=r" (reg)); \
reg; \
@@ -39,7 +41,9 @@
do { \
u64 __val = (u64)(v); \
asm volatile(ALTERNATIVE("msr " __stringify(r##nvh) ", %x0",\
- "msr_s " __stringify(r##vh) ", %x0",\
+ DEFINE_MSR_S \
+ "msr_s " __stringify(r##vh) ", %x0\n"\
+ UNDEFINE_MSR_S, \
ARM64_HAS_VIRT_HOST_EXTN) \
: : "rZ" (__val)); \
} while (0)
diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
index 08cc88574659..3ae147c7e160 100644
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -584,20 +584,39 @@
#include <linux/types.h>
-asm(
-" .irp num,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30\n"
-" .equ .L__reg_num_x\\num, \\num\n"
-" .endr\n"
+#define __DEFINE_MRS_MSR_S_REGNUM \
+" .irp num,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30\n" \
+" .equ .L__reg_num_x\\num, \\num\n" \
+" .endr\n" \
" .equ .L__reg_num_xzr, 31\n"
-"\n"
-" .macro mrs_s, rt, sreg\n"
- __emit_inst(0xd5200000|(\\sreg)|(.L__reg_num_\\rt))
+
+#define DEFINE_MRS_S \
+ __DEFINE_MRS_MSR_S_REGNUM \
+" .macro mrs_s, rt, sreg\n" \
+ __emit_inst(0xd5200000|(\\sreg)|(.L__reg_num_\\rt)) \
" .endm\n"
-"\n"
-" .macro msr_s, sreg, rt\n"
- __emit_inst(0xd5000000|(\\sreg)|(.L__reg_num_\\rt))
+
+#define DEFINE_MSR_S \
+ __DEFINE_MRS_MSR_S_REGNUM \
+" .macro msr_s, sreg, rt\n" \
+ __emit_inst(0xd5000000|(\\sreg)|(.L__reg_num_\\rt)) \
" .endm\n"
-);
+
+#define UNDEFINE_MRS_S \
+" .purgem mrs_s\n"
+
+#define UNDEFINE_MSR_S \
+" .purgem msr_s\n"
+
+#define __mrs_s(r, v) \
+ DEFINE_MRS_S \
+" mrs_s %0, " __stringify(r) "\n" \
+ UNDEFINE_MRS_S : "=r" (v)
+
+#define __msr_s(r, v) \
+ DEFINE_MSR_S \
+" msr_s " __stringify(r) ", %x0\n" \
+ UNDEFINE_MSR_S : : "rZ" (v)
/*
* Unlike read_cpuid, calls to read_sysreg are never expected to be
@@ -623,15 +642,15 @@ asm(
* For registers without architectural names, or simply unsupported by
* GAS.
*/
-#define read_sysreg_s(r) ({ \
- u64 __val; \
- asm volatile("mrs_s %0, " __stringify(r) : "=r" (__val)); \
- __val; \
+#define read_sysreg_s(r) ({ \
+ u64 __val; \
+ asm volatile(__mrs_s(r, __val)); \
+ __val; \
})
-#define write_sysreg_s(v, r) do { \
- u64 __val = (u64)(v); \
- asm volatile("msr_s " __stringify(r) ", %x0" : : "rZ" (__val)); \
+#define write_sysreg_s(v, r) do { \
+ u64 __val = (u64)(v); \
+ asm volatile(__msr_s(r, __val)); \
} while (0)
static inline void config_sctlr_el1(u32 clear, u32 set)
--
2.15.0.448.gf294e3d99a-goog
next prev parent reply other threads:[~2017-11-15 21:37 UTC|newest]
Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-15 21:34 [PATCH v2 00/18] Add support for clang LTO Sami Tolvanen
2017-11-15 21:34 ` [PATCH v2 01/18] kbuild: add ld-name macro and support for GNU gold Sami Tolvanen
2017-11-15 21:53 ` Kees Cook
2017-11-15 21:34 ` [PATCH v2 02/18] kbuild: fix LD_DEAD_CODE_DATA_ELIMINATION with " Sami Tolvanen
2017-11-15 21:34 ` [PATCH v2 03/18] kbuild: move gcc-version.sh to cc-version.sh and add clang support Sami Tolvanen
2017-11-15 21:48 ` Kees Cook
2017-11-15 22:06 ` Sami Tolvanen
2017-11-15 21:34 ` [PATCH v2 04/18] arm64: use -mno-implicit-float instead of -mgeneral-regs-only Sami Tolvanen
2017-11-15 21:34 ` [PATCH v2 05/18] arm64: fix -m for GNU gold Sami Tolvanen
2017-11-16 10:55 ` Yury Norov
2017-11-16 16:55 ` Nick Desaulniers
2017-11-15 21:34 ` [PATCH v2 06/18] arm64: kvm: use -fno-jump-tables with clang Sami Tolvanen
2017-11-16 11:46 ` Will Deacon
2017-11-16 16:25 ` Sami Tolvanen
2017-11-20 14:41 ` Mark Rutland
2017-11-20 14:43 ` Mark Rutland
2017-11-20 14:47 ` Ard Biesheuvel
2017-11-15 21:34 ` [PATCH v2 07/18] arm64: keep .altinstructions and .altinstr_replacement Sami Tolvanen
2017-11-15 21:34 ` [PATCH v2 08/18] arm64: don't disable ADR_PREL_PG_HI21* with ARM64_ERRATUM_843419 Sami Tolvanen
2017-11-15 22:29 ` Ard Biesheuvel
2017-11-16 11:44 ` Will Deacon
2017-11-16 16:32 ` Sami Tolvanen
2017-11-16 16:34 ` Ard Biesheuvel
2017-11-16 21:37 ` Sami Tolvanen
2017-11-16 22:14 ` Ard Biesheuvel
2017-11-16 22:25 ` Ard Biesheuvel
2017-11-16 23:09 ` Sami Tolvanen
2017-11-16 23:20 ` Ard Biesheuvel
2017-11-16 23:50 ` Sami Tolvanen
2017-11-17 9:54 ` Ard Biesheuvel
2017-11-17 18:49 ` Sami Tolvanen
2017-11-15 21:34 ` [PATCH v2 09/18] arm64: explicitly pass --no-fix-cortex-a53-843419 to GNU gold Sami Tolvanen
2017-11-16 11:47 ` Will Deacon
2017-11-16 16:35 ` Sami Tolvanen
2017-11-20 14:47 ` Mark Rutland
2017-11-20 20:35 ` Sami Tolvanen
2017-11-21 11:15 ` Mark Rutland
2017-11-15 21:34 ` [PATCH v2 10/18] arm64: add a workaround for GNU gold with ARM64_MODULE_PLTS Sami Tolvanen
2017-11-16 11:50 ` Will Deacon
2017-11-16 16:41 ` Sami Tolvanen
2017-11-16 18:47 ` Will Deacon
2017-11-15 21:34 ` Sami Tolvanen [this message]
2017-11-16 11:54 ` [PATCH v2 11/18] arm64: make mrs_s and msr_s macros work with LTO Will Deacon
2017-11-16 13:07 ` Yury Norov
2017-11-16 13:55 ` Robin Murphy
2017-11-16 21:29 ` Yury Norov
2017-11-16 22:54 ` Alex Matveev
2017-12-04 17:34 ` Nick Desaulniers
2017-11-16 13:56 ` Segher Boessenkool
2017-11-16 16:46 ` Sami Tolvanen
2017-11-16 17:01 ` Segher Boessenkool
2017-11-16 17:11 ` Sami Tolvanen
2017-11-16 16:43 ` Sami Tolvanen
2017-11-16 16:44 ` Nick Desaulniers
2017-11-16 18:14 ` Alex Matveev
2017-11-15 21:34 ` [PATCH v2 12/18] kbuild: add support for clang LTO Sami Tolvanen
2017-11-15 22:06 ` Kees Cook
2017-11-18 3:21 ` [v2,12/18] " Nicholas Piggin
2017-11-20 20:21 ` Sami Tolvanen
2017-11-21 1:01 ` Nicholas Piggin
2017-11-29 23:30 ` Sami Tolvanen
2017-11-15 21:34 ` [PATCH v2 13/18] kbuild: fix dynamic ftrace with " Sami Tolvanen
2017-11-15 21:34 ` [PATCH v2 14/18] scripts/mod: disable LTO for empty.c Sami Tolvanen
2017-11-15 21:34 ` [PATCH v2 15/18] efi/libstub: disable LTO Sami Tolvanen
2017-11-15 21:34 ` [PATCH v2 16/18] arm64: crypto: disable LTO for aes-ce-cipher.c Sami Tolvanen
2017-11-20 15:20 ` Mark Rutland
2017-11-20 15:25 ` Ard Biesheuvel
2017-11-20 21:01 ` Sami Tolvanen
2017-11-21 11:47 ` Mark Rutland
2017-11-20 20:51 ` Sami Tolvanen
2017-11-20 21:29 ` Alex Matveev
2017-11-20 21:31 ` Ard Biesheuvel
2017-11-20 22:03 ` Alex Matveev
2017-11-15 21:34 ` [PATCH v2 17/18] arm64: disable RANDOMIZE_MODULE_REGION_FULL with LTO_CLANG Sami Tolvanen
2017-11-15 21:34 ` [PATCH v2 18/18] arm64: select ARCH_SUPPORTS_LTO_CLANG Sami Tolvanen
2017-11-16 11:58 ` Will Deacon
2017-11-16 16:17 ` Sami Tolvanen
2017-11-16 16:30 ` Peter Zijlstra
2017-11-16 16:50 ` Nick Desaulniers
2017-11-16 16:59 ` Peter Zijlstra
2017-11-16 17:16 ` Nick Desaulniers
2017-11-16 17:34 ` Peter Zijlstra
2017-11-16 17:48 ` Paul E. McKenney
2017-11-16 18:16 ` Nick Desaulniers
2017-11-16 18:39 ` Paul E. McKenney
2017-11-16 18:45 ` Will Deacon
2017-11-16 19:13 ` Paul E. McKenney
2017-11-16 20:17 ` Sami Tolvanen
2017-11-20 18:05 ` Will Deacon
2017-11-20 19:25 ` Peter Zijlstra
2017-11-20 19:28 ` Peter Zijlstra
2017-11-20 20:52 ` Paul E. McKenney
2017-11-20 19:32 ` Peter Zijlstra
2017-11-20 20:53 ` Paul E. McKenney
2017-11-21 17:23 ` David Laight
2017-11-21 18:51 ` Paul E. McKenney
2017-11-23 13:42 ` Alexander Potapenko
2017-11-24 7:52 ` Dmitry Vyukov
2017-11-16 20:53 ` [PATCH v2 00/18] Add support for clang LTO Yury Norov
2017-11-16 21:38 ` Sami Tolvanen
2017-11-20 15:21 ` Mark Rutland
2017-11-20 21:04 ` Sami Tolvanen
2017-11-21 11:53 ` Mark Rutland
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=20171115213428.22559-12-samitolvanen@google.com \
--to=samitolvanen@google.com \
--cc=ak@linux.intel.com \
--cc=alxmtvv@gmail.com \
--cc=ard.biesheuvel@linaro.org \
--cc=ghackmann@google.com \
--cc=keescook@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maxim.kuvyrkov@linaro.org \
--cc=michal.lkml@markovi.net \
--cc=mka@chromium.org \
--cc=ndesaulniers@google.com \
--cc=yamada.masahiro@socionext.com \
--cc=ynorov@caviumnetworks.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 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).