From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
npiggin@gmail.com
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: [RFC PATCH v1 38/41] powerpc/64s: Make kuap_check_amr() and kuap_get_and_check_amr() generic
Date: Tue, 9 Feb 2021 09:57:03 +0000 (UTC) [thread overview]
Message-ID: <803affcdac55f75a88f9526e2d177f64ba39f72b.1612864004.git.christophe.leroy@csgroup.eu> (raw)
In-Reply-To: <cover.1612864003.git.christophe.leroy@csgroup.eu>
In preparation of porting powerpc32 to C syscall entry/exit,
rename kuap_check_amr() and kuap_get_and_check_amr() as kuap_check()
and kuap_get_and_check(), and move in the generic asm/kup.h the stub
for when CONFIG_PPC_KUAP is not selected.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
arch/powerpc/include/asm/book3s/64/kup.h | 24 ++----------------------
arch/powerpc/include/asm/kup.h | 10 +++++++++-
arch/powerpc/kernel/interrupt.c | 12 ++++++------
3 files changed, 17 insertions(+), 29 deletions(-)
diff --git a/arch/powerpc/include/asm/book3s/64/kup.h b/arch/powerpc/include/asm/book3s/64/kup.h
index 8bd905050896..d9b07e9998be 100644
--- a/arch/powerpc/include/asm/book3s/64/kup.h
+++ b/arch/powerpc/include/asm/book3s/64/kup.h
@@ -287,7 +287,7 @@ static inline void kuap_kernel_restore(struct pt_regs *regs,
*/
}
-static inline unsigned long kuap_get_and_check_amr(void)
+static inline unsigned long kuap_get_and_check(void)
{
if (mmu_has_feature(MMU_FTR_BOOK3S_KUAP)) {
unsigned long amr = mfspr(SPRN_AMR);
@@ -298,27 +298,7 @@ static inline unsigned long kuap_get_and_check_amr(void)
return 0;
}
-#else /* CONFIG_PPC_PKEY */
-
-static inline void kuap_user_restore(struct pt_regs *regs)
-{
-}
-
-static inline void kuap_kernel_restore(struct pt_regs *regs, unsigned long amr)
-{
-}
-
-static inline unsigned long kuap_get_and_check_amr(void)
-{
- return 0;
-}
-
-#endif /* CONFIG_PPC_PKEY */
-
-
-#ifdef CONFIG_PPC_KUAP
-
-static inline void kuap_check_amr(void)
+static inline void kuap_check(void)
{
if (IS_ENABLED(CONFIG_PPC_KUAP_DEBUG) && mmu_has_feature(MMU_FTR_BOOK3S_KUAP))
WARN_ON_ONCE(mfspr(SPRN_AMR) != AMR_KUAP_BLOCKED);
diff --git a/arch/powerpc/include/asm/kup.h b/arch/powerpc/include/asm/kup.h
index 25671f711ec2..b7efa46b3109 100644
--- a/arch/powerpc/include/asm/kup.h
+++ b/arch/powerpc/include/asm/kup.h
@@ -74,7 +74,15 @@ bad_kuap_fault(struct pt_regs *regs, unsigned long address, bool is_write)
return false;
}
-static inline void kuap_check_amr(void) { }
+static inline void kuap_check(void) { }
+static inline void kuap_save_and_lock(struct pt_regs *regs) { }
+static inline void kuap_user_restore(struct pt_regs *regs) { }
+static inline void kuap_kernel_restore(struct pt_regs *regs, unsigned long amr) { }
+
+static inline unsigned long kuap_get_and_check(void)
+{
+ return 0;
+}
/*
* book3s/64/kup-radix.h defines these functions for the !KUAP case to flush
diff --git a/arch/powerpc/kernel/interrupt.c b/arch/powerpc/kernel/interrupt.c
index 3c2e9b28b05d..8180ed261a27 100644
--- a/arch/powerpc/kernel/interrupt.c
+++ b/arch/powerpc/kernel/interrupt.c
@@ -75,7 +75,7 @@ notrace long system_call_exception(long r3, long r4, long r5,
} else
#endif
#ifdef CONFIG_PPC64
- kuap_check_amr();
+ kuap_check();
#endif
#ifdef CONFIG_PPC_ADV_DEBUG_REGS
@@ -241,7 +241,7 @@ notrace unsigned long syscall_exit_prepare(unsigned long r3,
CT_WARN_ON(ct_state() == CONTEXT_USER);
#ifdef CONFIG_PPC64
- kuap_check_amr();
+ kuap_check();
#endif
regs->result = r3;
@@ -381,7 +381,7 @@ notrace unsigned long interrupt_exit_user_prepare(struct pt_regs *regs, unsigned
* AMR can only have been unlocked if we interrupted the kernel.
*/
#ifdef CONFIG_PPC64
- kuap_check_amr();
+ kuap_check();
#endif
local_irq_save(flags);
@@ -467,7 +467,7 @@ notrace unsigned long interrupt_exit_kernel_prepare(struct pt_regs *regs, unsign
unsigned long flags;
unsigned long ret = 0;
#ifdef CONFIG_PPC64
- unsigned long amr;
+ unsigned long kuap;
#endif
if (!IS_ENABLED(CONFIG_BOOKE) && !IS_ENABLED(CONFIG_40x) &&
@@ -483,7 +483,7 @@ notrace unsigned long interrupt_exit_kernel_prepare(struct pt_regs *regs, unsign
CT_WARN_ON(ct_state() == CONTEXT_USER);
#ifdef CONFIG_PPC64
- amr = kuap_get_and_check_amr();
+ kuap = kuap_get_and_check();
#endif
if (unlikely(current_thread_info()->flags & _TIF_EMULATE_STACK_STORE)) {
@@ -527,7 +527,7 @@ notrace unsigned long interrupt_exit_kernel_prepare(struct pt_regs *regs, unsign
* value from the check above.
*/
#ifdef CONFIG_PPC64
- kuap_kernel_restore(regs, amr);
+ kuap_kernel_restore(regs, kuap);
#endif
return ret;
--
2.25.0
next prev parent reply other threads:[~2021-02-09 10:21 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-09 9:56 [RFC PATCH v1 00/41] powerpc/32: Switch to interrupt entry/exit in C Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 01/41] powerpc/32: Preserve cr1 in exception prolog stack check to fix build error Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 02/41] powerpc/40x: Don't use SPRN_SPRG_SCRATCH0/1 in TLB miss handlers Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 03/41] powerpc/40x: Change CRITICAL_EXCEPTION_PROLOG macro to a gas macro Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 04/41] powerpc/40x: Save SRR0/SRR1 and r10/r11 earlier in critical exception Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 05/41] powerpc/40x: Reorder a few instructions in critical exception prolog Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 06/41] powerpc/40x: Prepare for enabling MMU " Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 07/41] powerpc/40x: Prepare normal exception handler for enabling MMU early Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 08/41] powerpc/32: Reconcile interrupts in C Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 09/41] powerpc/32: Entry cpu time accounting " Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 10/41] powerpc/32: Handle bookE debugging in C in exception entry Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 11/41] powerpc/32: Use fast instruction to set MSR RI in exception prolog on 8xx Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 12/41] powerpc/32: Remove ksp_limit Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 13/41] powerpc/32: Always enable data translation in exception prolog Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 14/41] powerpc/32: Tag DAR in EXCEPTION_PROLOG_2 for the 8xx Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 15/41] powerpc/32: Enable instruction translation at the same time as data translation Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 16/41] powerpc/32: Statically initialise first emergency context Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 17/41] powerpc/32: Add vmap_stack_overflow label inside the macro Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 18/41] powerpc/32: Use START_EXCEPTION() as much as possible Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 19/41] powerpc/32: Move exception prolog code into .text once MMU is back on Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 20/41] powerpc/32: Provide a name to exception prolog continuation in virtual mode Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 21/41] powerpc/32: Refactor booke critical registers saving Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 22/41] powerpc/32: Perform normal function call in exception entry Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 23/41] powerpc/32: Always save non volatile registers on " Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 24/41] powerpc/32: Replace ASM exception exit by C exception exit from ppc64 Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 25/41] powerpc/32: Set regs parameter in r3 in transfer_to_handler Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 26/41] powerpc/32: Remove handle_page_fault() Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 27/41] powerpc/32: Save trap number on stack in exception prolog Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 28/41] powerpc/32: Add a prepare_transfer_to_handler macro for exception prologs Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 29/41] powerpc/32: Only restore non volatile registers when required Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 30/41] powerpc/32: Dismantle EXC_XFER_STD/LITE/TEMPLATE Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 31/41] powerpc/32: Remove the xfer parameter in EXCEPTION() macro Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 32/41] powerpc/32: Refactor saving of volatile registers in exception prologs Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 33/41] powerpc/32: Save remaining registers in exception prolog Christophe Leroy
2021-02-09 9:56 ` [RFC PATCH v1 34/41] powerpc/32: Set current->thread.regs in C interrupt entry Christophe Leroy
2021-02-09 9:57 ` [RFC PATCH v1 35/41] powerpc/32: Return directly from power_save_ppc32_restore() Christophe Leroy
2021-02-09 9:57 ` [RFC PATCH v1 36/41] powerpc/32: Only use prepare_transfer_to_handler function on book3s/32 and e500 Christophe Leroy
2021-02-09 9:57 ` [RFC PATCH v1 37/41] powerpc/32s: Move KUEP locking/unlocking in C Christophe Leroy
2021-02-09 9:57 ` Christophe Leroy [this message]
2021-02-09 9:57 ` [RFC PATCH v1 39/41] powerpc/32s: Create C version of kuap save/restore/check helpers Christophe Leroy
2021-02-09 9:57 ` [RFC PATCH v1 40/41] powerpc/8xx: " Christophe Leroy
2021-02-09 9:57 ` [RFC PATCH v1 41/41] powerpc/32: Manage KUAP in C Christophe Leroy
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=803affcdac55f75a88f9526e2d177f64ba39f72b.1612864004.git.christophe.leroy@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
--cc=paulus@samba.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).