]> git.baikalelectronics.ru Git - kernel.git/commitdiff
powerpc/kuap: Force inlining of all first level KUAP helpers.
authorChristophe Leroy <christophe.leroy@csgroup.eu>
Thu, 3 Jun 2021 09:13:54 +0000 (09:13 +0000)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 16 Jun 2021 14:09:09 +0000 (00:09 +1000)
All KUAP helpers defined in asm/kup.h are single line functions
that should be inlined. But on book3s/32 build, we get many
instances of <prevent_write_to_user.constprop.0>.

Force inlining of those helpers.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/8479a862e165a57a855292d47e24c259a578f5a0.1622711627.git.christophe.leroy@csgroup.eu
arch/powerpc/include/asm/kup.h

index 0202a7e84a49ca7042cfdc228a11cd2f0322daf9..1df763002726a8b8eba5d79029d86298922eeeaa 100644 (file)
@@ -84,51 +84,51 @@ static __always_inline void setup_kup(void)
        setup_kuap(disable_kuap);
 }
 
-static inline void allow_read_from_user(const void __user *from, unsigned long size)
+static __always_inline void allow_read_from_user(const void __user *from, unsigned long size)
 {
        barrier_nospec();
        allow_user_access(NULL, from, size, KUAP_READ);
 }
 
-static inline void allow_write_to_user(void __user *to, unsigned long size)
+static __always_inline void allow_write_to_user(void __user *to, unsigned long size)
 {
        allow_user_access(to, NULL, size, KUAP_WRITE);
 }
 
-static inline void allow_read_write_user(void __user *to, const void __user *from,
-                                        unsigned long size)
+static __always_inline void allow_read_write_user(void __user *to, const void __user *from,
+                                                 unsigned long size)
 {
        barrier_nospec();
        allow_user_access(to, from, size, KUAP_READ_WRITE);
 }
 
-static inline void prevent_read_from_user(const void __user *from, unsigned long size)
+static __always_inline void prevent_read_from_user(const void __user *from, unsigned long size)
 {
        prevent_user_access(KUAP_READ);
 }
 
-static inline void prevent_write_to_user(void __user *to, unsigned long size)
+static __always_inline void prevent_write_to_user(void __user *to, unsigned long size)
 {
        prevent_user_access(KUAP_WRITE);
 }
 
-static inline void prevent_read_write_user(void __user *to, const void __user *from,
-                                          unsigned long size)
+static __always_inline void prevent_read_write_user(void __user *to, const void __user *from,
+                                                   unsigned long size)
 {
        prevent_user_access(KUAP_READ_WRITE);
 }
 
-static inline void prevent_current_access_user(void)
+static __always_inline void prevent_current_access_user(void)
 {
        prevent_user_access(KUAP_READ_WRITE);
 }
 
-static inline void prevent_current_read_from_user(void)
+static __always_inline void prevent_current_read_from_user(void)
 {
        prevent_user_access(KUAP_READ);
 }
 
-static inline void prevent_current_write_to_user(void)
+static __always_inline void prevent_current_write_to_user(void)
 {
        prevent_user_access(KUAP_WRITE);
 }