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>
Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 15/22] powerpc/kuap: Prepare for supporting KUAP on BOOK3E/64
Date: Tue, 19 Oct 2021 09:29:26 +0200 [thread overview]
Message-ID: <1cbf94e26e6d6e2e028fd687588a7e6622d454a6.1634627931.git.christophe.leroy@csgroup.eu> (raw)
In-Reply-To: <cover.1634627931.git.christophe.leroy@csgroup.eu>
Also call kuap_lock() and kuap_save_and_lock() from
interrupt functions with CONFIG_PPC64.
For book3s/64 we keep them empty as it is done in assembly.
Also do the locked assert when switching task unless it is
book3s/64.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
arch/powerpc/include/asm/book3s/64/kup.h | 9 +++++++++
arch/powerpc/include/asm/interrupt.h | 2 ++
arch/powerpc/include/asm/kup.h | 2 --
arch/powerpc/kernel/process.c | 6 +++---
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/include/asm/book3s/64/kup.h b/arch/powerpc/include/asm/book3s/64/kup.h
index 503828709d55..69fcf63eec94 100644
--- a/arch/powerpc/include/asm/book3s/64/kup.h
+++ b/arch/powerpc/include/asm/book3s/64/kup.h
@@ -298,6 +298,15 @@ static inline unsigned long __kuap_get_and_assert_locked(void)
return amr;
}
+/* Do nothing, book3s/64 does that in ASM */
+static inline void __kuap_lock(void)
+{
+}
+
+static inline void __kuap_save_and_lock(struct pt_regs *regs)
+{
+}
+
/*
* We support individually allowing read or write, but we don't support nesting
* because that would require an expensive read/modify write of the AMR.
diff --git a/arch/powerpc/include/asm/interrupt.h b/arch/powerpc/include/asm/interrupt.h
index ae719e200c80..cd78dbca49e5 100644
--- a/arch/powerpc/include/asm/interrupt.h
+++ b/arch/powerpc/include/asm/interrupt.h
@@ -154,12 +154,14 @@ static inline void interrupt_enter_prepare(struct pt_regs *regs, struct interrup
local_paca->irq_happened |= PACA_IRQ_HARD_DIS;
if (user_mode(regs)) {
+ kuap_lock();
CT_WARN_ON(ct_state() != CONTEXT_USER);
user_exit_irqoff();
account_cpu_user_entry();
account_stolen_time();
} else {
+ kuap_save_and_lock(regs);
/*
* CT_WARN_ON comes here via program_check_exception,
* so avoid recursion.
diff --git a/arch/powerpc/include/asm/kup.h b/arch/powerpc/include/asm/kup.h
index 34574a7455ce..656e6f1d6b6f 100644
--- a/arch/powerpc/include/asm/kup.h
+++ b/arch/powerpc/include/asm/kup.h
@@ -91,7 +91,6 @@ static __always_inline void kuap_assert_locked(void)
__kuap_get_and_assert_locked();
}
-#ifdef CONFIG_PPC32
static __always_inline void kuap_lock(void)
{
if (kuap_is_disabled())
@@ -107,7 +106,6 @@ static __always_inline void kuap_save_and_lock(struct pt_regs *regs)
__kuap_save_and_lock(regs);
}
-#endif
static __always_inline void kuap_kernel_restore(struct pt_regs *regs, unsigned long amr)
{
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 50436b52c213..2c637740c0c2 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -1281,9 +1281,9 @@ struct task_struct *__switch_to(struct task_struct *prev,
set_return_regs_changed(); /* _switch changes stack (and regs) */
-#ifdef CONFIG_PPC32
- kuap_assert_locked();
-#endif
+ if (!IS_ENABLED(CONFIG_PPC_BOOK3S_64))
+ kuap_assert_locked();
+
last = _switch(old_thread, new_thread);
/*
--
2.31.1
next prev parent reply other threads:[~2021-10-19 7:35 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-19 7:29 [PATCH v3 00/22] powerpc: Add KUAP support for BOOKE and 40x Christophe Leroy
2021-10-19 7:29 ` [PATCH v3 01/22] Revert "powerpc: Inline setup_kup()" Christophe Leroy
2021-10-19 7:29 ` [PATCH v3 02/22] powerpc/8xx: Activate KUEP at all time Christophe Leroy
2021-10-19 7:29 ` [PATCH v3 03/22] powerpc/44x: " Christophe Leroy
2021-10-19 7:29 ` [PATCH v3 04/22] powerpc/book3e: " Christophe Leroy
2021-10-19 7:29 ` [PATCH v3 05/22] powerpc/32s: Remove capability to disable KUEP at boottime Christophe Leroy
2021-10-19 7:29 ` [PATCH v3 06/22] powerpc/32s: Do kuep_lock() and kuep_unlock() in assembly Christophe Leroy
2021-10-19 7:29 ` [PATCH v3 07/22] powerpc/32s: Save content of sr0 to avoid 'mfsr' Christophe Leroy
2021-10-19 7:29 ` [PATCH v3 08/22] powerpc/kuep: Remove 'nosmep' boot time parameter except for book3s/64 Christophe Leroy
2021-10-19 7:29 ` [PATCH v3 09/22] powerpc/kuap: Add a generic intermediate layer Christophe Leroy
2021-10-19 7:29 ` [PATCH v3 10/22] powerpc/kuap: Check KUAP activation in generic functions Christophe Leroy
2021-10-19 7:29 ` [PATCH v3 11/22] powerpc/kuap: Remove __kuap_assert_locked() Christophe Leroy
2021-10-19 7:29 ` [PATCH v3 12/22] powerpc/kuap: Add kuap_lock() Christophe Leroy
2021-10-19 7:29 ` [PATCH v3 13/22] powerpc/nohash: Move setup_kuap out of 8xx.c Christophe Leroy
2021-10-19 7:29 ` [PATCH v3 14/22] powerpc/config: Add CONFIG_BOOKE_OR_40x Christophe Leroy
2021-10-19 7:29 ` Christophe Leroy [this message]
2021-10-19 7:29 ` [PATCH v3 16/22] powerpc/kuap: Make PPC_KUAP_DEBUG depend on PPC_KUAP only Christophe Leroy
2021-10-19 7:29 ` [PATCH v3 17/22] powerpc: Add KUAP support for BOOKE and 40x Christophe Leroy
2021-10-19 7:29 ` [PATCH v3 18/22] powerpc/kuap: Wire-up KUAP on 44x Christophe Leroy
2021-10-19 7:29 ` [PATCH v3 19/22] powerpc/kuap: Wire-up KUAP on 40x Christophe Leroy
2021-10-19 7:29 ` [PATCH v3 20/22] powerpc/kuap: Wire-up KUAP on 85xx in 32 bits mode Christophe Leroy
2021-10-19 7:29 ` [PATCH v3 21/22] powerpc/kuap: Wire-up KUAP on book3e/64 Christophe Leroy
2021-10-19 7:29 ` [PATCH v3 22/22] powerpc: Remove CONFIG_PPC_HAVE_KUAP and CONFIG_PPC_HAVE_KUEP Christophe Leroy
2021-12-15 0:24 ` [PATCH v3 00/22] powerpc: Add KUAP support for BOOKE and 40x Michael Ellerman
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=1cbf94e26e6d6e2e028fd687588a7e6622d454a6.1634627931.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=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).