powerpc/kuap: Use ASM feature fixups instead of static branches

To avoid a useless nop on top of every uaccess enable/disable and
make life easier for objtool, replace static branches by ASM feature
fixups that will nop KUAP enabling instructions out in the unlikely
case KUAP is disabled at boottime.

Leave it as is on book3s/64 for now, it will be handled later when
objtool is activated on PPC64.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/671948788024fd890ec4ed175bc332dab8664ea5.1689091022.git.christophe.leroy@csgroup.eu

diff --git a/arch/powerpc/include/asm/book3s/32/kup.h b/arch/powerpc/include/asm/book3s/32/kup.h
index 931d200..4e14a54 100644 (file)
--- a/arch/powerpc/include/asm/book3s/32/kup.h
+++ b/arch/powerpc/include/asm/book3s/32/kup.h
@@ -27,6 +27,34 @@ static __always_inline void kuap_unlock_one(unsigned long addr)
        isync();        /* Context sync required after mtsr() */
 }
 
+static __always_inline void uaccess_begin_32s(unsigned long addr)
+{
+       unsigned long tmp;
+
+       asm volatile(ASM_MMU_FTR_IFSET(
+               "mfsrin %0, %1;"
+               "rlwinm %0, %0, 0, %2;"
+               "mtsrin %0, %1;"
+               "isync", "", %3)
+               : "=&r"(tmp)
+               : "r"(addr), "i"(~SR_KS), "i"(MMU_FTR_KUAP)
+               : "memory");
+}
+
+static __always_inline void uaccess_end_32s(unsigned long addr)
+{
+       unsigned long tmp;
+
+       asm volatile(ASM_MMU_FTR_IFSET(
+               "mfsrin %0, %1;"
+               "oris %0, %0, %2;"
+               "mtsrin %0, %1;"
+               "isync", "", %3)
+               : "=&r"(tmp)
+               : "r"(addr), "i"(SR_KS >> 16), "i"(MMU_FTR_KUAP)
+               : "memory");
+}
+
 static __always_inline void __kuap_save_and_lock(struct pt_regs *regs)
 {
        unsigned long kuap = current->thread.kuap;
@@ -69,8 +97,8 @@ static __always_inline unsigned long __kuap_get_and_assert_locked(void)
 }
 #define __kuap_get_and_assert_locked __kuap_get_and_assert_locked
 
-static __always_inline void __allow_user_access(void __user *to, const void __user *from,
-                                               u32 size, unsigned long dir)
+static __always_inline void allow_user_access(void __user *to, const void __user *from,
+                                             u32 size, unsigned long dir)
 {
        BUILD_BUG_ON(!__builtin_constant_p(dir));
 
@@ -78,10 +106,10 @@ static __always_inline void __allow_user_access(void __user *to, const void __us
                return;
 
        current->thread.kuap = (__force u32)to;
-       kuap_unlock_one((__force u32)to);
+       uaccess_begin_32s((__force u32)to);
 }
 
-static __always_inline void __prevent_user_access(unsigned long dir)
+static __always_inline void prevent_user_access(unsigned long dir)
 {
        u32 kuap = current->thread.kuap;
 
@@ -91,26 +119,26 @@ static __always_inline void __prevent_user_access(unsigned long dir)
                return;
 
        current->thread.kuap = KUAP_NONE;
-       kuap_lock_one(kuap);
+       uaccess_end_32s(kuap);
 }
 
-static __always_inline unsigned long __prevent_user_access_return(void)
+static __always_inline unsigned long prevent_user_access_return(void)
 {
        unsigned long flags = current->thread.kuap;
 
        if (flags != KUAP_NONE) {
                current->thread.kuap = KUAP_NONE;
-               kuap_lock_one(flags);
+               uaccess_end_32s(flags);
        }
 
        return flags;
 }
 
-static __always_inline void __restore_user_access(unsigned long flags)
+static __always_inline void restore_user_access(unsigned long flags)
 {
        if (flags != KUAP_NONE) {
                current->thread.kuap = flags;
-               kuap_unlock_one(flags);
+               uaccess_begin_32s(flags);
        }
 }
 

diff --git a/arch/powerpc/include/asm/kup.h b/arch/powerpc/include/asm/kup.h
index 77adb9c..ad7e8c5 100644 (file)
--- a/arch/powerpc/include/asm/kup.h
+++ b/arch/powerpc/include/asm/kup.h
@@ -72,11 +72,11 @@ static __always_inline void __kuap_kernel_restore(struct pt_regs *regs, unsigned
  * platforms.
  */
 #ifndef CONFIG_PPC_BOOK3S_64
-static __always_inline void __allow_user_access(void __user *to, const void __user *from,
-                                               unsigned long size, unsigned long dir) { }
-static __always_inline void __prevent_user_access(unsigned long dir) { }
-static __always_inline unsigned long __prevent_user_access_return(void) { return 0UL; }
-static __always_inline void __restore_user_access(unsigned long flags) { }
+static __always_inline void allow_user_access(void __user *to, const void __user *from,
+                                             unsigned long size, unsigned long dir) { }
+static __always_inline void prevent_user_access(unsigned long dir) { }
+static __always_inline unsigned long prevent_user_access_return(void) { return 0UL; }
+static __always_inline void restore_user_access(unsigned long flags) { }
 #endif /* CONFIG_PPC_BOOK3S_64 */
 #endif /* CONFIG_PPC_KUAP */
 
@@ -132,41 +132,6 @@ static __always_inline void kuap_assert_locked(void)
                kuap_get_and_assert_locked();
 }
 
-#ifndef CONFIG_PPC_BOOK3S_64
-static __always_inline void allow_user_access(void __user *to, const void __user *from,
-                                    unsigned long size, unsigned long dir)
-{
-       if (kuap_is_disabled())
-               return;
-
-       __allow_user_access(to, from, size, dir);
-}
-
-static __always_inline void prevent_user_access(unsigned long dir)
-{
-       if (kuap_is_disabled())
-               return;
-
-       __prevent_user_access(dir);
-}
-
-static __always_inline unsigned long prevent_user_access_return(void)
-{
-       if (kuap_is_disabled())
-               return 0;
-
-       return __prevent_user_access_return();
-}
-
-static __always_inline void restore_user_access(unsigned long flags)
-{
-       if (kuap_is_disabled())
-               return;
-
-       __restore_user_access(flags);
-}
-#endif /* CONFIG_PPC_BOOK3S_64 */
-
 static __always_inline void allow_read_from_user(const void __user *from, unsigned long size)
 {
        barrier_nospec();

diff --git a/arch/powerpc/include/asm/nohash/32/kup-8xx.h b/arch/powerpc/include/asm/nohash/32/kup-8xx.h
index e231b3a..46bc592 100644 (file)
--- a/arch/powerpc/include/asm/nohash/32/kup-8xx.h
+++ b/arch/powerpc/include/asm/nohash/32/kup-8xx.h
@@ -37,31 +37,43 @@ static __always_inline unsigned long __kuap_get_and_assert_locked(void)
 #define __kuap_get_and_assert_locked __kuap_get_and_assert_locked
 #endif
 
-static __always_inline void __allow_user_access(void __user *to, const void __user *from,
-                                               unsigned long size, unsigned long dir)
+static __always_inline void uaccess_begin_8xx(unsigned long val)
 {
-       mtspr(SPRN_MD_AP, MD_APG_INIT);
+       asm(ASM_MMU_FTR_IFSET("mtspr %0, %1", "", %2) : :
+           "i"(SPRN_MD_AP), "r"(val), "i"(MMU_FTR_KUAP) : "memory");
 }
 
-static __always_inline void __prevent_user_access(unsigned long dir)
+static __always_inline void uaccess_end_8xx(void)
 {
-       mtspr(SPRN_MD_AP, MD_APG_KUAP);
+       asm(ASM_MMU_FTR_IFSET("mtspr %0, %1", "", %2) : :
+           "i"(SPRN_MD_AP), "r"(MD_APG_KUAP), "i"(MMU_FTR_KUAP) : "memory");
+}
+
+static __always_inline void allow_user_access(void __user *to, const void __user *from,
+                                             unsigned long size, unsigned long dir)
+{
+       uaccess_begin_8xx(MD_APG_INIT);
 }
 
-static __always_inline unsigned long __prevent_user_access_return(void)
+static __always_inline void prevent_user_access(unsigned long dir)
+{
+       uaccess_end_8xx();
+}
+
+static __always_inline unsigned long prevent_user_access_return(void)
 {
        unsigned long flags;
 
        flags = mfspr(SPRN_MD_AP);
 
-       mtspr(SPRN_MD_AP, MD_APG_KUAP);
+       uaccess_end_8xx();
 
        return flags;
 }
 
-static __always_inline void __restore_user_access(unsigned long flags)
+static __always_inline void restore_user_access(unsigned long flags)
 {
-       mtspr(SPRN_MD_AP, flags);
+       uaccess_begin_8xx(flags);
 }
 
 static __always_inline bool

diff --git a/arch/powerpc/include/asm/nohash/kup-booke.h b/arch/powerpc/include/asm/nohash/kup-booke.h
index 98780a2..0c7c325 100644 (file)
--- a/arch/powerpc/include/asm/nohash/kup-booke.h
+++ b/arch/powerpc/include/asm/nohash/kup-booke.h
@@ -3,6 +3,7 @@
 #define _ASM_POWERPC_KUP_BOOKE_H_
 
 #include <asm/bug.h>
+#include <asm/mmu.h>
 
 #ifdef CONFIG_PPC_KUAP
 
@@ -60,35 +61,42 @@ static __always_inline unsigned long __kuap_get_and_assert_locked(void)
 #define __kuap_get_and_assert_locked __kuap_get_and_assert_locked
 #endif
 
-static __always_inline void __allow_user_access(void __user *to, const void __user *from,
-                                               unsigned long size, unsigned long dir)
+static __always_inline void uaccess_begin_booke(unsigned long val)
 {
-       mtspr(SPRN_PID, current->thread.pid);
-       isync();
+       asm(ASM_MMU_FTR_IFSET("mtspr %0, %1; isync", "", %2) : :
+           "i"(SPRN_PID), "r"(val), "i"(MMU_FTR_KUAP) : "memory");
 }
 
-static __always_inline void __prevent_user_access(unsigned long dir)
+static __always_inline void uaccess_end_booke(void)
 {
-       mtspr(SPRN_PID, 0);
-       isync();
+       asm(ASM_MMU_FTR_IFSET("mtspr %0, %1; isync", "", %2) : :
+           "i"(SPRN_PID), "r"(0), "i"(MMU_FTR_KUAP) : "memory");
+}
+
+static __always_inline void allow_user_access(void __user *to, const void __user *from,
+                                             unsigned long size, unsigned long dir)
+{
+       uaccess_begin_booke(current->thread.pid);
 }
 
-static __always_inline unsigned long __prevent_user_access_return(void)
+static __always_inline void prevent_user_access(unsigned long dir)
+{
+       uaccess_end_booke();
+}
+
+static __always_inline unsigned long prevent_user_access_return(void)
 {
        unsigned long flags = mfspr(SPRN_PID);
 
-       mtspr(SPRN_PID, 0);
-       isync();
+       uaccess_end_booke();
 
        return flags;
 }
 
-static __always_inline void __restore_user_access(unsigned long flags)
+static __always_inline void restore_user_access(unsigned long flags)
 {
-       if (flags) {
-               mtspr(SPRN_PID, current->thread.pid);
-               isync();
-       }
+       if (flags)
+               uaccess_begin_booke(current->thread.pid);
 }
 
 static __always_inline bool

diff --git a/arch/powerpc/mm/nohash/kup.c b/arch/powerpc/mm/nohash/kup.c
index 94ff82b..e1f7de2 100644 (file)
--- a/arch/powerpc/mm/nohash/kup.c
+++ b/arch/powerpc/mm/nohash/kup.c
@@ -24,6 +24,6 @@ void setup_kuap(bool disabled)
 
        pr_info("Activating Kernel Userspace Access Protection\n");
 
-       __prevent_user_access(KUAP_READ_WRITE);
+       prevent_user_access(KUAP_READ_WRITE);
 }
 #endif