From: Mark Brown <broonie@kernel.org>
To: Vincenzo Frascino <Vincenzo.Frascino@arm.com>,
Will Deacon <will@kernel.org>,
Catalin Marinas <catalin.marinas@arm.com>
Cc: Mark Brown <broonie@kernel.org>,
Kees Cook <keescook@chromium.org>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 02/10] arm64: bti: Support building kernel C code using BTI
Date: Wed, 15 Apr 2020 14:07:41 +0100 [thread overview]
Message-ID: <20200415130750.18645-3-broonie@kernel.org> (raw)
In-Reply-To: <20200415130750.18645-1-broonie@kernel.org>
When running with BTI enabled we need to ask the compiler to enable
generation of BTI landing pads beyond those generated as a result of
pointer authentication instructions being landing pads. Since the two
features are practically speaking unlikely to be used separately we
will make kernel mode BTI depend on pointer authentication in order
to simplify the Makefile.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
arch/arm64/Makefile | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index 85e4149cc5d5..90150b5b180e 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -71,7 +71,11 @@ branch-prot-flags-y += $(call cc-option,-mbranch-protection=none)
ifeq ($(CONFIG_ARM64_PTR_AUTH),y)
branch-prot-flags-$(CONFIG_CC_HAS_SIGN_RETURN_ADDRESS) := -msign-return-address=all
+ifeq ($(CONFIG_ARM64_BTI_KERNEL),y)
+branch-prot-flags-$(CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI) := -mbranch-protection=pac-ret+leaf+bti
+else
branch-prot-flags-$(CONFIG_CC_HAS_BRANCH_PROT_PAC_RET) := -mbranch-protection=pac-ret+leaf
+endif
# -march=armv8.3-a enables the non-nops instructions for PAC, to avoid the
# compiler to generate them and consequently to break the single image contract
# we pass it only to the assembler. This option is utilized only in case of non
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-04-15 13:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-15 13:07 [PATCH 00/10] arm64: BTI kernel and vDSO support Mark Brown
2020-04-15 13:07 ` [PATCH 01/10] arm64: kernel: Convert to modern annotations for assembly functions Mark Brown
2020-04-15 13:07 ` Mark Brown [this message]
2020-04-15 13:07 ` [PATCH 03/10] arm64: asm: Override SYM_FUNC_START when building the kernel with BTI Mark Brown
2020-04-15 13:07 ` [PATCH 04/10] arm64: Set GP bit in kernel page tables to enable BTI for the kernel Mark Brown
2020-04-28 17:24 ` Catalin Marinas
2020-04-28 18:03 ` Mark Brown
2020-04-29 7:40 ` Will Deacon
2020-04-29 10:10 ` Mark Brown
2020-04-15 13:07 ` [PATCH 05/10] arm64: mm: Mark module text as guarded pages Mark Brown
2020-04-27 15:07 ` Mark Brown
2020-04-15 13:07 ` [PATCH 06/10] arm64: bti: Provide Kconfig for kernel mode BTI Mark Brown
2020-04-15 13:07 ` [PATCH 07/10] arm64: asm: Provide a mechanism for generating ELF note for BTI Mark Brown
2020-04-15 13:07 ` [PATCH 08/10] arm64: vdso: Annotate " Mark Brown
2020-04-15 13:07 ` [PATCH 09/10] arm64: vdso: Force the vDSO to be linked as BTI when built " Mark Brown
2020-04-15 13:07 ` [PATCH 10/10] arm64: vdso: Map the vDSO text with guarded pages " Mark Brown
2020-04-15 13:07 ` [PATCH 10/10] arm64: vdso: Map the VDSO " Mark Brown
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=20200415130750.18645-3-broonie@kernel.org \
--to=broonie@kernel.org \
--cc=Vincenzo.Frascino@arm.com \
--cc=catalin.marinas@arm.com \
--cc=keescook@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=will@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).