From: Mark Rutland <mark.rutland@arm.com> To: linux-arm-kernel@lists.infradead.org Cc: linux-arch@vger.kernel.org, cdall@linaro.org, arnd@arndb.de, marc.zyngier@arm.com, catalin.marinas@arm.com, yao.qi@arm.com, kernel-hardening@lists.openwall.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, awallis@codeaurora.org, kvmarm@lists.cs.columbia.edu Subject: [PATCHv2 03/12] arm64/cpufeature: add ARMv8.3 id_aa64isar1 bits Date: Mon, 27 Nov 2017 16:37:57 +0000 [thread overview] Message-ID: <20171127163806.31435-4-mark.rutland@arm.com> (raw) In-Reply-To: <20171127163806.31435-1-mark.rutland@arm.com> From ARMv8.3 onwards, ID_AA64ISAR1 is no longer entirely RES0, and now has four fields describing the presence of pointer authentication functionality: * APA - address authentication present, using an architected algorithm * API - address authentication present, using an IMP DEF algorithm * GPA - generic authentication present, using an architected algorithm * GPI - generic authentication present, using an IMP DEF algorithm This patch adds the requisite definitions so that we can identify the presence of this functionality. For the timebeing, the features are hidden from both KVM guests and userspace. As marking them with FTR_HIDDEN only hides them from userspace, they are also protected with ifdeffery on CONFIG_ARM64_POINTER_AUTHENTICATION. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Suzuki K Poulose <suzuki.poulose@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Suzuki K Poulose <suzuki.poulose@arm.com> --- arch/arm64/kernel/cpufeature.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index c5ba0097887f..1883cdffcdf7 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -137,9 +137,17 @@ static const struct arm64_ftr_bits ftr_id_aa64isar0[] = { }; static const struct arm64_ftr_bits ftr_id_aa64isar1[] = { +#ifdef CONFIG_ARM64_POINTER_AUTHENTICATION + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_GPI_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_GPA_SHIFT, 4, 0), +#endif ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_LRCPC_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_FCMA_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_JSCVT_SHIFT, 4, 0), +#ifdef CONFIG_ARM64_POINTER_AUTHENTICATION + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_API_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_APA_SHIFT, 4, 0), +#endif ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_DPB_SHIFT, 4, 0), ARM64_FTR_END, }; -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: Mark Rutland <mark.rutland@arm.com> To: linux-arm-kernel@lists.infradead.org Cc: arnd@arndb.de, catalin.marinas@arm.com, cdall@linaro.org, kvmarm@lists.cs.columbia.edu, linux-arch@vger.kernel.org, marc.zyngier@arm.com, mark.rutland@arm.com, suzuki.poulose@arm.com, will.deacon@arm.com, yao.qi@arm.com, kernel-hardening@lists.openwall.com, linux-kernel@vger.kernel.org, awallis@codeaurora.org Subject: [PATCHv2 03/12] arm64/cpufeature: add ARMv8.3 id_aa64isar1 bits Date: Mon, 27 Nov 2017 16:37:57 +0000 [thread overview] Message-ID: <20171127163806.31435-4-mark.rutland@arm.com> (raw) Message-ID: <20171127163757.rJmVJvoRTkWNv0oizz5RlNY5WWxH19pfpdI90QEN-50@z> (raw) In-Reply-To: <20171127163806.31435-1-mark.rutland@arm.com>
next prev parent reply other threads:[~2017-11-27 16:37 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-11-27 16:37 [PATCHv2 00/12] ARMv8.3 pointer authentication userspace support Mark Rutland 2017-11-27 16:37 ` Mark Rutland 2017-11-27 16:37 ` [PATCHv2 01/12] asm-generic: mm_hooks: allow hooks to be overridden individually Mark Rutland 2017-11-27 16:37 ` Mark Rutland 2017-11-27 16:37 ` [PATCHv2 02/12] arm64: add pointer authentication register bits Mark Rutland 2017-11-27 16:37 ` Mark Rutland 2017-11-27 16:37 ` Mark Rutland [this message] 2017-11-27 16:37 ` [PATCHv2 03/12] arm64/cpufeature: add ARMv8.3 id_aa64isar1 bits Mark Rutland 2017-11-27 16:37 ` [PATCHv2 04/12] arm64/cpufeature: detect pointer authentication Mark Rutland 2017-11-27 16:37 ` Mark Rutland 2017-11-27 16:37 ` [PATCHv2 05/12] arm64: Don't trap host pointer auth use to EL2 Mark Rutland 2017-11-27 16:37 ` Mark Rutland 2018-02-06 12:39 ` Christoffer Dall 2018-02-12 16:00 ` Mark Rutland 2018-02-12 16:00 ` Mark Rutland 2017-11-27 16:38 ` [PATCHv2 06/12] arm64: add basic pointer authentication support Mark Rutland 2017-11-27 16:38 ` Mark Rutland 2018-05-22 19:06 ` Adam Wallis 2018-05-22 19:06 ` Adam Wallis 2017-11-27 16:38 ` [PATCHv2 07/12] arm64: expose user PAC bit positions via ptrace Mark Rutland 2017-11-27 16:38 ` Mark Rutland 2017-11-27 16:38 ` [PATCHv2 08/12] arm64: perf: strip PAC when unwinding userspace Mark Rutland 2017-11-27 16:38 ` Mark Rutland 2017-11-27 16:38 ` [PATCHv2 09/12] arm64/kvm: preserve host HCR_EL2 value Mark Rutland 2017-11-27 16:38 ` Mark Rutland 2018-02-06 12:39 ` Christoffer Dall 2018-04-09 14:57 ` Mark Rutland 2018-04-09 14:57 ` Mark Rutland 2018-04-09 19:03 ` Christoffer Dall 2018-04-09 19:03 ` Christoffer Dall 2017-11-27 16:38 ` [PATCHv2 10/12] arm64/kvm: context-switch ptrauth registers Mark Rutland 2017-11-27 16:38 ` Mark Rutland 2018-02-06 12:38 ` Christoffer Dall 2018-03-09 14:28 ` Mark Rutland 2018-03-09 14:28 ` Mark Rutland 2018-04-09 12:58 ` Christoffer Dall 2018-04-09 12:58 ` Christoffer Dall 2018-04-09 14:37 ` Mark Rutland 2018-04-09 14:37 ` Mark Rutland 2017-11-27 16:38 ` [PATCHv2 11/12] arm64: enable pointer authentication Mark Rutland 2017-11-27 16:38 ` Mark Rutland 2017-11-27 16:38 ` [PATCHv2 12/12] arm64: docs: document " Mark Rutland 2017-11-27 16:38 ` Mark Rutland 2017-11-28 15:07 ` Andrew Jones 2017-12-04 12:39 ` Mark Rutland 2017-12-04 12:49 ` Andrew Jones
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=20171127163806.31435-4-mark.rutland@arm.com \ --to=mark.rutland@arm.com \ --cc=arnd@arndb.de \ --cc=awallis@codeaurora.org \ --cc=catalin.marinas@arm.com \ --cc=cdall@linaro.org \ --cc=kernel-hardening@lists.openwall.com \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arch@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=marc.zyngier@arm.com \ --cc=will.deacon@arm.com \ --cc=yao.qi@arm.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: linkBe 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).