syscalls: Cleanup references to sys_lookup_dcookie()
Subsystems (17)
PATCH 1/1 syscalls: Cleanup references to sys_lookup_dcookie()
commit 'be65de6b03aa ("fs: Remove dcookies support")' removed the syscall definition for lookup_dcookie. However, syscall tables still point to the old sys_lookup_dcookie() definition. Update syscall tables of all architectures to directly point to sys_ni_syscall() instead.
---
This patch has a dependency on another patch that has been applied to the asm-generic tree:
https://lore.kernel.org/lkml/[email protected]/
--- arch/alpha/kernel/syscalls/syscall.tbl | 2 +- arch/arm/tools/syscall.tbl | 2 +- arch/arm64/include/asm/unistd32.h | 4 ++-- arch/ia64/kernel/syscalls/syscall.tbl | 2 +- arch/m68k/kernel/syscalls/syscall.tbl | 2 +- arch/microblaze/kernel/syscalls/syscall.tbl | 2 +- arch/mips/kernel/syscalls/syscall_n32.tbl | 2 +- arch/mips/kernel/syscalls/syscall_n64.tbl | 2 +- arch/mips/kernel/syscalls/syscall_o32.tbl | 2 +- arch/parisc/kernel/syscalls/syscall.tbl | 2 +- arch/powerpc/kernel/syscalls/syscall.tbl | 2 +- arch/s390/kernel/syscalls/syscall.tbl | 2 +- arch/sh/kernel/syscalls/syscall.tbl | 2 +- arch/sparc/kernel/syscalls/syscall.tbl | 2 +- arch/x86/entry/syscalls/syscall_32.tbl | 2 +- arch/x86/entry/syscalls/syscall_64.tbl | 2 +- arch/xtensa/kernel/syscalls/syscall.tbl | 2 +- include/linux/compat.h | 1 - include/linux/syscalls.h | 1 - include/uapi/asm-generic/unistd.h | 2 +- kernel/sys_ni.c | 2 -- tools/include/uapi/asm-generic/unistd.h | 2 +- tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl | 2 +- tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 2 +- tools/perf/arch/s390/entry/syscalls/syscall.tbl | 2 +- tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 2 +- 26 files changed, 24 insertions(+), 28 deletions(-)
arch/alpha/kernel/syscalls/syscall.tbl +1 -1
@@ -334,7 +334,7 @@ 401 common io_submit sys_io_submit 402 common io_cancel sys_io_cancel 405 common exit_group sys_exit_group -406 common lookup_dcookie sys_lookup_dcookie +406 common lookup_dcookie sys_ni_syscall 407 common epoll_create sys_epoll_create 408 common epoll_ctl sys_epoll_ctl 409 common epoll_wait sys_epoll_wait
arch/arm/tools/syscall.tbl +1 -1
@@ -263,7 +263,7 @@ 246 common io_submit sys_io_submit 247 common io_cancel sys_io_cancel 248 common exit_group sys_exit_group -249 common lookup_dcookie sys_lookup_dcookie +249 common lookup_dcookie sys_ni_syscall 250 common epoll_create sys_epoll_create 251 common epoll_ctl sys_epoll_ctl sys_oabi_epoll_ctl 252 common epoll_wait sys_epoll_wait
arch/arm64/include/asm/unistd32.h +2 -2
@@ -508,8 +508,8 @@ __SYSCALL(__NR_io_submit, compat_sys_io_submit) __SYSCALL(__NR_io_cancel, sys_io_cancel)#define __NR_exit_group 248__SYSCALL (__NR_exit_group, sys_exit_group) -#define __NR_lookup_dcookie 249 -__SYSCALL(__NR_lookup_dcookie, compat_sys_lookup_dcookie) + /* 249 was lookup_dcookie */ +__SYSCALL(249, sys_ni_syscall)#define __NR_epoll_create 250 __SYSCALL(__NR_epoll_create, sys_epoll_create)#define __NR_epoll_ctl 251
arch/ia64/kernel/syscalls/syscall.tbl +1 -1
@@ -222,7 +222,7 @@ 210 common fadvise64 sys_fadvise64_64 211 common tgkill sys_tgkill 212 common exit_group sys_exit_group -213 common lookup_dcookie sys_lookup_dcookie +213 common lookup_dcookie sys_ni_syscall 214 common io_setup sys_io_setup 215 common io_destroy sys_io_destroy 216 common io_getevents sys_io_getevents
arch/m68k/kernel/syscalls/syscall.tbl +1 -1
@@ -255,7 +255,7 @@ 245 common io_cancel sys_io_cancel 246 common fadvise64 sys_fadvise64 247 common exit_group sys_exit_group -248 common lookup_dcookie sys_lookup_dcookie +248 common lookup_dcookie sys_ni_syscall 249 common epoll_create sys_epoll_create 250 common epoll_ctl sys_epoll_ctl 251 common epoll_wait sys_epoll_wait
arch/microblaze/kernel/syscalls/syscall.tbl +1 -1
@@ -260,7 +260,7 @@ 250 common fadvise64 sys_fadvise64 # 251 is available for reuse (was briefly sys_set_zone_reclaim) 252 common exit_group sys_exit_group -253 common lookup_dcookie sys_lookup_dcookie +253 common lookup_dcookie sys_ni_syscall 254 common epoll_create sys_epoll_create 255 common epoll_ctl sys_epoll_ctl 256 common epoll_wait sys_epoll_wait
arch/mips/kernel/syscalls/syscall_n32.tbl +1 -1
@@ -214,7 +214,7 @@ 203 n32 io_submit compat_sys_io_submit 204 n32 io_cancel sys_io_cancel 205 n32 exit_group sys_exit_group -206 n32 lookup_dcookie sys_lookup_dcookie +206 n32 lookup_dcookie sys_ni_syscall 207 n32 epoll_create sys_epoll_create 208 n32 epoll_ctl sys_epoll_ctl 209 n32 epoll_wait sys_epoll_wait
arch/mips/kernel/syscalls/syscall_n64.tbl +1 -1
@@ -214,7 +214,7 @@ 203 n64 io_submit sys_io_submit 204 n64 io_cancel sys_io_cancel 205 n64 exit_group sys_exit_group -206 n64 lookup_dcookie sys_lookup_dcookie +206 n64 lookup_dcookie sys_ni_syscall 207 n64 epoll_create sys_epoll_create 208 n64 epoll_ctl sys_epoll_ctl 209 n64 epoll_wait sys_epoll_wait
arch/mips/kernel/syscalls/syscall_o32.tbl +1 -1
@@ -258,7 +258,7 @@ 244 o32 io_submit sys_io_submit compat_sys_io_submit 245 o32 io_cancel sys_io_cancel 246 o32 exit_group sys_exit_group -247 o32 lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie +247 o32 lookup_dcookie sys_ni_syscall 248 o32 epoll_create sys_epoll_create 249 o32 epoll_ctl sys_epoll_ctl 250 o32 epoll_wait sys_epoll_wait
arch/parisc/kernel/syscalls/syscall.tbl +1 -1
@@ -245,7 +245,7 @@ # 220 was alloc_hugepages # 221 was free_hugepages 222 common exit_group sys_exit_group -223 common lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie +223 common lookup_dcookie sys_ni_syscall 224 common epoll_create sys_epoll_create 225 common epoll_ctl sys_epoll_ctl 226 common epoll_wait sys_epoll_wait
arch/powerpc/kernel/syscalls/syscall.tbl +1 -1
@@ -294,7 +294,7 @@ 233 32 fadvise64 sys_ppc32_fadvise64 compat_sys_ppc32_fadvise64 233 64 fadvise64 sys_fadvise64 234 nospu exit_group sys_exit_group -235 nospu lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie +235 nospu lookup_dcookie sys_ni_syscall 236 common epoll_create sys_epoll_create 237 common epoll_ctl sys_epoll_ctl 238 common epoll_wait sys_epoll_wait
arch/s390/kernel/syscalls/syscall.tbl +1 -1
@@ -100,7 +100,7 @@ 106 common stat sys_newstat compat_sys_newstat 107 common lstat sys_newlstat compat_sys_newlstat 108 common fstat sys_newfstat compat_sys_newfstat -110 common lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie +110 common lookup_dcookie - - 111 common vhangup sys_vhangup sys_vhangup 112 common idle - - 114 common wait4 sys_wait4 compat_sys_wait4
arch/sh/kernel/syscalls/syscall.tbl +1 -1
@@ -260,7 +260,7 @@ 250 common fadvise64 sys_fadvise64 # 251 is unused 252 common exit_group sys_exit_group -253 common lookup_dcookie sys_lookup_dcookie +253 common lookup_dcookie sys_ni_syscall 254 common epoll_create sys_epoll_create 255 common epoll_ctl sys_epoll_ctl 256 common epoll_wait sys_epoll_wait
arch/sparc/kernel/syscalls/syscall.tbl +1 -1
@@ -249,7 +249,7 @@ 205 common readahead sys_readahead compat_sys_readahead 206 common socketcall sys_socketcall sys32_socketcall 207 common syslog sys_syslog -208 common lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie +208 common lookup_dcookie sys_ni_syscall 209 common fadvise64 sys_fadvise64 compat_sys_fadvise64 210 common fadvise64_64 sys_fadvise64_64 compat_sys_fadvise64_64 211 common tgkill sys_tgkill
arch/x86/entry/syscalls/syscall_32.tbl +1 -1
@@ -264,7 +264,7 @@ 250 i386 fadvise64 sys_ia32_fadvise64 # 251 is available for reuse (was briefly sys_set_zone_reclaim) 252 i386 exit_group sys_exit_group -253 i386 lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie +253 i386 lookup_dcookie 254 i386 epoll_create sys_epoll_create 255 i386 epoll_ctl sys_epoll_ctl 256 i386 epoll_wait sys_epoll_wait
arch/x86/entry/syscalls/syscall_64.tbl +1 -1
@@ -220,7 +220,7 @@ 209 64 io_submit sys_io_submit 210 common io_cancel sys_io_cancel 211 64 get_thread_area -212 common lookup_dcookie sys_lookup_dcookie +212 common lookup_dcookie 213 common epoll_create sys_epoll_create 214 64 epoll_ctl_old 215 64 epoll_wait_old
arch/xtensa/kernel/syscalls/syscall.tbl +1 -1
@@ -273,7 +273,7 @@ 252 common timer_getoverrun sys_timer_getoverrun # System 253 common reserved253 sys_ni_syscall -254 common lookup_dcookie sys_lookup_dcookie +254 common lookup_dcookie sys_ni_syscall 255 common available255 sys_ni_syscall 256 common add_key sys_add_key 257 common request_key sys_request_key
include/linux/compat.h +0 -1
@@ -581,7 +581,6 @@ asmlinkage long compat_sys_io_pgetevents_time64(compat_aio_context_t ctx_id,struct io_event __user *events, struct __kernel_timespec __user *timeout, const struct __compat_aio_sigset __user *usig); -asmlinkage long compat_sys_lookup_dcookie (u32 ,u32 ,char __user *,compat_size_t ); asmlinkage long compat_sys_epoll_pwait(int epfd, struct epoll_event __user *events, int maxevents, int timeout,
include/linux/syscalls.h +0 -1
@@ -369,7 +369,6 @@ asmlinkage long sys_lremovexattr(const char __user *path, const char __user *name);asmlinkage long sys_fremovexattr (int fd,const char __user *name);asmlinkage long sys_getcwd (char __user *buf,unsigned long size); -asmlinkage long sys_lookup_dcookie (u64 cookie64,char __user *buf,size_t len);asmlinkage long sys_eventfd2 (unsigned int count,int flags);asmlinkage long sys_epoll_create1 (int flags); asmlinkage long sys_epoll_ctl(int epfd, int op, int fd,
include/uapi/asm-generic/unistd.h +1 -1
@@ -71,7 +71,7 @@ __SYSCALL(__NR_fremovexattr, sys_fremovexattr)#define __NR_getcwd 17 __SYSCALL(__NR_getcwd, sys_getcwd)#define __NR_lookup_dcookie 18 -__SC_COMP(__NR_lookup_dcookie, sys_lookup_dcookie, compat_sys_lookup_dcookie) +__SYSCALL(__NR_lookup_dcookie, sys_ni_syscall)#define __NR_eventfd2 19 __SYSCALL(__NR_eventfd2, sys_eventfd2)#define __NR_epoll_create1 20
kernel/sys_ni.c +0 -2
@@ -51,8 +51,6 @@ COND_SYSCALL_COMPAT(io_pgetevents);COND_SYSCALL (io_uring_setup);COND_SYSCALL (io_uring_enter);COND_SYSCALL (io_uring_register); -COND_SYSCALL (lookup_dcookie); -COND_SYSCALL_COMPAT (lookup_dcookie);COND_SYSCALL (eventfd2);COND_SYSCALL (epoll_create1);COND_SYSCALL (epoll_ctl);
tools/include/uapi/asm-generic/unistd.h +1 -1
@@ -71,7 +71,7 @@ __SYSCALL(__NR_fremovexattr, sys_fremovexattr)#define __NR_getcwd 17 __SYSCALL(__NR_getcwd, sys_getcwd)#define __NR_lookup_dcookie 18 -__SC_COMP(__NR_lookup_dcookie, sys_lookup_dcookie, compat_sys_lookup_dcookie) +__SYSCALL(__NR_lookup_dcookie, sys_ni_syscall)#define __NR_eventfd2 19 __SYSCALL(__NR_eventfd2, sys_eventfd2)#define __NR_epoll_create1 20
tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl +1 -1
@@ -214,7 +214,7 @@ 203 n64 io_submit sys_io_submit 204 n64 io_cancel sys_io_cancel 205 n64 exit_group sys_exit_group -206 n64 lookup_dcookie sys_lookup_dcookie +206 n64 lookup_dcookie sys_ni_syscall 207 n64 epoll_create sys_epoll_create 208 n64 epoll_ctl sys_epoll_ctl 209 n64 epoll_wait sys_epoll_wait
tools/perf/arch/powerpc/entry/syscalls/syscall.tbl +1 -1
@@ -294,7 +294,7 @@ 233 32 fadvise64 sys_ppc32_fadvise64 compat_sys_ppc32_fadvise64 233 64 fadvise64 sys_fadvise64 234 nospu exit_group sys_exit_group -235 nospu lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie +235 nospu lookup_dcookie sys_ni_syscall 236 common epoll_create sys_epoll_create 237 common epoll_ctl sys_epoll_ctl 238 common epoll_wait sys_epoll_wait
tools/perf/arch/s390/entry/syscalls/syscall.tbl +1 -1
@@ -100,7 +100,7 @@ 106 common stat sys_newstat compat_sys_newstat 107 common lstat sys_newlstat compat_sys_newlstat 108 common fstat sys_newfstat compat_sys_newfstat -110 common lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie +110 common lookup_dcookie - - 111 common vhangup sys_vhangup sys_vhangup 112 common idle - - 114 common wait4 sys_wait4 compat_sys_wait4
tools/perf/arch/x86/entry/syscalls/syscall_64.tbl +1 -1
@@ -220,7 +220,7 @@ 209 64 io_submit sys_io_submit 210 common io_cancel sys_io_cancel 211 64 get_thread_area -212 common lookup_dcookie sys_lookup_dcookie +212 common lookup_dcookie 213 common epoll_create sys_epoll_create 214 64 epoll_ctl_old 215 64 epoll_wait_old
Signature · 1 line
2.34.1
Quoted 6 lines · Sohil Mehta
commit '
be65de6b03aa("fs: Remove dcookies support")' removed the syscall definition forlookup_dcookie. However, syscall tables still point to the oldsys_lookup_dcookie()definition. Update syscall tables of all architectures to directly point tosys_ni_syscall()instead.Signed-off-by Sohil Mehta <[email protected]>
Thanks.
Quoted 33 lines
---
This patch has a dependency on another patch that has been applied to the asm-generic tree:
https://lore.kernel.org/lkml/[email protected]/--- arch/alpha/kernel/syscalls/syscall.tbl | 2 +- arch/arm/tools/syscall.tbl | 2 +- arch/arm64/include/asm/unistd32.h | 4 ++-- arch/ia64/kernel/syscalls/syscall.tbl | 2 +- arch/m68k/kernel/syscalls/syscall.tbl | 2 +- arch/microblaze/kernel/syscalls/syscall.tbl | 2 +- arch/mips/kernel/syscalls/syscall_n32.tbl | 2 +- arch/mips/kernel/syscalls/syscall_n64.tbl | 2 +- arch/mips/kernel/syscalls/syscall_o32.tbl | 2 +- arch/parisc/kernel/syscalls/syscall.tbl | 2 +- arch/powerpc/kernel/syscalls/syscall.tbl | 2 +- arch/s390/kernel/syscalls/syscall.tbl | 2 +- arch/sh/kernel/syscalls/syscall.tbl | 2 +- arch/sparc/kernel/syscalls/syscall.tbl | 2 +- arch/x86/entry/syscalls/syscall_32.tbl | 2 +- arch/x86/entry/syscalls/syscall_64.tbl | 2 +- arch/xtensa/kernel/syscalls/syscall.tbl | 2 +- include/linux/compat.h | 1 - include/linux/syscalls.h | 1 - include/uapi/asm-generic/unistd.h | 2 +- kernel/sys_ni.c | 2 -- tools/include/uapi/asm-generic/unistd.h | 2 +- tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl | 2 +- tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 2 +- tools/perf/arch/s390/entry/syscalls/syscall.tbl | 2 +- tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 2 +- 26 files changed, 24 insertions(+), 28 deletions(-)
Signature · 1 line
~Randy
Hello,
Quoted 4 lines · On Wed, Jun 28, 2023 at 4:44 PM Randy Dunlap <[email protected]> wrote:
On 6/28/23 16:09, Sohil Mehta wrote:
Quoted 8 lines
Quoted 6 lines
commit '
be65de6b03aa("fs: Remove dcookies support")' removed the syscall definition forlookup_dcookie. However, syscall tables still point to the oldsys_lookup_dcookie()definition. Update syscall tables of all architectures to directly point tosys_ni_syscall()instead.Signed-off-by Sohil Mehta <[email protected]>Reviewed-by Randy Dunlap <[email protected]>
I was about to say that it'd be nice if you split the tools/perf part since it can support old kernels. But if the syscall is only used for oprofile then probably perf doesn't need to care about it. :)
For the perf part,
Thanks,
Namhyung
PATCH v2 1/1 syscalls: Cleanup references to sys_lookup_dcookie()
In reply to Sohil Mehtacommit 'be65de6b03aa ("fs: Remove dcookies support")' removed the syscall definition for lookup_dcookie. However, syscall tables still point to the old sys_lookup_dcookie() definition. Update syscall tables of all architectures to directly point to sys_ni_syscall() instead.
---
v2:
- Rebased to v6.5-rc1. No other dependencies.
- Added acquired tags.
--- arch/alpha/kernel/syscalls/syscall.tbl | 2 +- arch/arm/tools/syscall.tbl | 2 +- arch/arm64/include/asm/unistd32.h | 4 ++-- arch/ia64/kernel/syscalls/syscall.tbl | 2 +- arch/m68k/kernel/syscalls/syscall.tbl | 2 +- arch/microblaze/kernel/syscalls/syscall.tbl | 2 +- arch/mips/kernel/syscalls/syscall_n32.tbl | 2 +- arch/mips/kernel/syscalls/syscall_n64.tbl | 2 +- arch/mips/kernel/syscalls/syscall_o32.tbl | 2 +- arch/parisc/kernel/syscalls/syscall.tbl | 2 +- arch/powerpc/kernel/syscalls/syscall.tbl | 2 +- arch/s390/kernel/syscalls/syscall.tbl | 2 +- arch/sh/kernel/syscalls/syscall.tbl | 2 +- arch/sparc/kernel/syscalls/syscall.tbl | 2 +- arch/x86/entry/syscalls/syscall_32.tbl | 2 +- arch/x86/entry/syscalls/syscall_64.tbl | 2 +- arch/xtensa/kernel/syscalls/syscall.tbl | 2 +- include/linux/compat.h | 1 - include/linux/syscalls.h | 1 - include/uapi/asm-generic/unistd.h | 2 +- kernel/sys_ni.c | 2 -- tools/include/uapi/asm-generic/unistd.h | 2 +- tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl | 2 +- tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 2 +- tools/perf/arch/s390/entry/syscalls/syscall.tbl | 2 +- tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 2 +- 26 files changed, 24 insertions(+), 28 deletions(-)
arch/alpha/kernel/syscalls/syscall.tbl +1 -1
@@ -334,7 +334,7 @@ 401 common io_submit sys_io_submit 402 common io_cancel sys_io_cancel 405 common exit_group sys_exit_group -406 common lookup_dcookie sys_lookup_dcookie +406 common lookup_dcookie sys_ni_syscall 407 common epoll_create sys_epoll_create 408 common epoll_ctl sys_epoll_ctl 409 common epoll_wait sys_epoll_wait
arch/arm/tools/syscall.tbl +1 -1
@@ -263,7 +263,7 @@ 246 common io_submit sys_io_submit 247 common io_cancel sys_io_cancel 248 common exit_group sys_exit_group -249 common lookup_dcookie sys_lookup_dcookie +249 common lookup_dcookie sys_ni_syscall 250 common epoll_create sys_epoll_create 251 common epoll_ctl sys_epoll_ctl sys_oabi_epoll_ctl 252 common epoll_wait sys_epoll_wait
arch/arm64/include/asm/unistd32.h +2 -2
@@ -508,8 +508,8 @@ __SYSCALL(__NR_io_submit, compat_sys_io_submit) __SYSCALL(__NR_io_cancel, sys_io_cancel)#define __NR_exit_group 248__SYSCALL (__NR_exit_group, sys_exit_group) -#define __NR_lookup_dcookie 249 -__SYSCALL(__NR_lookup_dcookie, compat_sys_lookup_dcookie) + /* 249 was lookup_dcookie */ +__SYSCALL(249, sys_ni_syscall)#define __NR_epoll_create 250 __SYSCALL(__NR_epoll_create, sys_epoll_create)#define __NR_epoll_ctl 251
arch/ia64/kernel/syscalls/syscall.tbl +1 -1
@@ -222,7 +222,7 @@ 210 common fadvise64 sys_fadvise64_64 211 common tgkill sys_tgkill 212 common exit_group sys_exit_group -213 common lookup_dcookie sys_lookup_dcookie +213 common lookup_dcookie sys_ni_syscall 214 common io_setup sys_io_setup 215 common io_destroy sys_io_destroy 216 common io_getevents sys_io_getevents
arch/m68k/kernel/syscalls/syscall.tbl +1 -1
@@ -255,7 +255,7 @@ 245 common io_cancel sys_io_cancel 246 common fadvise64 sys_fadvise64 247 common exit_group sys_exit_group -248 common lookup_dcookie sys_lookup_dcookie +248 common lookup_dcookie sys_ni_syscall 249 common epoll_create sys_epoll_create 250 common epoll_ctl sys_epoll_ctl 251 common epoll_wait sys_epoll_wait
arch/microblaze/kernel/syscalls/syscall.tbl +1 -1
@@ -260,7 +260,7 @@ 250 common fadvise64 sys_fadvise64 # 251 is available for reuse (was briefly sys_set_zone_reclaim) 252 common exit_group sys_exit_group -253 common lookup_dcookie sys_lookup_dcookie +253 common lookup_dcookie sys_ni_syscall 254 common epoll_create sys_epoll_create 255 common epoll_ctl sys_epoll_ctl 256 common epoll_wait sys_epoll_wait
arch/mips/kernel/syscalls/syscall_n32.tbl +1 -1
@@ -214,7 +214,7 @@ 203 n32 io_submit compat_sys_io_submit 204 n32 io_cancel sys_io_cancel 205 n32 exit_group sys_exit_group -206 n32 lookup_dcookie sys_lookup_dcookie +206 n32 lookup_dcookie sys_ni_syscall 207 n32 epoll_create sys_epoll_create 208 n32 epoll_ctl sys_epoll_ctl 209 n32 epoll_wait sys_epoll_wait
arch/mips/kernel/syscalls/syscall_n64.tbl +1 -1
@@ -214,7 +214,7 @@ 203 n64 io_submit sys_io_submit 204 n64 io_cancel sys_io_cancel 205 n64 exit_group sys_exit_group -206 n64 lookup_dcookie sys_lookup_dcookie +206 n64 lookup_dcookie sys_ni_syscall 207 n64 epoll_create sys_epoll_create 208 n64 epoll_ctl sys_epoll_ctl 209 n64 epoll_wait sys_epoll_wait
arch/mips/kernel/syscalls/syscall_o32.tbl +1 -1
@@ -258,7 +258,7 @@ 244 o32 io_submit sys_io_submit compat_sys_io_submit 245 o32 io_cancel sys_io_cancel 246 o32 exit_group sys_exit_group -247 o32 lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie +247 o32 lookup_dcookie sys_ni_syscall 248 o32 epoll_create sys_epoll_create 249 o32 epoll_ctl sys_epoll_ctl 250 o32 epoll_wait sys_epoll_wait
arch/parisc/kernel/syscalls/syscall.tbl +1 -1
@@ -245,7 +245,7 @@ # 220 was alloc_hugepages # 221 was free_hugepages 222 common exit_group sys_exit_group -223 common lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie +223 common lookup_dcookie sys_ni_syscall 224 common epoll_create sys_epoll_create 225 common epoll_ctl sys_epoll_ctl 226 common epoll_wait sys_epoll_wait
arch/powerpc/kernel/syscalls/syscall.tbl +1 -1
@@ -294,7 +294,7 @@ 233 32 fadvise64 sys_ppc32_fadvise64 compat_sys_ppc32_fadvise64 233 64 fadvise64 sys_fadvise64 234 nospu exit_group sys_exit_group -235 nospu lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie +235 nospu lookup_dcookie sys_ni_syscall 236 common epoll_create sys_epoll_create 237 common epoll_ctl sys_epoll_ctl 238 common epoll_wait sys_epoll_wait
arch/s390/kernel/syscalls/syscall.tbl +1 -1
@@ -100,7 +100,7 @@ 106 common stat sys_newstat compat_sys_newstat 107 common lstat sys_newlstat compat_sys_newlstat 108 common fstat sys_newfstat compat_sys_newfstat -110 common lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie +110 common lookup_dcookie - - 111 common vhangup sys_vhangup sys_vhangup 112 common idle - - 114 common wait4 sys_wait4 compat_sys_wait4
arch/sh/kernel/syscalls/syscall.tbl +1 -1
@@ -260,7 +260,7 @@ 250 common fadvise64 sys_fadvise64 # 251 is unused 252 common exit_group sys_exit_group -253 common lookup_dcookie sys_lookup_dcookie +253 common lookup_dcookie sys_ni_syscall 254 common epoll_create sys_epoll_create 255 common epoll_ctl sys_epoll_ctl 256 common epoll_wait sys_epoll_wait
arch/sparc/kernel/syscalls/syscall.tbl +1 -1
@@ -249,7 +249,7 @@ 205 common readahead sys_readahead compat_sys_readahead 206 common socketcall sys_socketcall sys32_socketcall 207 common syslog sys_syslog -208 common lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie +208 common lookup_dcookie sys_ni_syscall 209 common fadvise64 sys_fadvise64 compat_sys_fadvise64 210 common fadvise64_64 sys_fadvise64_64 compat_sys_fadvise64_64 211 common tgkill sys_tgkill
arch/x86/entry/syscalls/syscall_32.tbl +1 -1
@@ -264,7 +264,7 @@ 250 i386 fadvise64 sys_ia32_fadvise64 # 251 is available for reuse (was briefly sys_set_zone_reclaim) 252 i386 exit_group sys_exit_group -253 i386 lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie +253 i386 lookup_dcookie 254 i386 epoll_create sys_epoll_create 255 i386 epoll_ctl sys_epoll_ctl 256 i386 epoll_wait sys_epoll_wait
arch/x86/entry/syscalls/syscall_64.tbl +1 -1
@@ -220,7 +220,7 @@ 209 64 io_submit sys_io_submit 210 common io_cancel sys_io_cancel 211 64 get_thread_area -212 common lookup_dcookie sys_lookup_dcookie +212 common lookup_dcookie 213 common epoll_create sys_epoll_create 214 64 epoll_ctl_old 215 64 epoll_wait_old
arch/xtensa/kernel/syscalls/syscall.tbl +1 -1
@@ -273,7 +273,7 @@ 252 common timer_getoverrun sys_timer_getoverrun # System 253 common reserved253 sys_ni_syscall -254 common lookup_dcookie sys_lookup_dcookie +254 common lookup_dcookie sys_ni_syscall 255 common available255 sys_ni_syscall 256 common add_key sys_add_key 257 common request_key sys_request_key
include/linux/compat.h +0 -1
@@ -581,7 +581,6 @@ asmlinkage long compat_sys_io_pgetevents_time64(compat_aio_context_t ctx_id,struct io_event __user *events, struct __kernel_timespec __user *timeout, const struct __compat_aio_sigset __user *usig); -asmlinkage long compat_sys_lookup_dcookie (u32 ,u32 ,char __user *,compat_size_t ); asmlinkage long compat_sys_epoll_pwait(int epfd, struct epoll_event __user *events, int maxevents, int timeout,
include/linux/syscalls.h +0 -1
@@ -371,7 +371,6 @@ asmlinkage long sys_lremovexattr(const char __user *path, const char __user *name);asmlinkage long sys_fremovexattr (int fd,const char __user *name);asmlinkage long sys_getcwd (char __user *buf,unsigned long size); -asmlinkage long sys_lookup_dcookie (u64 cookie64,char __user *buf,size_t len);asmlinkage long sys_eventfd2 (unsigned int count,int flags);asmlinkage long sys_epoll_create1 (int flags); asmlinkage long sys_epoll_ctl(int epfd, int op, int fd,
include/uapi/asm-generic/unistd.h +1 -1
@@ -71,7 +71,7 @@ __SYSCALL(__NR_fremovexattr, sys_fremovexattr)#define __NR_getcwd 17 __SYSCALL(__NR_getcwd, sys_getcwd)#define __NR_lookup_dcookie 18 -__SC_COMP(__NR_lookup_dcookie, sys_lookup_dcookie, compat_sys_lookup_dcookie) +__SYSCALL(__NR_lookup_dcookie, sys_ni_syscall)#define __NR_eventfd2 19 __SYSCALL(__NR_eventfd2, sys_eventfd2)#define __NR_epoll_create1 20
kernel/sys_ni.c +0 -2
@@ -51,8 +51,6 @@ COND_SYSCALL_COMPAT(io_pgetevents);COND_SYSCALL (io_uring_setup);COND_SYSCALL (io_uring_enter);COND_SYSCALL (io_uring_register); -COND_SYSCALL (lookup_dcookie); -COND_SYSCALL_COMPAT (lookup_dcookie);COND_SYSCALL (eventfd2);COND_SYSCALL (epoll_create1);COND_SYSCALL (epoll_ctl);
tools/include/uapi/asm-generic/unistd.h +1 -1
@@ -71,7 +71,7 @@ __SYSCALL(__NR_fremovexattr, sys_fremovexattr)#define __NR_getcwd 17 __SYSCALL(__NR_getcwd, sys_getcwd)#define __NR_lookup_dcookie 18 -__SC_COMP(__NR_lookup_dcookie, sys_lookup_dcookie, compat_sys_lookup_dcookie) +__SYSCALL(__NR_lookup_dcookie, sys_ni_syscall)#define __NR_eventfd2 19 __SYSCALL(__NR_eventfd2, sys_eventfd2)#define __NR_epoll_create1 20
tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl +1 -1
@@ -214,7 +214,7 @@ 203 n64 io_submit sys_io_submit 204 n64 io_cancel sys_io_cancel 205 n64 exit_group sys_exit_group -206 n64 lookup_dcookie sys_lookup_dcookie +206 n64 lookup_dcookie sys_ni_syscall 207 n64 epoll_create sys_epoll_create 208 n64 epoll_ctl sys_epoll_ctl 209 n64 epoll_wait sys_epoll_wait
tools/perf/arch/powerpc/entry/syscalls/syscall.tbl +1 -1
@@ -294,7 +294,7 @@ 233 32 fadvise64 sys_ppc32_fadvise64 compat_sys_ppc32_fadvise64 233 64 fadvise64 sys_fadvise64 234 nospu exit_group sys_exit_group -235 nospu lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie +235 nospu lookup_dcookie sys_ni_syscall 236 common epoll_create sys_epoll_create 237 common epoll_ctl sys_epoll_ctl 238 common epoll_wait sys_epoll_wait
tools/perf/arch/s390/entry/syscalls/syscall.tbl +1 -1
@@ -100,7 +100,7 @@ 106 common stat sys_newstat compat_sys_newstat 107 common lstat sys_newlstat compat_sys_newlstat 108 common fstat sys_newfstat compat_sys_newfstat -110 common lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie +110 common lookup_dcookie - - 111 common vhangup sys_vhangup sys_vhangup 112 common idle - - 114 common wait4 sys_wait4 compat_sys_wait4
tools/perf/arch/x86/entry/syscalls/syscall_64.tbl +1 -1
@@ -220,7 +220,7 @@ 209 64 io_submit sys_io_submit 210 common io_cancel sys_io_cancel 211 64 get_thread_area -212 common lookup_dcookie sys_lookup_dcookie +212 common lookup_dcookie 213 common epoll_create sys_epoll_create 214 64 epoll_ctl_old 215 64 epoll_wait_old
Signature · 1 line
2.34.1
Quoted 8 lines · On Mon, Jul 10, 2023 at 8:52 PM Sohil Mehta <[email protected]> wrote:
commit '
be65de6b03aa("fs: Remove dcookies support")' removed the syscall definition forlookup_dcookie. However, syscall tables still point to the oldsys_lookup_dcookie()definition. Update syscall tables of all architectures to directly point tosys_ni_syscall()instead.Signed-off-by Sohil Mehta <[email protected]>Reviewed-by Randy Dunlap <[email protected]>
Quoted 6 lines
---
v2:
- Rebased to v6.5-rc1. No other dependencies.
- Added acquired tags.arch/m68k/kernel/syscalls/syscall.tbl | 2 +-
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
arch/arm/tools/syscall.tbl line 266
Quoted 10 lines · Sohil Mehta
arch/arm/tools/syscall.tbl +1
-1@@ -263,7 +263,7 @@ 246 common io_submit sys_io_submit 247 common io_cancel sys_io_cancel 248 common exit_group sys_exit_group -249 common lookup_dcookie sys_lookup_dcookie +249 common lookup_dcookie sys_ni_syscall
Thanks!
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
Hi Arnd,
Quoted 8 lines · Sohil Mehta
commit '
be65de6b03aa("fs: Remove dcookies support")' removed the syscall definition forlookup_dcookie. However, syscall tables still point to the oldsys_lookup_dcookie()definition. Update syscall tables of all architectures to directly point tosys_ni_syscall()instead.Signed-off-by Sohil Mehta <[email protected]>Reviewed-by Randy Dunlap <[email protected]>
The patch has received a couple of additional Acks.
Does this seem like a valuable cleanup? If so, should it go through the asm-generic tree?
Sohil
Arnd, is this a good candidate for 6.7? Though old, the patch applies cleanly on 6.6-rc4. I can re-send this one if you would prefer that.
Quoted 6 lines · Sohil Mehta
Quoted 5 lines · Sohil Mehta
commit '
be65de6b03aa("fs: Remove dcookies support")' removed the syscall definition forlookup_dcookie. However, syscall tables still point to the oldsys_lookup_dcookie()definition. Update syscall tables of all architectures to directly point tosys_ni_syscall()instead.
Quoted 6 lines
Quoted 3 lines
Signed-off-by Sohil Mehta <[email protected]>Reviewed-by Randy Dunlap <[email protected]>The patch has received a couple of additional Acks.
Namely,
Quoted 3 lines
Does this seem like a valuable cleanup? If so, should it go through the asm-generic tree?
The main motivation here is to make readers aware upfront (via the syscall table itself) that no implementation exists for lookup_dcookie instead of them searching for one and realizing the same. The syscall tables do something similar for _sysctl().
Please let me know if this change seems unnecessary. I can drop the annoying pings in that case.
Thanks,
Sohil
Arnd Bergmann
maintainerQuoted 3 lines · Sohil Mehta
Arnd, is this a good candidate for 6.7? Though old, the patch applies cleanly on 6.6-rc4. I can re-send this one if you would prefer that.
Thanks a lot for the reminder, I've added it to my asm-generic branch for v6.7 now, it should be in linux-next tomorrow.
Arnd
Quoted 3 lines · Arnd Bergmann
Thanks a lot for the reminder, I've added it to my asm-generic branch for v6.7 now, it should be in linux-next tomorrow.
No problem at all. Thanks for picking up the patch!
Sohil