nds32: Cleanup deprecated function strlen_user

PATCH In review [email protected] 5 participants 8 messages Apr 20, 2021 – Apr 21, 2021

Subsystems (4)

RISC-V Generic include/asm header files C-sky architecture NIOS2 architecture

lore

Share & tools

lore

[email protected]

author maintainer

2021-04-20 13:37 UTC #0 lore raw

PATCH 1/3 nds32: Cleanup deprecated function strlen_user

From: Guo Ren <[email protected]>

$ grep strlen_user * -r
arch/csky/include/asm/uaccess.h:#define strlen_user(str) strnlen_user(str, 32767)
arch/csky/lib/usercopy.c: * strlen_user: - Get the size of a string in user space.
arch/ia64/lib/strlen.S: // Please note that in the case of strlen() as opposed to strlen_user()
arch/mips/lib/strnlen_user.S: *  make strlen_user and strnlen_user access the first few KSEG0
arch/nds32/include/asm/uaccess.h:extern __must_check long strlen_user(const char __user * str);
arch/nios2/include/asm/uaccess.h:extern __must_check long strlen_user(const char __user *str);
arch/riscv/include/asm/uaccess.h:extern long __must_check strlen_user(const char __user *str);
kernel/trace/trace_probe_tmpl.h:static nokprobe_inline int fetch_store_strlen_user(unsigned long addr);
kernel/trace/trace_probe_tmpl.h:                        ret += fetch_store_strlen_user(val + code->offset);
kernel/trace/trace_uprobe.c:fetch_store_strlen_user(unsigned long addr)
kernel/trace/trace_kprobe.c:fetch_store_strlen_user(unsigned long addr)
kernel/trace/trace_kprobe.c:            return fetch_store_strlen_user(addr);

See grep result, nobody uses it.

Signed-off-by Guo Ren <[email protected]>

Cc Arnd Bergmann <[email protected]>

---
 arch/nds32/include/asm/uaccess.h | 1 -
 1 file changed, 1 deletion(-)

arch/nds32/include/asm/uaccess.h +0 -1

index 010ba5f..d4cbf06 100644
@@ -260,7 +260,6 @@ do {									\
 
 extern unsigned long __arch_clear_user(void __user * addr, unsigned long n);
 extern long strncpy_from_user(char *dest, const char __user * src, long count);
-extern __must_check long strlen_user(const char __user * str);
 extern __must_check long strnlen_user(const char __user * str, long n);
 extern unsigned long __arch_copy_from_user(void *to, const void __user * from,
                                            unsigned long n);

Signature · 1 line

2.7.4

[email protected]

author maintainer

2021-04-20 13:38 UTC #1 lore raw

PATCH 2/3 nios2: Cleanup deprecated function strlen_user

From: Guo Ren <[email protected]>

$ grep strlen_user * -r
arch/csky/include/asm/uaccess.h:#define strlen_user(str) strnlen_user(str, 32767)
arch/csky/lib/usercopy.c: * strlen_user: - Get the size of a string in user space.
arch/ia64/lib/strlen.S: // Please note that in the case of strlen() as opposed to strlen_user()
arch/mips/lib/strnlen_user.S: *  make strlen_user and strnlen_user access the first few KSEG0
arch/nds32/include/asm/uaccess.h:extern __must_check long strlen_user(const char __user * str);
arch/nios2/include/asm/uaccess.h:extern __must_check long strlen_user(const char __user *str);
arch/riscv/include/asm/uaccess.h:extern long __must_check strlen_user(const char __user *str);
kernel/trace/trace_probe_tmpl.h:static nokprobe_inline int fetch_store_strlen_user(unsigned long addr);
kernel/trace/trace_probe_tmpl.h:                        ret += fetch_store_strlen_user(val + code->offset);
kernel/trace/trace_uprobe.c:fetch_store_strlen_user(unsigned long addr)
kernel/trace/trace_kprobe.c:fetch_store_strlen_user(unsigned long addr)
kernel/trace/trace_kprobe.c:            return fetch_store_strlen_user(addr);

See grep result, nobody uses it.

Signed-off-by Guo Ren <[email protected]>

Cc Arnd Bergmann <[email protected]>

---
 arch/nios2/include/asm/uaccess.h | 1 -
 1 file changed, 1 deletion(-)

arch/nios2/include/asm/uaccess.h +0 -1

index a741abb..ba9340e 100644
@@ -83,7 +83,6 @@ raw_copy_to_user(void __user *to, const void *from, unsigned long n);
 
 extern long strncpy_from_user(char *__to, const char __user *__from,
 			      long __len);
-extern __must_check long strlen_user(const char __user *str);
 extern __must_check long strnlen_user(const char __user *s, long n);
 
 /* Optimized macros */

Signature · 1 line

2.7.4

Arnd Bergmann

maintainer Reviewed-by on v1 2/3

2021-04-20 14:32 UTC #2 lore raw

Re: [PATCH 2/3] nios2: Cleanup deprecated function strlen_user

Quoted 16 lines · On Tue, Apr 20, 2021 at 3:37 PM <[email protected]> wrote:

From: Guo Ren <[email protected]>

$ grep strlen_user * -r
arch/csky/include/asm/uaccess.h:#define strlen_user(str) strnlen_user(str, 32767)
arch/csky/lib/usercopy.c: * strlen_user: - Get the size of a string in user space.
arch/ia64/lib/strlen.S: // Please note that in the case of strlen() as opposed to strlen_user()
arch/mips/lib/strnlen_user.S: *  make strlen_user and strnlen_user access the first few KSEG0
arch/nds32/include/asm/uaccess.h:extern __must_check long strlen_user(const char __user * str);
arch/nios2/include/asm/uaccess.h:extern __must_check long strlen_user(const char __user *str);
arch/riscv/include/asm/uaccess.h:extern long __must_check strlen_user(const char __user *str);
kernel/trace/trace_probe_tmpl.h:static nokprobe_inline int fetch_store_strlen_user(unsigned long addr);
kernel/trace/trace_probe_tmpl.h:                        ret += fetch_store_strlen_user(val + code->offset);
kernel/trace/trace_uprobe.c:fetch_store_strlen_user(unsigned long addr)
kernel/trace/trace_kprobe.c:fetch_store_strlen_user(unsigned long addr)
kernel/trace/trace_kprobe.c:            return fetch_store_strlen_user(addr);

I would suggest using "grep strlen_user * -rw", to let the whole-word match filter out the irrelevant ones for the changelog.

Quoted 4 lines

See grep result, nobody uses it.
Signed-off-by Guo Ren <[email protected]>
Cc Arnd Bergmann <[email protected]>

All three patches

Reviewed-by Arnd Bergmann <[email protected]>

Do you want me to pick them up in the asm-generic tree?

Al Viro

2021-04-20 14:49 UTC #3 lore raw

Re: [PATCH 2/3] nios2: Cleanup deprecated function strlen_user

Quoted 23 lines · Arnd Bergmann

Quoted 16 lines · On Tue, Apr 20, 2021 at 3:37 PM <[email protected]> wrote:

From: Guo Ren <[email protected]>

$ grep strlen_user * -r
arch/csky/include/asm/uaccess.h:#define strlen_user(str) strnlen_user(str, 32767)
arch/csky/lib/usercopy.c: * strlen_user: - Get the size of a string in user space.
arch/ia64/lib/strlen.S: // Please note that in the case of strlen() as opposed to strlen_user()
arch/mips/lib/strnlen_user.S: *  make strlen_user and strnlen_user access the first few KSEG0
arch/nds32/include/asm/uaccess.h:extern __must_check long strlen_user(const char __user * str);
arch/nios2/include/asm/uaccess.h:extern __must_check long strlen_user(const char __user *str);
arch/riscv/include/asm/uaccess.h:extern long __must_check strlen_user(const char __user *str);
kernel/trace/trace_probe_tmpl.h:static nokprobe_inline int fetch_store_strlen_user(unsigned long addr);
kernel/trace/trace_probe_tmpl.h:                        ret += fetch_store_strlen_user(val + code->offset);
kernel/trace/trace_uprobe.c:fetch_store_strlen_user(unsigned long addr)
kernel/trace/trace_kprobe.c:fetch_store_strlen_user(unsigned long addr)
kernel/trace/trace_kprobe.c:            return fetch_store_strlen_user(addr);

I would suggest using "grep strlen_user * -rw", to let the whole-word match filter out the irrelevant ones for the changelog.

Quoted 2 lines

See grep result, nobody uses it.

Quoted 8 lines

Quoted 2 lines
Signed-off-by Guo Ren <[email protected]>
Cc Arnd Bergmann <[email protected]>
All three patches
Reviewed-by Arnd Bergmann <[email protected]>
Do you want me to pick them up in the asm-generic tree?

Might make sense to check -next from time to time... See a0d8d552783b "whack-a-mole: kill strlen_user() (again)" in there

Guo Ren

author maintainer

2021-04-21 08:29 UTC #4 lore raw

Re: [PATCH 2/3] nios2: Cleanup deprecated function strlen_user

In reply to Arnd Bergmann

Thx Arnd,

Quoted 24 lines · Arnd Bergmann

Quoted 16 lines · On Tue, Apr 20, 2021 at 3:37 PM <[email protected]> wrote:

From: Guo Ren <[email protected]>

$ grep strlen_user * -r
arch/csky/include/asm/uaccess.h:#define strlen_user(str) strnlen_user(str, 32767)
arch/csky/lib/usercopy.c: * strlen_user: - Get the size of a string in user space.
arch/ia64/lib/strlen.S: // Please note that in the case of strlen() as opposed to strlen_user()
arch/mips/lib/strnlen_user.S: *  make strlen_user and strnlen_user access the first few KSEG0
arch/nds32/include/asm/uaccess.h:extern __must_check long strlen_user(const char __user * str);
arch/nios2/include/asm/uaccess.h:extern __must_check long strlen_user(const char __user *str);
arch/riscv/include/asm/uaccess.h:extern long __must_check strlen_user(const char __user *str);
kernel/trace/trace_probe_tmpl.h:static nokprobe_inline int fetch_store_strlen_user(unsigned long addr);
kernel/trace/trace_probe_tmpl.h:                        ret += fetch_store_strlen_user(val + code->offset);
kernel/trace/trace_uprobe.c:fetch_store_strlen_user(unsigned long addr)
kernel/trace/trace_kprobe.c:fetch_store_strlen_user(unsigned long addr)
kernel/trace/trace_kprobe.c:            return fetch_store_strlen_user(addr);

I would suggest using "grep strlen_user * -rw", to let the whole-word match filter out the irrelevant ones for the changelog.

Quoted 2 lines

See grep result, nobody uses it.

Quoted 8 lines

Quoted 2 lines
Signed-off-by Guo Ren <[email protected]>
Cc Arnd Bergmann <[email protected]>
All three patches
Reviewed-by Arnd Bergmann <[email protected]>
Do you want me to pick them up in the asm-generic tree?

Yes, please take them.

Signature · 4 lines

Best Regards
 Guo Ren

ML: https://lore.kernel.org/linux-csky/

[email protected]

author maintainer

2021-04-20 13:38 UTC #5 lore raw

PATCH 3/3 riscv: Cleanup deprecated function strlen_user

In reply to [email protected]

From: Guo Ren <[email protected]>

$ grep strlen_user * -r
arch/csky/include/asm/uaccess.h:#define strlen_user(str) strnlen_user(str, 32767)
arch/csky/lib/usercopy.c: * strlen_user: - Get the size of a string in user space.
arch/ia64/lib/strlen.S: // Please note that in the case of strlen() as opposed to strlen_user()
arch/mips/lib/strnlen_user.S: *  make strlen_user and strnlen_user access the first few KSEG0
arch/nds32/include/asm/uaccess.h:extern __must_check long strlen_user(const char __user * str);
arch/nios2/include/asm/uaccess.h:extern __must_check long strlen_user(const char __user *str);
arch/riscv/include/asm/uaccess.h:extern long __must_check strlen_user(const char __user *str);
kernel/trace/trace_probe_tmpl.h:static nokprobe_inline int fetch_store_strlen_user(unsigned long addr);
kernel/trace/trace_probe_tmpl.h:                        ret += fetch_store_strlen_user(val + code->offset);
kernel/trace/trace_uprobe.c:fetch_store_strlen_user(unsigned long addr)
kernel/trace/trace_kprobe.c:fetch_store_strlen_user(unsigned long addr)
kernel/trace/trace_kprobe.c:            return fetch_store_strlen_user(addr);

See grep result, nobody uses it.

Signed-off-by Guo Ren <[email protected]>

Cc Arnd Bergmann <[email protected]>

---
 arch/riscv/include/asm/uaccess.h | 1 -
 1 file changed, 1 deletion(-)

arch/riscv/include/asm/uaccess.h +0 -1

index 824b2c9..4297f43 100644
@@ -372,7 +372,6 @@ raw_copy_to_user(void __user *to, const void *from, unsigned long n)
 
 extern long strncpy_from_user(char *dest, const char __user *src, long count);
 
-extern long __must_check strlen_user(const char __user *str);
 extern long __must_check strnlen_user(const char __user *str, long n);
 
 extern

Signature · 1 line

2.7.4

Christoph Hellwig

2021-04-20 14:39 UTC #6 lore raw

In reply to [email protected]

Can you also clean up the reference to strlen_user in the comments in the ia64 and mips code, please?

Greentime Hu

Acked-by on v1 1/3

2021-04-20 15:21 UTC #7 lore raw

In reply to [email protected]

<[email protected]> 於 2021年4月20日週二下午9:38寫道：

Quoted 30 lines

From: Guo Ren <[email protected]>

$ grep strlen_user * -r
arch/csky/include/asm/uaccess.h:#define strlen_user(str) strnlen_user(str, 32767)
arch/csky/lib/usercopy.c: * strlen_user: - Get the size of a string in user space.
arch/ia64/lib/strlen.S: // Please note that in the case of strlen() as opposed to strlen_user()
arch/mips/lib/strnlen_user.S: *  make strlen_user and strnlen_user access the first few KSEG0
arch/nds32/include/asm/uaccess.h:extern __must_check long strlen_user(const char __user * str);
arch/nios2/include/asm/uaccess.h:extern __must_check long strlen_user(const char __user *str);
arch/riscv/include/asm/uaccess.h:extern long __must_check strlen_user(const char __user *str);
kernel/trace/trace_probe_tmpl.h:static nokprobe_inline int fetch_store_strlen_user(unsigned long addr);
kernel/trace/trace_probe_tmpl.h:                        ret += fetch_store_strlen_user(val + code->offset);
kernel/trace/trace_uprobe.c:fetch_store_strlen_user(unsigned long addr)
kernel/trace/trace_kprobe.c:fetch_store_strlen_user(unsigned long addr)
kernel/trace/trace_kprobe.c:            return fetch_store_strlen_user(addr);

See grep result, nobody uses it.

Signed-off-by Guo Ren <[email protected]>

Cc Arnd Bergmann <[email protected]>

---
 arch/nds32/include/asm/uaccess.h | 1 -
 1 file changed, 1 deletion(-)

arch/nds32/include/asm/uaccess.h +0 -0

index 010ba5f..d4cbf06 100644

arch/nds32/include/asm/uaccess.h do { \ · line 265

Quoted 7 lines

arch/nds32/include/asm/uaccess.h +0 -1

@@ -260,7 +260,6 @@ do {                                                                        \
 
 extern unsigned long __arch_clear_user(void __user * addr, unsigned long n);
 extern long strncpy_from_user(char *dest, const char __user * src, long count);
-extern __must_check long strlen_user(const char __user * str);
 extern __must_check long strnlen_user(const char __user * str, long n);
 extern unsigned long __arch_copy_from_user(void *to, const void __user * from,
                                            unsigned long n);

Thank you, Guo.

Acked-by Greentime Hu <[email protected]>