Skip to contentSkip to conversation

Switching ARC to optimized generic strncpy_from_user

PATCH New Vineet Gupta 1 participant 3 messages Jan 16, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v2 cover Switching ARC to optimized generic strncpy_from_user

Hi,

This series switches ARC to generic word-at-a-time interface.

I understand that going fwd, we may drop the inline versions altogether but this helps ARC code in the interim.

v2 <- v1
- Moved __strnlen_user/__strncpy_from_user to under ifdef gaurd [Arnd]
- Dropped the broken optimization patch [Linus]
- Folded 2 ARC patches into 1

Thx,
-Vineet

Vineet Gupta (2):
asm-generic/uaccess: don't define inline functions if noinline lib/*
in use
ARC: uaccess: use optimized generic __strnlen_user/__strncpy_from_user

 arch/arc/Kconfig               |  2 +
 arch/arc/include/asm/uaccess.h | 85 ++--------------------------------
 arch/arc/mm/extable.c          | 23 ---------
 include/asm-generic/uaccess.h  |  8 ++++
 4 files changed, 14 insertions(+), 104 deletions(-)
Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 1/2 asm-generic/uaccess: don't define inline functions if noinline lib/* in use

There are 2 generic varaints of strncpy_from_user() / strnlen_user()
(1). inline version in asm-generic/uaccess.h
(2). optimized word-at-a-time version in lib/*

This patch disables #1 if #2 selected. This allows arches to continue reusing asm-generic/uaccess.h for rest of code

This came up when switching ARC to generic word-at-a-time interface

---
 include/asm-generic/uaccess.h | 8 ++++++++
 1 file changed, 8 insertions(+)
include/asm-generic/uaccess.h +8 -0
index e935318804f8..2ea7f4e0e60e 100644
@@ -212,6 +212,7 @@ static inline int __get_user_fn(size_t size, const void __user *ptr, void *x)
 
 extern int __get_user_bad(void) __attribute__((noreturn));
 
+#ifndef CONFIG_GENERIC_STRNCPY_FROM_USER
 /*
  * Copy a null terminated string from userspace.
  */
@@ -234,7 +235,11 @@ strncpy_from_user(char *dst, const char __user *src, long count)
 		return -EFAULT;
 	return __strncpy_from_user(dst, src, count);
 }
+#else
+extern long strncpy_from_user(char *dest, const char __user *src, long count);
+#endif
 
+#ifndef CONFIG_GENERIC_STRNLEN_USER
 /*
  * Return the size of a string (including the ending 0)
  *
@@ -255,6 +260,9 @@ static inline long strnlen_user(const char __user *src, long n)
 		return 0;
 	return __strnlen_user(src, n);
 }
+#else
+extern __must_check long strnlen_user(const char __user *str, long n);
+#endif
 
 /*
  * Zero Userspace
Signature · 1 line
2.20.1
#2 lore raw

PATCH v2 2/2 ARC: uaccess: use optimized generic __strnlen_user/__strncpy_from_user

In reply to Vineet Gupta

The existing ARC variants have 2 issues
- Use ZOL which may not be present in forthcoming architecture
- Byte loop based vs. generic version which is word loop based

---
 arch/arc/Kconfig               |  2 +
 arch/arc/include/asm/uaccess.h | 85 ++--------------------------------
 arch/arc/mm/extable.c          | 23 ---------
 3 files changed, 6 insertions(+), 104 deletions(-)
arch/arc/Kconfig +2 -0
index 26108ea785c2..3b074c4d31fb 100644
@@ -26,6 +26,8 @@ config ARC
 	select GENERIC_PENDING_IRQ if SMP
 	select GENERIC_SCHED_CLOCK
 	select GENERIC_SMP_IDLE_THREAD
+	select GENERIC_STRNCPY_FROM_USER if MMU
+	select GENERIC_STRNLEN_USER if MMU
 	select HAVE_ARCH_KGDB
 	select HAVE_ARCH_TRACEHOOK
 	select HAVE_DEBUG_STACKOVERFLOW
arch/arc/include/asm/uaccess.h +4 -81

106 lines not on this page · raw message

arch/arc/mm/extable.c +0 -23
index b06b09ddf924..88fa3a4d4906 100644
@@ -22,26 +22,3 @@ int fixup_exception(struct pt_regs *regs)
 
 	return 0;
 }
-
-#ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
-
-unsigned long arc_clear_user_noinline(void __user *to,
-		unsigned long n)
-{
-	return __arc_clear_user(to, n);
-}
-EXPORT_SYMBOL(arc_clear_user_noinline);
-
-long arc_strncpy_from_user_noinline(char *dst, const char __user *src,
-		long count)
-{
-	return __arc_strncpy_from_user(dst, src, count);
-}
-EXPORT_SYMBOL(arc_strncpy_from_user_noinline);
-
-long arc_strnlen_user_noinline(const char __user *src, long n)
-{
-	return __arc_strnlen_user(src, n);
-}
-EXPORT_SYMBOL(arc_strnlen_user_noinline);
-#endif
Signature · 1 line
2.20.1