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 11/22] powerpc/kuap: Remove __kuap_assert_locked()
Date: Tue, 19 Oct 2021 09:29:22 +0200 [thread overview]
Message-ID: <1a60198a25d2ba38a37f1b92bc7d096435df4224.1634627931.git.christophe.leroy@csgroup.eu> (raw)
In-Reply-To: <cover.1634627931.git.christophe.leroy@csgroup.eu>
__kuap_assert_locked() is redundant with
__kuap_get_and_assert_locked().
Move the verification of CONFIG_PPC_KUAP_DEBUG in kuap_assert_locked()
and make it call __kuap_get_and_assert_locked() directly.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
arch/powerpc/include/asm/book3s/32/kup.h | 5 -----
arch/powerpc/include/asm/book3s/64/kup.h | 6 ------
arch/powerpc/include/asm/kup.h | 3 ++-
arch/powerpc/include/asm/nohash/32/kup-8xx.h | 6 ------
4 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/arch/powerpc/include/asm/book3s/32/kup.h b/arch/powerpc/include/asm/book3s/32/kup.h
index 35ca48f7c293..bc245e9f0bcc 100644
--- a/arch/powerpc/include/asm/book3s/32/kup.h
+++ b/arch/powerpc/include/asm/book3s/32/kup.h
@@ -117,11 +117,6 @@ static inline unsigned long __kuap_get_and_assert_locked(void)
return kuap;
}
-static inline void __kuap_assert_locked(void)
-{
- __kuap_get_and_assert_locked();
-}
-
static __always_inline void __allow_user_access(void __user *to, const void __user *from,
u32 size, unsigned long dir)
{
diff --git a/arch/powerpc/include/asm/book3s/64/kup.h b/arch/powerpc/include/asm/book3s/64/kup.h
index 9f2099790658..503828709d55 100644
--- a/arch/powerpc/include/asm/book3s/64/kup.h
+++ b/arch/powerpc/include/asm/book3s/64/kup.h
@@ -298,12 +298,6 @@ static inline unsigned long __kuap_get_and_assert_locked(void)
return amr;
}
-static inline void __kuap_assert_locked(void)
-{
- if (IS_ENABLED(CONFIG_PPC_KUAP_DEBUG))
- WARN_ON_ONCE(mfspr(SPRN_AMR) != AMR_KUAP_BLOCKED);
-}
-
/*
* 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/kup.h b/arch/powerpc/include/asm/kup.h
index 33e93a6c5d19..5d3c1e8060f9 100644
--- a/arch/powerpc/include/asm/kup.h
+++ b/arch/powerpc/include/asm/kup.h
@@ -86,7 +86,8 @@ static __always_inline void kuap_assert_locked(void)
if (kuap_is_disabled())
return;
- __kuap_assert_locked();
+ if (IS_ENABLED(CONFIG_PPC_KUAP_DEBUG))
+ __kuap_get_and_assert_locked();
}
#ifdef CONFIG_PPC32
diff --git a/arch/powerpc/include/asm/nohash/32/kup-8xx.h b/arch/powerpc/include/asm/nohash/32/kup-8xx.h
index 74f15c386476..37fe4b32b658 100644
--- a/arch/powerpc/include/asm/nohash/32/kup-8xx.h
+++ b/arch/powerpc/include/asm/nohash/32/kup-8xx.h
@@ -47,12 +47,6 @@ static inline unsigned long __kuap_get_and_assert_locked(void)
return kuap;
}
-static inline void __kuap_assert_locked(void)
-{
- if (IS_ENABLED(CONFIG_PPC_KUAP_DEBUG))
- __kuap_get_and_assert_locked();
-}
-
static inline void __allow_user_access(void __user *to, const void __user *from,
unsigned long size, unsigned long dir)
{
--
2.31.1
next prev parent reply other threads:[~2021-10-19 7:33 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 ` Christophe Leroy [this message]
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 ` [PATCH v3 15/22] powerpc/kuap: Prepare for supporting KUAP on BOOK3E/64 Christophe Leroy
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=1a60198a25d2ba38a37f1b92bc7d096435df4224.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).