Skip to contentSkip to conversation

uaccess-unify-inline-vs-outline-copy_fromto_user-selection.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message May 29

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: uaccess: unify inline vs outline copy_{from,to}_user() selection
has been removed from the -mm tree. Its filename was
uaccess-unify-inline-vs-outline-copy_fromto_user-selection.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Yury Norov <[email protected]>
Subject: uaccess: unify inline vs outline copy_{from,to}_user() selection
Date: Fri, 24 Apr 2026 22:08:56 -0400

The kernel allows arches to select between inline and outline implementations of the copy_{from,to}_user() by defining individual INLINE_COPY_FROM_USER and INLINE_COPY_TO_USER, correspondingly. However, all arches enable or disable them always together.

Without the real use-case for one helper being inlined while the other outlined, having independent controls is excessive and error prone.

Switch the codebase to the single unified INLINE_COPY_USER control.

Cc Arnd Bergmann <[email protected]>
Cc Christophe Leroy (CS GROUP) <[email protected]>
Cc Mathieu Desnoyers <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Randy Dunlap <[email protected]>
Cc Viktor Malik <[email protected]>

---

 arch/arc/include/asm/uaccess.h        |    3 +--
 arch/arm/include/asm/uaccess.h        |    3 +--
 arch/arm64/include/asm/uaccess.h      |    3 +--
 arch/hexagon/include/asm/uaccess.h    |    3 +--
 arch/loongarch/include/asm/uaccess.h  |    3 +--
 arch/m68k/include/asm/uaccess.h       |    3 +--
 arch/microblaze/include/asm/uaccess.h |    3 +--
 arch/mips/include/asm/uaccess.h       |    3 +--
 arch/nios2/include/asm/uaccess.h      |    3 +--
 arch/openrisc/include/asm/uaccess.h   |    3 +--
 arch/parisc/include/asm/uaccess.h     |    3 +--
 arch/s390/include/asm/uaccess.h       |    3 +--
 arch/sh/include/asm/uaccess.h         |    3 +--
 arch/sparc/include/asm/uaccess_32.h   |    3 +--
 arch/sparc/include/asm/uaccess_64.h   |    3 +--
 arch/um/include/asm/uaccess.h         |    3 +--
 arch/xtensa/include/asm/uaccess.h     |    3 +--
 include/asm-generic/uaccess.h         |    3 +--
 include/linux/uaccess.h               |   12 ++++++------
 lib/usercopy.c                        |    4 +---
 rust/helpers/uaccess.c                |    4 +---
 21 files changed, 26 insertions(+), 48 deletions(-)
arch/arc/include/asm/uaccess.h renamed from arch/arc/include/asm/uaccess.h~uaccess-unify-inline-vs-outline-copy_fromto_user-selection +1 -2
@@ -628,8 +628,7 @@ static inline unsigned long __clear_user
 	return res;
 }
 
-#define INLINE_COPY_TO_USER
-#define INLINE_COPY_FROM_USER
+#define INLINE_COPY_USER
 
 #define __clear_user			__clear_user
 
arch/arm64/include/asm/uaccess.h renamed from arch/arm64/include/asm/uaccess.h~uaccess-unify-inline-vs-outline-copy_fromto_user-selection +1 -2
@@ -456,8 +456,7 @@ do {									\
 	unsafe_copy_loop(__ucu_dst, __ucu_src, __ucu_len, u8, label);	\
 } while (0)
 
-#define INLINE_COPY_TO_USER
-#define INLINE_COPY_FROM_USER
+#define INLINE_COPY_USER
 
 extern unsigned long __must_check __arch_clear_user(void __user *to, unsigned long n);
 static inline unsigned long __must_check __clear_user(void __user *to, unsigned long n)
arch/arm/include/asm/uaccess.h renamed from arch/arm/include/asm/uaccess.h~uaccess-unify-inline-vs-outline-copy_fromto_user-selection +1 -2
@@ -616,8 +616,7 @@ raw_copy_to_user(void __user *to, const
 }
 #define __clear_user(addr, n)		(memset((void __force *)addr, 0, n), 0)
 #endif
-#define INLINE_COPY_TO_USER
-#define INLINE_COPY_FROM_USER
+#define INLINE_COPY_USER
 
 static inline unsigned long __must_check clear_user(void __user *to, unsigned long n)
 {
arch/hexagon/include/asm/uaccess.h renamed from arch/hexagon/include/asm/uaccess.h~uaccess-unify-inline-vs-outline-copy_fromto_user-selection +1 -2
@@ -26,8 +26,7 @@ unsigned long raw_copy_from_user(void *t
 				     unsigned long n);
 unsigned long raw_copy_to_user(void __user *to, const void *from,
 				   unsigned long n);
-#define INLINE_COPY_FROM_USER
-#define INLINE_COPY_TO_USER
+#define INLINE_COPY_USER
 
 __kernel_size_t __clear_user_hexagon(void __user *dest, unsigned long count);
 #define __clear_user(a, s) __clear_user_hexagon((a), (s))
arch/loongarch/include/asm/uaccess.h renamed from arch/loongarch/include/asm/uaccess.h~uaccess-unify-inline-vs-outline-copy_fromto_user-selection +1 -2
@@ -292,8 +292,7 @@ raw_copy_to_user(void __user *to, const
 	return __copy_user((__force void *)to, from, n);
 }
 
-#define INLINE_COPY_FROM_USER
-#define INLINE_COPY_TO_USER
+#define INLINE_COPY_USER
 
 /*
  * __clear_user: - Zero a block of memory in user space, with less checking.
arch/m68k/include/asm/uaccess.h renamed from arch/m68k/include/asm/uaccess.h~uaccess-unify-inline-vs-outline-copy_fromto_user-selection +1 -2
@@ -377,8 +377,7 @@ raw_copy_to_user(void __user *to, const
 		return __constant_copy_to_user(to, from, n);
 	return __generic_copy_to_user(to, from, n);
 }
-#define INLINE_COPY_FROM_USER
-#define INLINE_COPY_TO_USER
+#define INLINE_COPY_USER
 
 #define __get_kernel_nofault(dst, src, type, err_label)			\
 do {									\
arch/microblaze/include/asm/uaccess.h renamed from arch/microblaze/include/asm/uaccess.h~uaccess-unify-inline-vs-outline-copy_fromto_user-selection +1 -2
@@ -250,8 +250,7 @@ raw_copy_to_user(void __user *to, const
 {
 	return __copy_tofrom_user(to, (__force const void __user *)from, n);
 }
-#define INLINE_COPY_FROM_USER
-#define INLINE_COPY_TO_USER
+#define INLINE_COPY_USER
 
 /*
  * Copy a null terminated string from userspace.
arch/mips/include/asm/uaccess.h renamed from arch/mips/include/asm/uaccess.h~uaccess-unify-inline-vs-outline-copy_fromto_user-selection +1 -2
@@ -433,8 +433,7 @@ raw_copy_to_user(void __user *to, const
 	return __cu_len_r;
 }
 
-#define INLINE_COPY_FROM_USER
-#define INLINE_COPY_TO_USER
+#define INLINE_COPY_USER
 
 extern __kernel_size_t __bzero(void __user *addr, __kernel_size_t size);
 
arch/nios2/include/asm/uaccess.h renamed from arch/nios2/include/asm/uaccess.h~uaccess-unify-inline-vs-outline-copy_fromto_user-selection +1 -2
@@ -57,8 +57,7 @@ extern unsigned long
 raw_copy_from_user(void *to, const void __user *from, unsigned long n);
 extern unsigned long
 raw_copy_to_user(void __user *to, const void *from, unsigned long n);
-#define INLINE_COPY_FROM_USER
-#define INLINE_COPY_TO_USER
+#define INLINE_COPY_USER
 
 extern long strncpy_from_user(char *__to, const char __user *__from,
 			      long __len);
arch/openrisc/include/asm/uaccess.h renamed from arch/openrisc/include/asm/uaccess.h~uaccess-unify-inline-vs-outline-copy_fromto_user-selection +1 -2
@@ -218,8 +218,7 @@ raw_copy_to_user(void __user *to, const
 {
 	return __copy_tofrom_user((__force void *)to, from, size);
 }
-#define INLINE_COPY_FROM_USER
-#define INLINE_COPY_TO_USER
+#define INLINE_COPY_USER
 
 extern unsigned long __clear_user(void __user *addr, unsigned long size);
 
arch/parisc/include/asm/uaccess.h renamed from arch/parisc/include/asm/uaccess.h~uaccess-unify-inline-vs-outline-copy_fromto_user-selection +1 -2
@@ -197,7 +197,6 @@ unsigned long __must_check raw_copy_to_u
 					    unsigned long len);
 unsigned long __must_check raw_copy_from_user(void *dst, const void __user *src,
 					    unsigned long len);
-#define INLINE_COPY_TO_USER
-#define INLINE_COPY_FROM_USER
+#define INLINE_COPY_USER
 
 #endif /* __PARISC_UACCESS_H */
arch/s390/include/asm/uaccess.h renamed from arch/s390/include/asm/uaccess.h~uaccess-unify-inline-vs-outline-copy_fromto_user-selection +1 -2
@@ -30,8 +30,7 @@ void debug_user_asce(int exit);
 #define uaccess_kmsan_or_inline __always_inline
 #endif
 
-#define INLINE_COPY_FROM_USER
-#define INLINE_COPY_TO_USER
+#define INLINE_COPY_USER
 
 static uaccess_kmsan_or_inline __must_check unsigned long
 raw_copy_from_user(void *to, const void __user *from, unsigned long size)
arch/sh/include/asm/uaccess.h renamed from arch/sh/include/asm/uaccess.h~uaccess-unify-inline-vs-outline-copy_fromto_user-selection +1 -2
@@ -95,8 +95,7 @@ raw_copy_to_user(void __user *to, const
 {
 	return __copy_user((__force void *)to, from, n);
 }
-#define INLINE_COPY_FROM_USER
-#define INLINE_COPY_TO_USER
+#define INLINE_COPY_USER
 
 /*
  * Clear the area and return remaining number of bytes
arch/sparc/include/asm/uaccess_32.h renamed from arch/sparc/include/asm/uaccess_32.h~uaccess-unify-inline-vs-outline-copy_fromto_user-selection +1 -2
@@ -190,8 +190,7 @@ static inline unsigned long raw_copy_fro
 	return __copy_user((__force void __user *) to, from, n);
 }
 
-#define INLINE_COPY_FROM_USER
-#define INLINE_COPY_TO_USER
+#define INLINE_COPY_USER
 
 static inline unsigned long __clear_user(void __user *addr, unsigned long size)
 {
arch/sparc/include/asm/uaccess_64.h renamed from arch/sparc/include/asm/uaccess_64.h~uaccess-unify-inline-vs-outline-copy_fromto_user-selection +1 -2
@@ -231,8 +231,7 @@ unsigned long __must_check raw_copy_from
 unsigned long __must_check raw_copy_to_user(void __user *to,
 					   const void *from,
 					   unsigned long size);
-#define INLINE_COPY_FROM_USER
-#define INLINE_COPY_TO_USER
+#define INLINE_COPY_USER
 
 unsigned long __must_check raw_copy_in_user(void __user *to,
 					   const void __user *from,
arch/um/include/asm/uaccess.h renamed from arch/um/include/asm/uaccess.h~uaccess-unify-inline-vs-outline-copy_fromto_user-selection +1 -2
@@ -27,8 +27,7 @@ static inline int __access_ok(const void
 #define __access_ok __access_ok
 #define __clear_user __clear_user
 
-#define INLINE_COPY_FROM_USER
-#define INLINE_COPY_TO_USER
+#define INLINE_COPY_USER
 
 #include <asm-generic/uaccess.h>
 
arch/xtensa/include/asm/uaccess.h renamed from arch/xtensa/include/asm/uaccess.h~uaccess-unify-inline-vs-outline-copy_fromto_user-selection +1 -2
@@ -237,8 +237,7 @@ raw_copy_to_user(void __user *to, const
 	prefetch(from);
 	return __xtensa_copy_user((__force void *)to, from, n);
 }
-#define INLINE_COPY_FROM_USER
-#define INLINE_COPY_TO_USER
+#define INLINE_COPY_USER
 
 /*
  * We need to return the number of bytes not cleared.  Our memset()
include/asm-generic/uaccess.h renamed from include/asm-generic/uaccess.h~uaccess-unify-inline-vs-outline-copy_fromto_user-selection +1 -2
@@ -91,8 +91,7 @@ raw_copy_to_user(void __user *to, const
 	memcpy((void __force *)to, from, n);
 	return 0;
 }
-#define INLINE_COPY_FROM_USER
-#define INLINE_COPY_TO_USER
+#define INLINE_COPY_USER
 #endif /* CONFIG_UACCESS_MEMCPY */
 
 /*
include/linux/uaccess.h renamed from include/linux/uaccess.h~uaccess-unify-inline-vs-outline-copy_fromto_user-selection +6 -6
@@ -84,7 +84,7 @@
  * the 6 functions (copy_{to,from}_user(), __copy_{to,from}_user_inatomic())
  * that are used instead.  Out of those, __... ones are inlined.  Plain
  * copy_{to,from}_user() might or might not be inlined.  If you want them
- * inlined, have asm/uaccess.h define INLINE_COPY_{TO,FROM}_USER.
+ * inlined, have asm/uaccess.h define INLINE_COPY_USER.
  *
  * NOTE: only copy_from_user() zero-pads the destination in case of short copy.
  * Neither __copy_from_user() nor __copy_from_user_inatomic() zero anything
@@ -157,7 +157,7 @@ __copy_to_user(void __user *to, const vo
 }
 
 /*
- * Architectures that #define INLINE_COPY_TO_USER use this function
+ * Architectures that #define INLINE_COPY_USER use this function
  * directly in the normal copy_to/from_user(), the other ones go
  * through an extern _copy_to/from_user(), which expands the same code
  * here.
@@ -190,7 +190,7 @@ fail:
 	memset(to + (n - res), 0, res);
 	return res;
 }
-#ifndef INLINE_COPY_FROM_USER
+#ifndef INLINE_COPY_USER
 extern __must_check unsigned long
 _copy_from_user(void *, const void __user *, unsigned long);
 #endif
@@ -207,7 +207,7 @@ _inline_copy_to_user(void __user *to, co
 	}
 	return n;
 }
-#ifndef INLINE_COPY_TO_USER
+#ifndef INLINE_COPY_USER
 extern __must_check unsigned long
 _copy_to_user(void __user *, const void *, unsigned long);
 #endif
@@ -217,7 +217,7 @@ copy_from_user(void *to, const void __us
 {
 	if (!check_copy_size(to, n, false))
 		return n;
-#ifdef INLINE_COPY_FROM_USER
+#ifdef INLINE_COPY_USER
 	return _inline_copy_from_user(to, from, n);
 #else
 	return _copy_from_user(to, from, n);
@@ -230,7 +230,7 @@ copy_to_user(void __user *to, const void
 	if (!check_copy_size(from, n, true))
 		return n;
 
-#ifdef INLINE_COPY_TO_USER
+#ifdef INLINE_COPY_USER
 	return _inline_copy_to_user(to, from, n);
 #else
 	return _copy_to_user(to, from, n);
lib/usercopy.c renamed from lib/usercopy.c~uaccess-unify-inline-vs-outline-copy_fromto_user-selection +1 -3
@@ -12,15 +12,13 @@
 
 /* out-of-line parts */
 
-#if !defined(INLINE_COPY_FROM_USER)
+#if !defined(INLINE_COPY_USER)
 unsigned long _copy_from_user(void *to, const void __user *from, unsigned long n)
 {
 	return _inline_copy_from_user(to, from, n);
 }
 EXPORT_SYMBOL(_copy_from_user);
-#endif
 
-#if !defined(INLINE_COPY_TO_USER)
 unsigned long _copy_to_user(void __user *to, const void *from, unsigned long n)
 {
 	return _inline_copy_to_user(to, from, n);
rust/helpers/uaccess.c renamed from rust/helpers/uaccess.c~uaccess-unify-inline-vs-outline-copy_fromto_user-selection +1 -3
@@ -14,15 +14,13 @@ rust_helper_copy_to_user(void __user *to
 	return copy_to_user(to, from, n);
 }
 
-#ifdef INLINE_COPY_FROM_USER
+#ifdef INLINE_COPY_USER
 __rust_helper
 unsigned long rust_helper__copy_from_user(void *to, const void __user *from, unsigned long n)
 {
 	return _inline_copy_from_user(to, from, n);
 }
-#endif
 
-#ifdef INLINE_COPY_TO_USER
 __rust_helper
 unsigned long rust_helper__copy_to_user(void __user *to, const void *from, unsigned long n)
 {

_

Patches currently in -mm which might be from [email protected] are