[tip:x86/asm] syscalls/core, syscalls/x86: Rename struct pt_regs-based sys_*() to __x64_sys_*()
Commit-ID: d5a00528b58cdb2c71206e18bd021e34c4eab878 Gitweb: https://git.kernel.org/tip/d5a00528b58cdb2c71206e18bd021e34c4eab878 Author: Dominik BrodowskiAuthorDate: Mon, 9 Apr 2018 12:51:44 +0200 Committer: Ingo Molnar CommitDate: Mon, 9 Apr 2018 16:47:28 +0200 syscalls/core, syscalls/x86: Rename struct pt_regs-based sys_*() to __x64_sys_*() This rename allows us to have a coherent syscall stub naming convention on 64-bit x86 (0x prefix removed): 810f0af0 tkernel_waitid# common (32/64) kernel helper __do_sys_waitid# inlined helper doing actual work 810f0be0 t __se_sys_waitid# C func calling inlined helper __do_compat_sys_waitid# inlined helper doing actual work 810f0d80 t __se_compat_sys_waitid# compat C func calling inlined helper 810f2080 T __x64_sys_waitid# x64 64-bit-ptregs -> C stub 810f20b0 T__ia32_sys_waitid# ia32 32-bit-ptregs -> C stub[*] 810f2470 T __ia32_compat_sys_waitid# ia32 32-bit-ptregs -> compat C stub 810f2490 T __x32_compat_sys_waitid# x32 64-bit-ptregs -> compat C stub [*] This stub is unused, as the syscall table links __ia32_compat_sys_waitid instead of __ia32_sys_waitid as we need a compat variant here. Suggested-by: Ingo Molnar Signed-off-by: Dominik Brodowski Cc: Al Viro Cc: Andrew Morton Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20180409105145.5364-4-li...@dominikbrodowski.net Signed-off-by: Ingo Molnar --- arch/x86/entry/syscalls/syscall_32.tbl | 46 +-- arch/x86/entry/syscalls/syscall_64.tbl | 638 + arch/x86/entry/syscalls/syscalltbl.sh | 14 +- arch/x86/entry/vsyscall/vsyscall_64.c | 6 +- arch/x86/include/asm/syscall_wrapper.h | 63 +++- 5 files changed, 405 insertions(+), 362 deletions(-) diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl index 0e6cb1335db2..d6b27dab1b30 100644 --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl @@ -11,9 +11,9 @@ # # The abi is always "i386" for this file. # -0 i386restart_syscall sys_restart_syscall +0 i386restart_syscall sys_restart_syscall __ia32_sys_restart_syscall 1 i386exitsys_exit __ia32_sys_exit -2 i386forksys_fork +2 i386forksys_fork __ia32_sys_fork 3 i386readsys_read __ia32_sys_read 4 i386write sys_write __ia32_sys_write 5 i386opensys_open __ia32_compat_sys_open @@ -31,23 +31,23 @@ 17 i386break 18 i386oldstat sys_stat __ia32_sys_stat 19 i386lseek sys_lseek __ia32_compat_sys_lseek -20 i386getpid sys_getpid +20 i386getpid sys_getpid __ia32_sys_getpid 21 i386mount sys_mount __ia32_compat_sys_mount 22 i386umount sys_oldumount __ia32_sys_oldumount 23 i386setuid sys_setuid16 __ia32_sys_setuid16 -24 i386getuid sys_getuid16 +24 i386getuid sys_getuid16 __ia32_sys_getuid16 25 i386stime sys_stime __ia32_compat_sys_stime 26 i386ptrace sys_ptrace __ia32_compat_sys_ptrace 27 i386alarm sys_alarm __ia32_sys_alarm 28 i386oldfstatsys_fstat __ia32_sys_fstat -29 i386pause sys_pause +29 i386pause sys_pause __ia32_sys_pause 30 i386utime sys_utime __ia32_compat_sys_utime 31 i386stty 32 i386gtty 33 i386access sys_access __ia32_sys_access 34 i386nicesys_nice __ia32_sys_nice 35 i386ftime -36 i386syncsys_sync +36 i386
[tip:x86/asm] syscalls/core, syscalls/x86: Rename struct pt_regs-based sys_*() to __x64_sys_*()
Commit-ID: d5a00528b58cdb2c71206e18bd021e34c4eab878 Gitweb: https://git.kernel.org/tip/d5a00528b58cdb2c71206e18bd021e34c4eab878 Author: Dominik Brodowski AuthorDate: Mon, 9 Apr 2018 12:51:44 +0200 Committer: Ingo Molnar CommitDate: Mon, 9 Apr 2018 16:47:28 +0200 syscalls/core, syscalls/x86: Rename struct pt_regs-based sys_*() to __x64_sys_*() This rename allows us to have a coherent syscall stub naming convention on 64-bit x86 (0x prefix removed): 810f0af0 tkernel_waitid# common (32/64) kernel helper __do_sys_waitid# inlined helper doing actual work 810f0be0 t __se_sys_waitid# C func calling inlined helper __do_compat_sys_waitid# inlined helper doing actual work 810f0d80 t __se_compat_sys_waitid# compat C func calling inlined helper 810f2080 T __x64_sys_waitid# x64 64-bit-ptregs -> C stub 810f20b0 T__ia32_sys_waitid# ia32 32-bit-ptregs -> C stub[*] 810f2470 T __ia32_compat_sys_waitid# ia32 32-bit-ptregs -> compat C stub 810f2490 T __x32_compat_sys_waitid# x32 64-bit-ptregs -> compat C stub [*] This stub is unused, as the syscall table links __ia32_compat_sys_waitid instead of __ia32_sys_waitid as we need a compat variant here. Suggested-by: Ingo Molnar Signed-off-by: Dominik Brodowski Cc: Al Viro Cc: Andrew Morton Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20180409105145.5364-4-li...@dominikbrodowski.net Signed-off-by: Ingo Molnar --- arch/x86/entry/syscalls/syscall_32.tbl | 46 +-- arch/x86/entry/syscalls/syscall_64.tbl | 638 + arch/x86/entry/syscalls/syscalltbl.sh | 14 +- arch/x86/entry/vsyscall/vsyscall_64.c | 6 +- arch/x86/include/asm/syscall_wrapper.h | 63 +++- 5 files changed, 405 insertions(+), 362 deletions(-) diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl index 0e6cb1335db2..d6b27dab1b30 100644 --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl @@ -11,9 +11,9 @@ # # The abi is always "i386" for this file. # -0 i386restart_syscall sys_restart_syscall +0 i386restart_syscall sys_restart_syscall __ia32_sys_restart_syscall 1 i386exitsys_exit __ia32_sys_exit -2 i386forksys_fork +2 i386forksys_fork __ia32_sys_fork 3 i386readsys_read __ia32_sys_read 4 i386write sys_write __ia32_sys_write 5 i386opensys_open __ia32_compat_sys_open @@ -31,23 +31,23 @@ 17 i386break 18 i386oldstat sys_stat __ia32_sys_stat 19 i386lseek sys_lseek __ia32_compat_sys_lseek -20 i386getpid sys_getpid +20 i386getpid sys_getpid __ia32_sys_getpid 21 i386mount sys_mount __ia32_compat_sys_mount 22 i386umount sys_oldumount __ia32_sys_oldumount 23 i386setuid sys_setuid16 __ia32_sys_setuid16 -24 i386getuid sys_getuid16 +24 i386getuid sys_getuid16 __ia32_sys_getuid16 25 i386stime sys_stime __ia32_compat_sys_stime 26 i386ptrace sys_ptrace __ia32_compat_sys_ptrace 27 i386alarm sys_alarm __ia32_sys_alarm 28 i386oldfstatsys_fstat __ia32_sys_fstat -29 i386pause sys_pause +29 i386pause sys_pause __ia32_sys_pause 30 i386utime sys_utime __ia32_compat_sys_utime 31 i386stty 32 i386gtty 33 i386access sys_access __ia32_sys_access 34 i386nicesys_nice __ia32_sys_nice 35 i386ftime -36 i386syncsys_sync +36 i386syncsys_sync __ia32_sys_sync 37 i386killsys_kill __ia32_sys_kill 38 i386rename sys_rename __ia32_sys_rename 39 i386mkdir sys_mkdir