Skip to contentSkip to conversation

uaccess-decouple-inline_copy_from_user-and-config_rust.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Nov 12, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: uaccess: decouple INLINE_COPY_FROM_USER and CONFIG_RUST
has been removed from the -mm tree. Its filename was
uaccess-decouple-inline_copy_from_user-and-config_rust.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 (NVIDIA)" <[email protected]>
Subject: uaccess: decouple INLINE_COPY_FROM_USER and CONFIG_RUST
Date: Thu, 23 Oct 2025 13:16:06 -0400

Commit 1f9a8286bc0c ("uaccess: always export _copy_[from|to]_user with CONFIG_RUST") exports _copy_{from,to}_user() unconditionally, if RUST is enabled. This pollutes exported symbols namespace, and spreads RUST ifdefery in core files.

It's better to declare a corresponding helper under the rust/helpers, similarly to how non-underscored copy_{from,to}_user() is handled.

---

 include/linux/uaccess.h |    2 --
 lib/usercopy.c          |    4 ++--
 rust/helpers/uaccess.c  |   12 ++++++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)
include/linux/uaccess.h renamed from include/linux/uaccess.h~uaccess-decouple-inline_copy_from_user-and-config_rust +0 -2
@@ -152,8 +152,6 @@ __copy_to_user(void __user *to, const vo
  * 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.
- *
- * Rust code always uses the extern definition.
  */
 static inline __must_check unsigned long
 _inline_copy_from_user(void *to, const void __user *from, unsigned long n)
lib/usercopy.c renamed from lib/usercopy.c~uaccess-decouple-inline_copy_from_user-and-config_rust +2 -2
@@ -12,7 +12,7 @@
 
 /* out-of-line parts */
 
-#if !defined(INLINE_COPY_FROM_USER) || defined(CONFIG_RUST)
+#if !defined(INLINE_COPY_FROM_USER)
 unsigned long _copy_from_user(void *to, const void __user *from, unsigned long n)
 {
 	return _inline_copy_from_user(to, from, n);
@@ -20,7 +20,7 @@ unsigned long _copy_from_user(void *to,
 EXPORT_SYMBOL(_copy_from_user);
 #endif
 
-#if !defined(INLINE_COPY_TO_USER) || defined(CONFIG_RUST)
+#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-decouple-inline_copy_from_user-and-config_rust +12 -0
@@ -13,3 +13,15 @@ unsigned long rust_helper_copy_to_user(v
 {
 	return copy_to_user(to, from, n);
 }
+
+#ifdef INLINE_COPY_FROM_USER
+unsigned long rust_helper__copy_from_user(void *to, const void __user *from, unsigned long n)
+{
+	return _inline_copy_from_user(to, from, n);
+}
+
+unsigned long rust_helper__copy_to_user(void __user *to, const void *from, unsigned long n)
+{
+	return _inline_copy_to_user(to, from, n);
+}
+#endif

_

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