From: Amit Kachhap <amit.kachhap@arm.com>
To: Catalin Marinas <catalin.marinas@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>,
Kees Cook <keescook@chromium.org>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Richard Henderson <richard.henderson@linaro.org>,
Kristina Martsenko <kristina.martsenko@arm.com>,
James Morse <james.morse@arm.com>,
Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>,
Mark Brown <Mark.Brown@arm.com>,
Vincenzo Frascino <Vincenzo.Frascino@arm.com>,
Will Deacon <will@kernel.org>, Dave Martin <Dave.Martin@arm.com>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v3 03/16] arm64: install user ptrauth keys at kernel exit time
Date: Thu, 16 Jan 2020 18:09:46 +0530 [thread overview]
Message-ID: <44849238-8f25-093f-da71-b4bc6c062d85@arm.com> (raw)
In-Reply-To: <20200115170238.GH3429@arrakis.emea.arm.com>
On 1/15/20 10:32 PM, Catalin Marinas wrote:
> On Mon, Dec 16, 2019 at 02:17:05PM +0530, Amit Daniel Kachhap wrote:
>> diff --git a/arch/arm64/include/asm/asm_pointer_auth.h b/arch/arm64/include/asm/asm_pointer_auth.h
>> new file mode 100644
>> index 0000000..3d39788
>> --- /dev/null
>> +++ b/arch/arm64/include/asm/asm_pointer_auth.h
>> @@ -0,0 +1,45 @@
>> +/* SPDX-License-Identifier: GPL-2.0 */
>> +#ifndef __ASM_ASM_POINTER_AUTH_H
>> +#define __ASM_ASM_POINTER_AUTH_H
>> +
>> +#include <asm/alternative.h>
>> +#include <asm/asm-offsets.h>
>> +#include <asm/cpufeature.h>
>> +#include <asm/sysreg.h>
>> +
>> +#ifdef CONFIG_ARM64_PTR_AUTH
>> +
>> + .macro ptrauth_keys_install_user tsk, tmp1, tmp2, tmp3
>> + mov \tmp1, #THREAD_KEYS_USER
>> + add \tmp1, \tsk, \tmp1
>
> I think we can remove these instructions (assuming that the ldp #imm
> range is sufficient),
No #imm is exceeding the range. Probably a comment here will be useful.
>
>> +alternative_if_not ARM64_HAS_ADDRESS_AUTH
>> + b .Laddr_auth_skip_\@
>> +alternative_else_nop_endif
>> + ldp \tmp2, \tmp3, [\tmp1, #PTRAUTH_USER_KEY_APIA]
>
> use \tsk directly here (see below)
>
>> + msr_s SYS_APIAKEYLO_EL1, \tmp2
>> + msr_s SYS_APIAKEYHI_EL1, \tmp3
>> + ldp \tmp2, \tmp3, [\tmp1, #PTRAUTH_USER_KEY_APIB]
>> + msr_s SYS_APIBKEYLO_EL1, \tmp2
>> + msr_s SYS_APIBKEYHI_EL1, \tmp3
>> + ldp \tmp2, \tmp3, [\tmp1, #PTRAUTH_USER_KEY_APDA]
>> + msr_s SYS_APDAKEYLO_EL1, \tmp2
>> + msr_s SYS_APDAKEYHI_EL1, \tmp3
>> + ldp \tmp2, \tmp3, [\tmp1, #PTRAUTH_USER_KEY_APDB]
>> + msr_s SYS_APDBKEYLO_EL1, \tmp2
>> + msr_s SYS_APDBKEYHI_EL1, \tmp3
>> +.Laddr_auth_skip_\@:
>> +alternative_if ARM64_HAS_GENERIC_AUTH
>> + ldp \tmp2, \tmp3, [\tmp1, #PTRAUTH_USER_KEY_APGA]
>> + msr_s SYS_APGAKEYLO_EL1, \tmp2
>> + msr_s SYS_APGAKEYHI_EL1, \tmp3
>> +alternative_else_nop_endif
>> + .endm
> [...]
>> diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
>> index a5bdce8..7b1ea2a 100644
>> --- a/arch/arm64/kernel/asm-offsets.c
>> +++ b/arch/arm64/kernel/asm-offsets.c
>> @@ -40,6 +40,9 @@ int main(void)
>> #endif
>> BLANK();
>> DEFINE(THREAD_CPU_CONTEXT, offsetof(struct task_struct, thread.cpu_context));
>> +#ifdef CONFIG_ARM64_PTR_AUTH
>> + DEFINE(THREAD_KEYS_USER, offsetof(struct task_struct, thread.keys_user));
>> +#endif
>> BLANK();
>> DEFINE(S_X0, offsetof(struct pt_regs, regs[0]));
>> DEFINE(S_X2, offsetof(struct pt_regs, regs[2]));
>> @@ -128,5 +131,13 @@ int main(void)
>> DEFINE(SDEI_EVENT_INTREGS, offsetof(struct sdei_registered_event, interrupted_regs));
>> DEFINE(SDEI_EVENT_PRIORITY, offsetof(struct sdei_registered_event, priority));
>> #endif
>> +#ifdef CONFIG_ARM64_PTR_AUTH
>> + DEFINE(PTRAUTH_USER_KEY_APIA, offsetof(struct ptrauth_keys_user, apia));
>> + DEFINE(PTRAUTH_USER_KEY_APIB, offsetof(struct ptrauth_keys_user, apib));
>> + DEFINE(PTRAUTH_USER_KEY_APDA, offsetof(struct ptrauth_keys_user, apda));
>> + DEFINE(PTRAUTH_USER_KEY_APDB, offsetof(struct ptrauth_keys_user, apdb));
>> + DEFINE(PTRAUTH_USER_KEY_APGA, offsetof(struct ptrauth_keys_user, apga));
>> + BLANK();
>> +#endif
>
> and define the above as
>
> offsetof(struct task_struct, thread.keys_user.apia)
>
_______________________________________________
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-01-16 12:40 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-16 8:47 [PATCH v3 00/16] arm64: return address signing Amit Daniel Kachhap
2019-12-16 8:47 ` [PATCH v3 01/16] arm64: cpufeature: add pointer auth meta-capabilities Amit Daniel Kachhap
2020-01-15 12:26 ` Catalin Marinas
2020-01-15 13:52 ` Suzuki Kuruppassery Poulose
2020-01-15 16:01 ` Catalin Marinas
2020-01-16 12:35 ` Amit Kachhap
2019-12-16 8:47 ` [PATCH v3 02/16] arm64: rename ptrauth key structures to be user-specific Amit Daniel Kachhap
2020-01-15 16:42 ` Catalin Marinas
2019-12-16 8:47 ` [PATCH v3 03/16] arm64: install user ptrauth keys at kernel exit time Amit Daniel Kachhap
2020-01-15 17:02 ` Catalin Marinas
2020-01-16 12:39 ` Amit Kachhap [this message]
2019-12-16 8:47 ` [PATCH v3 04/16] arm64: create macro to park cpu in an infinite loop Amit Daniel Kachhap
2020-01-07 11:13 ` Suzuki Kuruppassery Poulose
2020-01-15 17:03 ` Catalin Marinas
2019-12-16 8:47 ` [PATCH v3 05/16] arm64: ptrauth: Add bootup/runtime flags for __cpu_setup Amit Daniel Kachhap
2020-01-07 11:18 ` Suzuki Kuruppassery Poulose
2020-01-09 8:33 ` Amit Kachhap
2020-01-15 17:30 ` Catalin Marinas
2020-01-16 12:40 ` Amit Kachhap
2019-12-16 8:47 ` [PATCH v3 06/16] arm64: enable ptrauth earlier Amit Daniel Kachhap
2020-01-07 11:35 ` Suzuki Kuruppassery Poulose
2020-01-09 8:29 ` Amit Kachhap
2020-01-10 10:18 ` Suzuki Kuruppassery Poulose
2020-01-16 16:24 ` Catalin Marinas
2020-01-17 10:43 ` Amit Kachhap
2020-01-17 12:00 ` Catalin Marinas
2020-01-20 14:27 ` Amit Kachhap
2019-12-16 8:47 ` [PATCH v3 07/16] arm64: initialize and switch ptrauth kernel keys Amit Daniel Kachhap
2020-01-16 18:00 ` Catalin Marinas
2019-12-16 8:47 ` [PATCH v3 08/16] arm64: initialize ptrauth keys for kernel booting task Amit Daniel Kachhap
2020-01-16 17:59 ` Catalin Marinas
2020-01-20 10:50 ` Amit Kachhap
2019-12-16 8:47 ` [PATCH v3 09/16] arm64: mask PAC bits of __builtin_return_address Amit Daniel Kachhap
2020-01-17 10:14 ` Catalin Marinas
2020-01-20 14:20 ` Amit Kachhap
2020-01-21 16:52 ` Catalin Marinas
2019-12-16 8:47 ` [PATCH v3 10/16] arm64: unwind: strip PAC from kernel addresses Amit Daniel Kachhap
2020-01-17 10:22 ` Catalin Marinas
2019-12-16 8:47 ` [PATCH v3 11/16] arm64: __show_regs: strip PAC from lr in printk Amit Daniel Kachhap
2020-01-17 10:25 ` Catalin Marinas
2019-12-16 8:47 ` [PATCH v3 12/16] arm64: suspend: restore the kernel ptrauth keys Amit Daniel Kachhap
2020-01-17 10:31 ` Catalin Marinas
2019-12-16 8:47 ` [PATCH v3 13/16] arm64: kprobe: disable probe of ptrauth instruction Amit Daniel Kachhap
2020-01-17 11:16 ` Catalin Marinas
2020-01-20 14:24 ` Amit Kachhap
2019-12-16 8:47 ` [PATCH v3 14/16] kconfig: Add support for 'as-option' Amit Daniel Kachhap
2019-12-17 11:43 ` Masahiro Yamada
2020-01-17 11:33 ` Catalin Marinas
2020-01-17 17:51 ` Masahiro Yamada
2020-01-20 10:26 ` Vincenzo Frascino
2019-12-16 8:47 ` [PATCH v3 15/16] arm64: compile the kernel with ptrauth return address signing Amit Daniel Kachhap
2020-01-17 11:49 ` Catalin Marinas
2020-01-21 14:37 ` Amit Kachhap
2020-01-21 14:46 ` Vincenzo Frascino
2020-01-21 16:50 ` Catalin Marinas
2019-12-16 8:47 ` [PATCH v3 16/16] lkdtm: arm64: test kernel pointer authentication Amit Daniel Kachhap
2020-01-17 11:53 ` Catalin Marinas
2019-12-16 9:35 ` [RESEND PATCH v3 00/16] arm64: return address signing Amit Daniel Kachhap
2019-12-30 19:09 ` [PATCH " Kees Cook
2020-01-07 11:07 ` Amit Kachhap
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=44849238-8f25-093f-da71-b4bc6c062d85@arm.com \
--to=amit.kachhap@arm.com \
--cc=Dave.Martin@arm.com \
--cc=Mark.Brown@arm.com \
--cc=Vincenzo.Frascino@arm.com \
--cc=ard.biesheuvel@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=james.morse@arm.com \
--cc=keescook@chromium.org \
--cc=kristina.martsenko@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=ramana.radhakrishnan@arm.com \
--cc=richard.henderson@linaro.org \
--cc=suzuki.poulose@arm.com \
--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).