From: Amit Daniel Kachhap <amit.kachhap@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: Mark Rutland <mark.rutland@arm.com>,
Kees Cook <keescook@chromium.org>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Kristina Martsenko <kristina.martsenko@arm.com>,
Dave Martin <Dave.Martin@arm.com>,
Mark Brown <broonie@kernel.org>,
James Morse <james.morse@arm.com>,
Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>,
Amit Daniel Kachhap <amit.kachhap@arm.com>,
Vincenzo Frascino <Vincenzo.Frascino@arm.com>,
Will Deacon <will@kernel.org>, Ard Biesheuvel <ardb@kernel.org>
Subject: [PATCH v6 15/18] arm64: suspend: restore the kernel ptrauth keys
Date: Fri, 6 Mar 2020 12:05:22 +0530 [thread overview]
Message-ID: <1583476525-13505-16-git-send-email-amit.kachhap@arm.com> (raw)
In-Reply-To: <1583476525-13505-1-git-send-email-amit.kachhap@arm.com>
This patch restores the kernel keys from current task during cpu resume
after the mmu is turned on and ptrauth is enabled.
A flag is added in macro ptrauth_keys_install_kernel to check if isb
instruction needs to executed.
Signed-off-by: Amit Daniel Kachhap <amit.kachhap@arm.com>
---
Changes since v5:
* Moved ptrauth_keys_install_kernel inside function cpu_do_resume.
* Added a flag in ptrauth_keys_install_kernel to provide options for isb
instruction.
arch/arm64/include/asm/asm_pointer_auth.h | 6 ++++--
arch/arm64/kernel/entry.S | 4 ++--
arch/arm64/mm/proc.S | 2 ++
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/include/asm/asm_pointer_auth.h b/arch/arm64/include/asm/asm_pointer_auth.h
index 4152afe..899a007 100644
--- a/arch/arm64/include/asm/asm_pointer_auth.h
+++ b/arch/arm64/include/asm/asm_pointer_auth.h
@@ -39,14 +39,16 @@ alternative_if ARM64_HAS_GENERIC_AUTH
alternative_else_nop_endif
.endm
- .macro ptrauth_keys_install_kernel tsk, tmp1, tmp2, tmp3
+ .macro ptrauth_keys_install_kernel tsk, sync, tmp1, tmp2, tmp3
alternative_if ARM64_HAS_ADDRESS_AUTH
mov \tmp1, #THREAD_KEYS_KERNEL
add \tmp1, \tsk, \tmp1
ldp \tmp2, \tmp3, [\tmp1, #PTRAUTH_KERNEL_KEY_APIA]
msr_s SYS_APIAKEYLO_EL1, \tmp2
msr_s SYS_APIAKEYHI_EL1, \tmp3
+ .if \sync == 1
isb
+ .endif
alternative_else_nop_endif
.endm
@@ -55,7 +57,7 @@ alternative_else_nop_endif
.macro ptrauth_keys_install_user tsk, tmp1, tmp2, tmp3
.endm
- .macro ptrauth_keys_install_kernel tsk, tmp1, tmp2, tmp3
+ .macro ptrauth_keys_install_kernel tsk, sync, tmp1, tmp2, tmp3
.endm
#endif /* CONFIG_ARM64_PTR_AUTH */
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index 3dad2d0..6273d7b 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -178,7 +178,7 @@ alternative_cb_end
apply_ssbd 1, x22, x23
- ptrauth_keys_install_kernel tsk, x20, x22, x23
+ ptrauth_keys_install_kernel tsk, 1, x20, x22, x23
.else
add x21, sp, #S_FRAME_SIZE
get_current_task tsk
@@ -900,7 +900,7 @@ ENTRY(cpu_switch_to)
ldr lr, [x8]
mov sp, x9
msr sp_el0, x1
- ptrauth_keys_install_kernel x1, x8, x9, x10
+ ptrauth_keys_install_kernel x1, 1, x8, x9, x10
ret
ENDPROC(cpu_switch_to)
NOKPROBE(cpu_switch_to)
diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
index 5a11a89..4450dc8 100644
--- a/arch/arm64/mm/proc.S
+++ b/arch/arm64/mm/proc.S
@@ -11,6 +11,7 @@
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <asm/asm-offsets.h>
+#include <asm/asm_pointer_auth.h>
#include <asm/hwcap.h>
#include <asm/pgtable.h>
#include <asm/pgtable-hwdef.h>
@@ -137,6 +138,7 @@ alternative_if ARM64_HAS_RAS_EXTN
msr_s SYS_DISR_EL1, xzr
alternative_else_nop_endif
+ ptrauth_keys_install_kernel x14, 0, x1, x2, x3
isb
ret
SYM_FUNC_END(cpu_do_resume)
--
2.7.4
_______________________________________________
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-03-06 6:40 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-06 6:35 [PATCH v6 00/18] arm64: return address signing Amit Daniel Kachhap
2020-03-06 6:35 ` [PATCH v6 01/18] arm64: cpufeature: Fix meta-capability cpufeature check Amit Daniel Kachhap
2020-03-10 10:59 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 02/18] arm64: cpufeature: add pointer auth meta-capabilities Amit Daniel Kachhap
2020-03-10 11:18 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 03/18] arm64: rename ptrauth key structures to be user-specific Amit Daniel Kachhap
2020-03-10 11:35 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 04/18] arm64: install user ptrauth keys at kernel exit time Amit Daniel Kachhap
2020-03-06 19:07 ` James Morse
2020-03-10 11:48 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 05/18] arm64: create macro to park cpu in an infinite loop Amit Daniel Kachhap
2020-03-10 12:02 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 06/18] arm64: ptrauth: Add bootup/runtime flags for __cpu_setup Amit Daniel Kachhap
2020-03-06 19:07 ` James Morse
2020-03-09 17:04 ` Catalin Marinas
2020-03-10 12:14 ` Vincenzo Frascino
2020-03-11 9:28 ` Amit Kachhap
2020-03-06 6:35 ` [PATCH v6 07/18] arm64: cpufeature: Move cpu capability helpers inside C file Amit Daniel Kachhap
2020-03-10 12:20 ` Vincenzo Frascino
2020-03-10 12:53 ` Amit Kachhap
2020-03-11 10:50 ` Catalin Marinas
2020-03-11 11:44 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 08/18] arm64: cpufeature: handle conflicts based on capability Amit Daniel Kachhap
2020-03-10 12:31 ` Vincenzo Frascino
2020-03-11 11:03 ` Catalin Marinas
2020-03-11 11:46 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 09/18] arm64: enable ptrauth earlier Amit Daniel Kachhap
2020-03-10 15:45 ` Vincenzo Frascino
2020-03-11 6:26 ` Amit Kachhap
2020-03-11 10:26 ` Vincenzo Frascino
2020-03-11 10:46 ` Amit Kachhap
2020-03-11 10:49 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 10/18] arm64: initialize and switch ptrauth kernel keys Amit Daniel Kachhap
2020-03-10 15:07 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 11/18] arm64: initialize ptrauth keys for kernel booting task Amit Daniel Kachhap
2020-03-10 15:09 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 12/18] arm64: mask PAC bits of __builtin_return_address Amit Daniel Kachhap
2020-03-06 19:07 ` James Morse
2020-03-09 12:27 ` Amit Kachhap
2020-03-06 6:35 ` [PATCH v6 13/18] arm64: unwind: strip PAC from kernel addresses Amit Daniel Kachhap
2020-03-09 19:03 ` James Morse
2020-03-10 12:28 ` Amit Kachhap
2020-03-10 17:37 ` James Morse
2020-03-11 6:07 ` Amit Kachhap
2020-03-11 9:09 ` James Morse
2020-03-06 6:35 ` [PATCH v6 14/18] arm64: __show_regs: strip PAC from lr in printk Amit Daniel Kachhap
2020-03-10 15:11 ` Vincenzo Frascino
2020-03-06 6:35 ` Amit Daniel Kachhap [this message]
2020-03-10 15:18 ` [PATCH v6 15/18] arm64: suspend: restore the kernel ptrauth keys Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 16/18] kconfig: Add support for 'as-option' Amit Daniel Kachhap
2020-03-06 11:37 ` Masahiro Yamada
2020-03-06 11:49 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 17/18] arm64: compile the kernel with ptrauth return address signing Amit Daniel Kachhap
2020-03-10 15:20 ` Vincenzo Frascino
2020-03-06 6:35 ` [PATCH v6 18/18] lkdtm: arm64: test kernel pointer authentication Amit Daniel Kachhap
2020-03-10 15:59 ` [PATCH v6 00/18] arm64: return address signing Rémi Denis-Courmont
2020-03-11 9:28 ` James Morse
2020-03-12 6:53 ` Amit Kachhap
2020-03-12 8:06 ` Amit Kachhap
2020-03-12 12:47 ` [PATCH v6 00/18] (as long a Marc Zyngier
2020-03-12 13:21 ` Amit Kachhap
2020-03-12 15:05 ` [PATCH v6 00/18] arm64: return address signing Marc Zyngier
2020-03-12 17:26 ` James Morse
2020-03-12 17:31 ` Marc Zyngier
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=1583476525-13505-16-git-send-email-amit.kachhap@arm.com \
--to=amit.kachhap@arm.com \
--cc=Dave.Martin@arm.com \
--cc=Vincenzo.Frascino@arm.com \
--cc=ardb@kernel.org \
--cc=broonie@kernel.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=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).