x86: syscall wrapper cleanups
Subsystems (5)
v4 cover x86: syscall wrapper cleanups
This patch series cleans up the x86 syscall wrapper code and converts the 32-bit native kernel over to pt_regs based syscalls. This makes the 32-bit syscall interface consistent with 64-bit, and a bit more effecient by not blindly pushing all 6 potential arguments onto the stack.
Changes since v3:
- Addressed feedback from v3
- Split the X32 syscall table into its own file
- Move the ABI prefix from the syscall table to the wrapper macros
- Additional cleanups
- Changed series title due to broader scope
Changes since v2:
- Moved adding the [compat_]sys_ prefix to the ABI-level macros
Changes since v1:
- Split patch 1 into multiple patches
- Updated comments and patch notes to clarify changes
Brian Gerst (18):
x86, syscalls: Refactor SYSCALL_DEFINEx macros
x86, syscalls: Refactor SYSCALL_DEFINE0 macros
x86, syscalls: Refactor COND_SYSCALL macros
x86, syscalls: Refactor SYS_NI macros
x86-64: Use syscall wrappers for x32_rt_sigreturn
x86-64: Move sys_ni_syscall stub to common.c
x86-64: Split X32 syscall table into its own file
x86: Move max syscall number calculation to syscallhdr.sh
x86-64: Remove ptregs qualifier from syscall table
x86: Remove syscall qualifier support
x86-64: Add __SYSCALL_COMMON()
x86: Remove ABI prefixes from functions in syscall tables
x86: Clean up syscall_32.tbl
x86, syscalls: Rename 32-bit specific syscalls
x86: Use IA32-specific wrappers for syscalls taking 64-bit arguments
x86-32: Enable pt_regs based syscalls
x86: Drop asmlinkage from syscalls
x86: Remove unneeded includes
arch/x86/Kconfig | 2 +-
arch/x86/entry/Makefile | 1 +
arch/x86/entry/common.c | 18 +-
arch/x86/entry/syscall_32.c | 19 +-
arch/x86/entry/syscall_64.c | 39 +-
arch/x86/entry/syscall_x32.c | 29 +
arch/x86/entry/syscalls/syscall_32.tbl | 818 ++++++++++----------
arch/x86/entry/syscalls/syscall_64.tbl | 740 +++++++++---------
arch/x86/entry/syscalls/syscallhdr.sh | 7 +
arch/x86/entry/syscalls/syscalltbl.sh | 44 +-
arch/x86/entry/vdso/vdso32/vclock_gettime.c | 1 +
arch/x86/ia32/Makefile | 2 +-
arch/x86/include/asm/sighandling.h | 5 -
arch/x86/include/asm/syscall.h | 11 +-
arch/x86/include/asm/syscall_wrapper.h | 287 +++----
arch/x86/include/asm/syscalls.h | 34 -
arch/x86/include/asm/unistd.h | 7 +
arch/x86/kernel/Makefile | 2 +
arch/x86/kernel/asm-offsets_32.c | 9 -
arch/x86/kernel/asm-offsets_64.c | 36 -
arch/x86/kernel/ldt.c | 1 -
arch/x86/kernel/process.c | 1 -
arch/x86/kernel/process_32.c | 1 -
arch/x86/kernel/process_64.c | 1 -
arch/x86/kernel/signal.c | 4 +-
arch/x86/{ia32 => kernel}/sys_ia32.c | 143 ++--
arch/x86/kernel/sys_x86_64.c | 1 -
arch/x86/um/Makefile | 1 +
arch/x86/um/sys_call_table_32.c | 6 +-
arch/x86/um/sys_call_table_64.c | 9 +-
arch/x86/um/user-offsets.c | 15 -
31 files changed, 1086 insertions(+), 1208 deletions(-)
create mode 100644 arch/x86/entry/syscall_x32.c
rename arch/x86/{ia32 => kernel}/sys_ia32.c (78%)Signature · 1 line
2.24.1
PATCH v4 1/18 x86, syscalls: Refactor SYSCALL_DEFINEx macros
Pull the common code out from the SYSCALL_DEFINEx macros into a new __SYS_STUBx macro. Also conditionalize the X64 version in preparation for enabling syscall wrappers on 32-bit native kernels.
--- arch/x86/include/asm/syscall_wrapper.h | 49 +++++++++++++------------- 1 file changed, 24 insertions(+), 25 deletions(-)
arch/x86/include/asm/syscall_wrapper.h +24 -25
@@ -21,6 +21,22 @@ struct pt_regs; ,,(unsigned int)regs->dx,,(unsigned int)regs->si \ ,,(unsigned int)regs->di,,(unsigned int)regs->bp) +#define __SYS_STUBx (abi, name, ...) \ + asmlinkage long __##abi##_##name(const struct pt_regs *regs); \ + ALLOW_ERROR_INJECTION(__##abi##_##name, ERRNO); \ + asmlinkage long __##abi##_##name(const struct pt_regs *regs) \ + { \ + return __se_##name(__VA_ARGS__); \ + } + +#ifdef CONFIG_X86_64 +#define __X64_SYS_STUBx (x, name, ...) \ + __SYS_STUBx(x64, sys##name, \ + SC_X86_64_REGS_TO_ARGS(x, __VA_ARGS__)) +#else /* CONFIG_X86_64 */ +#define __X64_SYS_STUBx (x, name, ...) +#endif /* CONFIG_X86_64 */ +#ifdef CONFIG_IA32_EMULATION /* * For IA32 emulation, we need to handle "compat" syscalls *and* create
@@ -39,20 +55,12 @@ struct pt_regs; }#define __IA32_COMPAT_SYS_STUBx (x, name, ...) \ - asmlinkage long __ia32_compat_sys##name(const struct pt_regs *regs);\ - ALLOW_ERROR_INJECTION(__ia32_compat_sys##name, ERRNO); \ - asmlinkage long __ia32_compat_sys##name(const struct pt_regs *regs)\ - { \ - return __se_compat_sys##name(SC_IA32_REGS_TO_ARGS(x,__VA_ARGS__));\ - } + __SYS_STUBx(ia32, compat_sys##name, \ + SC_IA32_REGS_TO_ARGS(x, __VA_ARGS__))#define __IA32_SYS_STUBx (x, name, ...) \ - asmlinkage long __ia32_sys##name(const struct pt_regs *regs); \ - ALLOW_ERROR_INJECTION(__ia32_sys##name, ERRNO); \ - asmlinkage long __ia32_sys##name(const struct pt_regs *regs) \ - { \ - return __se_sys##name(SC_IA32_REGS_TO_ARGS(x,__VA_ARGS__));\ - } + __SYS_STUBx(ia32, sys##name, \ + SC_IA32_REGS_TO_ARGS(x, __VA_ARGS__))/* * To keep the naming coherent, re-define SYSCALL_DEFINE0 to create an alias
@@ -82,7 +90,7 @@ struct pt_regs;#else /* CONFIG_IA32_EMULATION */ #define __IA32_COMPAT_SYS_STUBx (x, name, ...) -#define __IA32_SYS_STUBx (x, fullname, name, ...) +#define __IA32_SYS_STUBx (x, name, ...)#endif /* CONFIG_IA32_EMULATION */
@@ -101,12 +109,8 @@ struct pt_regs; }#define __X32_COMPAT_SYS_STUBx (x, name, ...) \ - asmlinkage long __x32_compat_sys##name(const struct pt_regs *regs);\ - ALLOW_ERROR_INJECTION(__x32_compat_sys##name, ERRNO); \ - asmlinkage long __x32_compat_sys##name(const struct pt_regs *regs)\ - { \ - return __se_compat_sys##name(SC_X86_64_REGS_TO_ARGS(x,__VA_ARGS__));\ - } + __SYS_STUBx(x32, compat_sys##name, \ + SC_X86_64_REGS_TO_ARGS(x, __VA_ARGS__))#else /* CONFIG_X86_X32 */ #define __X32_COMPAT_SYS_STUB0 (x, name)
@@ -192,14 +196,9 @@ struct pt_regs;* to the i386 calling convention (bx, cx, dx, si, di, bp). */ #define __SYSCALL_DEFINEx (x, name, ...) \ - asmlinkage long __x64_sys##name(const struct pt_regs *regs); \ - ALLOW_ERROR_INJECTION(__x64_sys##name, ERRNO); \ static long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \ static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\ - asmlinkage long __x64_sys##name(const struct pt_regs *regs) \ - { \ - return __se_sys##name(SC_X86_64_REGS_TO_ARGS(x,__VA_ARGS__));\ - } \ + __X64_SYS_STUBx(x, name, __VA_ARGS__) \ __IA32_SYS_STUBx(x, name, __VA_ARGS__) \ static long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)) \ { \
Signature · 1 line
2.24.1
[tip: x86/entry] x86/entry: Refactor SYSCALL_DEFINEx macros
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 4399e0cf494f739af7e0648f52fe43311ecd1bea Gitweb: https://git.kernel.org/tip/4399e0cf494f739af7e0648f52fe43311ecd1bea Author: Brian Gerst <[email protected]> AuthorDate: Fri, 13 Mar 2020 15:51:27 -04:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:18 +01:00
x86/entry: Refactor SYSCALL_DEFINEx macros
Pull the common code out from the SYSCALL_DEFINEx macros into a new __SYS_STUBx macro. Also conditionalize the X64 version in preparation for enabling syscall wrappers on 32-bit native kernels.
--- arch/x86/include/asm/syscall_wrapper.h | 49 ++++++++++++------------- 1 file changed, 24 insertions(+), 25 deletions(-)
arch/x86/include/asm/syscall_wrapper.h +24 -25
@@ -21,6 +21,22 @@ struct pt_regs; ,,(unsigned int)regs->dx,,(unsigned int)regs->si \ ,,(unsigned int)regs->di,,(unsigned int)regs->bp) +#define __SYS_STUBx (abi, name, ...) \ + asmlinkage long __##abi##_##name(const struct pt_regs *regs); \ + ALLOW_ERROR_INJECTION(__##abi##_##name, ERRNO); \ + asmlinkage long __##abi##_##name(const struct pt_regs *regs) \ + { \ + return __se_##name(__VA_ARGS__); \ + } + +#ifdef CONFIG_X86_64 +#define __X64_SYS_STUBx (x, name, ...) \ + __SYS_STUBx(x64, sys##name, \ + SC_X86_64_REGS_TO_ARGS(x, __VA_ARGS__)) +#else /* CONFIG_X86_64 */ +#define __X64_SYS_STUBx (x, name, ...) +#endif /* CONFIG_X86_64 */ +#ifdef CONFIG_IA32_EMULATION /* * For IA32 emulation, we need to handle "compat" syscalls *and* create
@@ -39,20 +55,12 @@ struct pt_regs; }#define __IA32_COMPAT_SYS_STUBx (x, name, ...) \ - asmlinkage long __ia32_compat_sys##name(const struct pt_regs *regs);\ - ALLOW_ERROR_INJECTION(__ia32_compat_sys##name, ERRNO); \ - asmlinkage long __ia32_compat_sys##name(const struct pt_regs *regs)\ - { \ - return __se_compat_sys##name(SC_IA32_REGS_TO_ARGS(x,__VA_ARGS__));\ - } + __SYS_STUBx(ia32, compat_sys##name, \ + SC_IA32_REGS_TO_ARGS(x, __VA_ARGS__))#define __IA32_SYS_STUBx (x, name, ...) \ - asmlinkage long __ia32_sys##name(const struct pt_regs *regs); \ - ALLOW_ERROR_INJECTION(__ia32_sys##name, ERRNO); \ - asmlinkage long __ia32_sys##name(const struct pt_regs *regs) \ - { \ - return __se_sys##name(SC_IA32_REGS_TO_ARGS(x,__VA_ARGS__));\ - } + __SYS_STUBx(ia32, sys##name, \ + SC_IA32_REGS_TO_ARGS(x, __VA_ARGS__))/* * To keep the naming coherent, re-define SYSCALL_DEFINE0 to create an alias
@@ -82,7 +90,7 @@ struct pt_regs;#else /* CONFIG_IA32_EMULATION */ #define __IA32_COMPAT_SYS_STUBx (x, name, ...) -#define __IA32_SYS_STUBx (x, fullname, name, ...) +#define __IA32_SYS_STUBx (x, name, ...)#endif /* CONFIG_IA32_EMULATION */
@@ -101,12 +109,8 @@ struct pt_regs; }#define __X32_COMPAT_SYS_STUBx (x, name, ...) \ - asmlinkage long __x32_compat_sys##name(const struct pt_regs *regs);\ - ALLOW_ERROR_INJECTION(__x32_compat_sys##name, ERRNO); \ - asmlinkage long __x32_compat_sys##name(const struct pt_regs *regs)\ - { \ - return __se_compat_sys##name(SC_X86_64_REGS_TO_ARGS(x,__VA_ARGS__));\ - } + __SYS_STUBx(x32, compat_sys##name, \ + SC_X86_64_REGS_TO_ARGS(x, __VA_ARGS__))#else /* CONFIG_X86_X32 */ #define __X32_COMPAT_SYS_STUB0 (x, name)
@@ -192,14 +196,9 @@ struct pt_regs;* to the i386 calling convention (bx, cx, dx, si, di, bp). */ #define __SYSCALL_DEFINEx (x, name, ...) \ - asmlinkage long __x64_sys##name(const struct pt_regs *regs); \ - ALLOW_ERROR_INJECTION(__x64_sys##name, ERRNO); \ static long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \ static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\ - asmlinkage long __x64_sys##name(const struct pt_regs *regs) \ - { \ - return __se_sys##name(SC_X86_64_REGS_TO_ARGS(x,__VA_ARGS__));\ - } \ + __X64_SYS_STUBx(x, name, __VA_ARGS__) \ __IA32_SYS_STUBx(x, name, __VA_ARGS__) \ static long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)) \ { \
PATCH v4 2/18 x86, syscalls: Refactor SYSCALL_DEFINE0 macros
In reply to Brian GerstPull the common code out from the SYSCALL_DEFINE0 macros into a new __SYS_STUB0 macro. Also conditionalize the X64 version in preparation for enabling syscall wrappers on 32-bit native kernels.
--- arch/x86/include/asm/syscall_wrapper.h | 73 +++++++++++--------------- 1 file changed, 32 insertions(+), 41 deletions(-)
arch/x86/include/asm/syscall_wrapper.h +32 -41
@@ -21,6 +21,12 @@ struct pt_regs; ,,(unsigned int)regs->dx,,(unsigned int)regs->si \ ,,(unsigned int)regs->di,,(unsigned int)regs->bp) +#define __SYS_STUB0 (abi, name) \ + asmlinkage long __##abi##_##name(const struct pt_regs *regs); \ + ALLOW_ERROR_INJECTION(__##abi##_##name, ERRNO); \ + asmlinkage long __##abi##_##name(const struct pt_regs *regs) \ + __alias(__do_##name); +#define __SYS_STUBx (abi, name, ...) \ asmlinkage long __##abi##_##name(const struct pt_regs *regs); \ ALLOW_ERROR_INJECTION(__##abi##_##name, ERRNO); \
@@ -30,10 +36,14 @@ struct pt_regs; }#ifdef CONFIG_X86_64 +#define __X64_SYS_STUB0 (name) \ + __SYS_STUB0(x64, sys_##name) +#define __X64_SYS_STUBx (x, name, ...) \ __SYS_STUBx(x64, sys##name, \ SC_X86_64_REGS_TO_ARGS(x, __VA_ARGS__))#else /* CONFIG_X86_64 */ +#define __X64_SYS_STUB0 (name)#define __X64_SYS_STUBx (x, name, ...)#endif /* CONFIG_X86_64 */
@@ -46,34 +56,20 @@ struct pt_regs;* kernel/sys_ni.c and SYS_NI in kernel/time/posix-stubs.c to cover this * case as well. */ -#define __IA32_COMPAT_SYS_STUB0 (x, name) \ - asmlinkage long __ia32_compat_sys_##name(const struct pt_regs *regs);\ - ALLOW_ERROR_INJECTION(__ia32_compat_sys_##name, ERRNO); \ - asmlinkage long __ia32_compat_sys_##name(const struct pt_regs *regs)\ - { \ - return __se_compat_sys_##name(); \ - } +#define __IA32_COMPAT_SYS_STUB0 (name) \ + __SYS_STUB0(ia32, compat_sys_##name)#define __IA32_COMPAT_SYS_STUBx (x, name, ...) \ __SYS_STUBx(ia32, compat_sys##name, \ SC_IA32_REGS_TO_ARGS(x, __VA_ARGS__)) +#define __IA32_SYS_STUB0 (name) \ + __SYS_STUB0(ia32, sys_##name) +#define __IA32_SYS_STUBx (x, name, ...) \ __SYS_STUBx(ia32, sys##name, \ SC_IA32_REGS_TO_ARGS(x, __VA_ARGS__)) -/* -* To keep the naming coherent, re-define SYSCALL_DEFINE0 to create an alias -* named __ia32_sys_*() -*/ - -#define SYSCALL_DEFINE0 (sname) \ - SYSCALL_METADATA(_##sname, 0); \ - asmlinkage long __x64_sys_##sname(const struct pt_regs *__unused);\ - ALLOW_ERROR_INJECTION(__x64_sys_##sname, ERRNO); \ - SYSCALL_ALIAS(__ia32_sys_##sname, __x64_sys_##sname); \ - asmlinkage long __x64_sys_##sname(const struct pt_regs *__unused) -#define COND_SYSCALL (name) \ asmlinkage __weak long __x64_sys_##name(const struct pt_regs *__unused) \ { \
@@ -89,7 +85,9 @@ struct pt_regs; SYSCALL_ALIAS(__ia32_sys_##name, sys_ni_posix_timers)#else /* CONFIG_IA32_EMULATION */ +#define __IA32_COMPAT_SYS_STUB0 (name)#define __IA32_COMPAT_SYS_STUBx (x, name, ...) +#define __IA32_SYS_STUB0 (name)#define __IA32_SYS_STUBx (x, name, ...)#endif /* CONFIG_IA32_EMULATION */
@@ -100,20 +98,15 @@ struct pt_regs;* of the x86-64-style parameter ordering of x32 syscalls. The syscalls common * with x86_64 obviously do not need such care. */ -#define __X32_COMPAT_SYS_STUB0 (x, name, ...) \ - asmlinkage long __x32_compat_sys_##name(const struct pt_regs *regs);\ - ALLOW_ERROR_INJECTION(__x32_compat_sys_##name, ERRNO); \ - asmlinkage long __x32_compat_sys_##name(const struct pt_regs *regs)\ - { \ - return __se_compat_sys_##name();\ - } +#define __X32_COMPAT_SYS_STUB0 (name) \ + __SYS_STUB0(x32, compat_sys_##name)#define __X32_COMPAT_SYS_STUBx (x, name, ...) \ __SYS_STUBx(x32, compat_sys##name, \ SC_X86_64_REGS_TO_ARGS(x, __VA_ARGS__))#else /* CONFIG_X86_X32 */ -#define __X32_COMPAT_SYS_STUB0 (x, name) +#define __X32_COMPAT_SYS_STUB0 (name)#define __X32_COMPAT_SYS_STUBx (x, name, ...)#endif /* CONFIG_X86_X32 */
@@ -125,15 +118,12 @@ struct pt_regs;* of them. */ #define COMPAT_SYSCALL_DEFINE0 (name) \ - static long __se_compat_sys_##name(void); \ - static inline long __do_compat_sys_##name(void); \ - __IA32_COMPAT_SYS_STUB0(x, name) \ - __X32_COMPAT_SYS_STUB0(x, name) \ - static long __se_compat_sys_##name(void) \ - { \ - return __do_compat_sys_##name(); \ - } \ - static inline long __do_compat_sys_##name(void) + static asmlinkage long \ + __do_compat_sys_##name(const struct pt_regs *__unused); \ + __IA32_COMPAT_SYS_STUB0(name) \ + __X32_COMPAT_SYS_STUB0(name) \ + static asmlinkage long \ + __do_compat_sys_##name(const struct pt_regs *__unused)#define COMPAT_SYSCALL_DEFINEx (x, name, ...) \ static long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \
@@ -216,13 +206,14 @@ struct pt_regs;* SYSCALL_DEFINEx() -- which is essential for the COND_SYSCALL() and SYS_NI() * macros to work correctly. */ -#ifndef SYSCALL_DEFINE0 #define SYSCALL_DEFINE0 (sname) \ SYSCALL_METADATA(_##sname, 0); \ - asmlinkage long __x64_sys_##sname(const struct pt_regs *__unused);\ - ALLOW_ERROR_INJECTION(__x64_sys_##sname, ERRNO); \ - asmlinkage long __x64_sys_##sname(const struct pt_regs *__unused) -#endif + static asmlinkage long \ + __do_sys_##sname(const struct pt_regs *__unused); \ + __X64_SYS_STUB0(sname) \ + __IA32_SYS_STUB0(sname) \ + static asmlinkage long \ + __do_sys_##sname(const struct pt_regs *__unused)#ifndef COND_SYSCALL #define COND_SYSCALL (name) \
Signature · 1 line
2.24.1
[tip: x86/entry] x86/entry: Refactor SYSCALL_DEFINE0 macros
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: d2b5de495ee9838b3752806c135afd43b76b1e8f Gitweb: https://git.kernel.org/tip/d2b5de495ee9838b3752806c135afd43b76b1e8f Author: Brian Gerst <[email protected]> AuthorDate: Fri, 13 Mar 2020 15:51:28 -04:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:19 +01:00
x86/entry: Refactor SYSCALL_DEFINE0 macros
Pull the common code out from the SYSCALL_DEFINE0 macros into a new __SYS_STUB0 macro. Also conditionalize the X64 version in preparation for enabling syscall wrappers on 32-bit native kernels.
--- arch/x86/include/asm/syscall_wrapper.h | 73 ++++++++++--------------- 1 file changed, 32 insertions(+), 41 deletions(-)
arch/x86/include/asm/syscall_wrapper.h +32 -41
@@ -21,6 +21,12 @@ struct pt_regs; ,,(unsigned int)regs->dx,,(unsigned int)regs->si \ ,,(unsigned int)regs->di,,(unsigned int)regs->bp) +#define __SYS_STUB0 (abi, name) \ + asmlinkage long __##abi##_##name(const struct pt_regs *regs); \ + ALLOW_ERROR_INJECTION(__##abi##_##name, ERRNO); \ + asmlinkage long __##abi##_##name(const struct pt_regs *regs) \ + __alias(__do_##name); +#define __SYS_STUBx (abi, name, ...) \ asmlinkage long __##abi##_##name(const struct pt_regs *regs); \ ALLOW_ERROR_INJECTION(__##abi##_##name, ERRNO); \
@@ -30,10 +36,14 @@ struct pt_regs; }#ifdef CONFIG_X86_64 +#define __X64_SYS_STUB0 (name) \ + __SYS_STUB0(x64, sys_##name) +#define __X64_SYS_STUBx (x, name, ...) \ __SYS_STUBx(x64, sys##name, \ SC_X86_64_REGS_TO_ARGS(x, __VA_ARGS__))#else /* CONFIG_X86_64 */ +#define __X64_SYS_STUB0 (name)#define __X64_SYS_STUBx (x, name, ...)#endif /* CONFIG_X86_64 */
@@ -46,34 +56,20 @@ struct pt_regs;* kernel/sys_ni.c and SYS_NI in kernel/time/posix-stubs.c to cover this * case as well. */ -#define __IA32_COMPAT_SYS_STUB0 (x, name) \ - asmlinkage long __ia32_compat_sys_##name(const struct pt_regs *regs);\ - ALLOW_ERROR_INJECTION(__ia32_compat_sys_##name, ERRNO); \ - asmlinkage long __ia32_compat_sys_##name(const struct pt_regs *regs)\ - { \ - return __se_compat_sys_##name(); \ - } +#define __IA32_COMPAT_SYS_STUB0 (name) \ + __SYS_STUB0(ia32, compat_sys_##name)#define __IA32_COMPAT_SYS_STUBx (x, name, ...) \ __SYS_STUBx(ia32, compat_sys##name, \ SC_IA32_REGS_TO_ARGS(x, __VA_ARGS__)) +#define __IA32_SYS_STUB0 (name) \ + __SYS_STUB0(ia32, sys_##name) +#define __IA32_SYS_STUBx (x, name, ...) \ __SYS_STUBx(ia32, sys##name, \ SC_IA32_REGS_TO_ARGS(x, __VA_ARGS__)) -/* -* To keep the naming coherent, re-define SYSCALL_DEFINE0 to create an alias -* named __ia32_sys_*() -*/ - -#define SYSCALL_DEFINE0 (sname) \ - SYSCALL_METADATA(_##sname, 0); \ - asmlinkage long __x64_sys_##sname(const struct pt_regs *__unused);\ - ALLOW_ERROR_INJECTION(__x64_sys_##sname, ERRNO); \ - SYSCALL_ALIAS(__ia32_sys_##sname, __x64_sys_##sname); \ - asmlinkage long __x64_sys_##sname(const struct pt_regs *__unused) -#define COND_SYSCALL (name) \ asmlinkage __weak long __x64_sys_##name(const struct pt_regs *__unused) \ { \
@@ -89,7 +85,9 @@ struct pt_regs; SYSCALL_ALIAS(__ia32_sys_##name, sys_ni_posix_timers)#else /* CONFIG_IA32_EMULATION */ +#define __IA32_COMPAT_SYS_STUB0 (name)#define __IA32_COMPAT_SYS_STUBx (x, name, ...) +#define __IA32_SYS_STUB0 (name)#define __IA32_SYS_STUBx (x, name, ...)#endif /* CONFIG_IA32_EMULATION */
@@ -100,20 +98,15 @@ struct pt_regs;* of the x86-64-style parameter ordering of x32 syscalls. The syscalls common * with x86_64 obviously do not need such care. */ -#define __X32_COMPAT_SYS_STUB0 (x, name, ...) \ - asmlinkage long __x32_compat_sys_##name(const struct pt_regs *regs);\ - ALLOW_ERROR_INJECTION(__x32_compat_sys_##name, ERRNO); \ - asmlinkage long __x32_compat_sys_##name(const struct pt_regs *regs)\ - { \ - return __se_compat_sys_##name();\ - } +#define __X32_COMPAT_SYS_STUB0 (name) \ + __SYS_STUB0(x32, compat_sys_##name)#define __X32_COMPAT_SYS_STUBx (x, name, ...) \ __SYS_STUBx(x32, compat_sys##name, \ SC_X86_64_REGS_TO_ARGS(x, __VA_ARGS__))#else /* CONFIG_X86_X32 */ -#define __X32_COMPAT_SYS_STUB0 (x, name) +#define __X32_COMPAT_SYS_STUB0 (name)#define __X32_COMPAT_SYS_STUBx (x, name, ...)#endif /* CONFIG_X86_X32 */
@@ -125,15 +118,12 @@ struct pt_regs;* of them. */ #define COMPAT_SYSCALL_DEFINE0 (name) \ - static long __se_compat_sys_##name(void); \ - static inline long __do_compat_sys_##name(void); \ - __IA32_COMPAT_SYS_STUB0(x, name) \ - __X32_COMPAT_SYS_STUB0(x, name) \ - static long __se_compat_sys_##name(void) \ - { \ - return __do_compat_sys_##name(); \ - } \ - static inline long __do_compat_sys_##name(void) + static asmlinkage long \ + __do_compat_sys_##name(const struct pt_regs *__unused); \ + __IA32_COMPAT_SYS_STUB0(name) \ + __X32_COMPAT_SYS_STUB0(name) \ + static asmlinkage long \ + __do_compat_sys_##name(const struct pt_regs *__unused)#define COMPAT_SYSCALL_DEFINEx (x, name, ...) \ static long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \
@@ -216,13 +206,14 @@ struct pt_regs;* SYSCALL_DEFINEx() -- which is essential for the COND_SYSCALL() and SYS_NI() * macros to work correctly. */ -#ifndef SYSCALL_DEFINE0 #define SYSCALL_DEFINE0 (sname) \ SYSCALL_METADATA(_##sname, 0); \ - asmlinkage long __x64_sys_##sname(const struct pt_regs *__unused);\ - ALLOW_ERROR_INJECTION(__x64_sys_##sname, ERRNO); \ - asmlinkage long __x64_sys_##sname(const struct pt_regs *__unused) -#endif + static asmlinkage long \ + __do_sys_##sname(const struct pt_regs *__unused); \ + __X64_SYS_STUB0(sname) \ + __IA32_SYS_STUB0(sname) \ + static asmlinkage long \ + __do_sys_##sname(const struct pt_regs *__unused)#ifndef COND_SYSCALL #define COND_SYSCALL (name) \
PATCH v4 3/18 x86, syscalls: Refactor COND_SYSCALL macros
In reply to Brian GerstPull the common code out from the COND_SYSCALL macros into a new __COND_SYSCALL macro. Also conditionalize the X64 version in preparation for enabling syscall wrappers on 32-bit native kernels.
--- arch/x86/include/asm/syscall_wrapper.h | 44 +++++++++++++++----------- 1 file changed, 26 insertions(+), 18 deletions(-)
arch/x86/include/asm/syscall_wrapper.h +26 -18
@@ -35,6 +35,13 @@ struct pt_regs; return __se_##name(__VA_ARGS__); \ } +#define __COND_SYSCALL (abi, name) \ + asmlinkage __weak long \ + __##abi##_##name(const struct pt_regs *__unused) \ + { \ + return sys_ni_syscall(); \ + } +#ifdef CONFIG_X86_64 #define __X64_SYS_STUB0 (name) \ __SYS_STUB0(x64, sys_##name)
@@ -42,9 +49,13 @@ struct pt_regs;#define __X64_SYS_STUBx (x, name, ...) \ __SYS_STUBx(x64, sys##name, \ SC_X86_64_REGS_TO_ARGS(x, __VA_ARGS__)) + +#define __X64_COND_SYSCALL (name) \ + __COND_SYSCALL(x64, sys_##name)#else /* CONFIG_X86_64 */ #define __X64_SYS_STUB0 (name)#define __X64_SYS_STUBx (x, name, ...) +#define __X64_COND_SYSCALL (name)#endif /* CONFIG_X86_64 */ #ifdef CONFIG_IA32_EMULATION
@@ -63,6 +74,9 @@ struct pt_regs; __SYS_STUBx(ia32, compat_sys##name, \ SC_IA32_REGS_TO_ARGS(x, __VA_ARGS__)) +#define __IA32_COMPAT_COND_SYSCALL (name) \ + __COND_SYSCALL(ia32, compat_sys_##name) +#define __IA32_SYS_STUB0 (name) \ __SYS_STUB0(ia32, sys_##name)
@@ -70,15 +84,8 @@ struct pt_regs; __SYS_STUBx(ia32, sys##name, \ SC_IA32_REGS_TO_ARGS(x, __VA_ARGS__)) -#define COND_SYSCALL (name) \ - asmlinkage __weak long __x64_sys_##name(const struct pt_regs *__unused) \ - { \ - return sys_ni_syscall(); \ - } \ - asmlinkage __weak long __ia32_sys_##name(const struct pt_regs *__unused)\ - { \ - return sys_ni_syscall(); \ - } +#define __IA32_COND_SYSCALL (name) \ + __COND_SYSCALL(ia32, sys_##name)#define SYS_NI (name) \ SYSCALL_ALIAS(__x64_sys_##name, sys_ni_posix_timers); \
@@ -87,8 +94,10 @@ struct pt_regs;#else /* CONFIG_IA32_EMULATION */ #define __IA32_COMPAT_SYS_STUB0 (name)#define __IA32_COMPAT_SYS_STUBx (x, name, ...) +#define __IA32_COMPAT_COND_SYSCALL (name)#define __IA32_SYS_STUB0 (name)#define __IA32_SYS_STUBx (x, name, ...) +#define __IA32_COND_SYSCALL (name)#endif /* CONFIG_IA32_EMULATION */
@@ -105,9 +114,12 @@ struct pt_regs; __SYS_STUBx(x32, compat_sys##name, \ SC_X86_64_REGS_TO_ARGS(x, __VA_ARGS__)) +#define __X32_COMPAT_COND_SYSCALL (name) \ + __COND_SYSCALL(x32, compat_sys_##name)#else /* CONFIG_X86_X32 */ #define __X32_COMPAT_SYS_STUB0 (name)#define __X32_COMPAT_SYS_STUBx (x, name, ...) +#define __X32_COMPAT_COND_SYSCALL (name)#endif /* CONFIG_X86_X32 */
@@ -142,8 +154,8 @@ struct pt_regs;* kernel/time/posix-stubs.c to cover this case as well. */ #define COND_SYSCALL_COMPAT (name) \ - cond_syscall(__ia32_compat_sys_##name); \ - cond_syscall(__x32_compat_sys_##name) + __IA32_COMPAT_COND_SYSCALL(name) \ + __X32_COMPAT_COND_SYSCALL(name)#define COMPAT_SYS_NI (name) \ SYSCALL_ALIAS(__ia32_compat_sys_##name, sys_ni_posix_timers); \
@@ -215,13 +227,9 @@ struct pt_regs; static asmlinkage long \ __do_sys_##sname(const struct pt_regs *__unused) -#ifndef COND_SYSCALL -#define COND_SYSCALL (name) \ - asmlinkage __weak long __x64_sys_##name(const struct pt_regs *__unused) \ - { \ - return sys_ni_syscall(); \ - } -#endif +#define COND_SYSCALL (name) \ + __X64_COND_SYSCALL(name) \ + __IA32_COND_SYSCALL(name)#ifndef SYS_NI #define SYS_NI (name) SYSCALL_ALIAS(__x64_sys_##name, sys_ni_posix_timers);
Signature · 1 line
2.24.1
[tip: x86/entry] x86/entry: Refactor COND_SYSCALL macros
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 6cc8d2b286d9e7168d72e342d1b031317cd7752b Gitweb: https://git.kernel.org/tip/6cc8d2b286d9e7168d72e342d1b031317cd7752b Author: Brian Gerst <[email protected]> AuthorDate: Fri, 13 Mar 2020 15:51:29 -04:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:19 +01:00
x86/entry: Refactor COND_SYSCALL macros
Pull the common code out from the COND_SYSCALL macros into a new __COND_SYSCALL macro. Also conditionalize the X64 version in preparation for enabling syscall wrappers on 32-bit native kernels.
--- arch/x86/include/asm/syscall_wrapper.h | 44 ++++++++++++++----------- 1 file changed, 26 insertions(+), 18 deletions(-)
arch/x86/include/asm/syscall_wrapper.h +26 -18
@@ -35,6 +35,13 @@ struct pt_regs; return __se_##name(__VA_ARGS__); \ } +#define __COND_SYSCALL (abi, name) \ + asmlinkage __weak long \ + __##abi##_##name(const struct pt_regs *__unused) \ + { \ + return sys_ni_syscall(); \ + } +#ifdef CONFIG_X86_64 #define __X64_SYS_STUB0 (name) \ __SYS_STUB0(x64, sys_##name)
@@ -42,9 +49,13 @@ struct pt_regs;#define __X64_SYS_STUBx (x, name, ...) \ __SYS_STUBx(x64, sys##name, \ SC_X86_64_REGS_TO_ARGS(x, __VA_ARGS__)) + +#define __X64_COND_SYSCALL (name) \ + __COND_SYSCALL(x64, sys_##name)#else /* CONFIG_X86_64 */ #define __X64_SYS_STUB0 (name)#define __X64_SYS_STUBx (x, name, ...) +#define __X64_COND_SYSCALL (name)#endif /* CONFIG_X86_64 */ #ifdef CONFIG_IA32_EMULATION
@@ -63,6 +74,9 @@ struct pt_regs; __SYS_STUBx(ia32, compat_sys##name, \ SC_IA32_REGS_TO_ARGS(x, __VA_ARGS__)) +#define __IA32_COMPAT_COND_SYSCALL (name) \ + __COND_SYSCALL(ia32, compat_sys_##name) +#define __IA32_SYS_STUB0 (name) \ __SYS_STUB0(ia32, sys_##name)
@@ -70,15 +84,8 @@ struct pt_regs; __SYS_STUBx(ia32, sys##name, \ SC_IA32_REGS_TO_ARGS(x, __VA_ARGS__)) -#define COND_SYSCALL (name) \ - asmlinkage __weak long __x64_sys_##name(const struct pt_regs *__unused) \ - { \ - return sys_ni_syscall(); \ - } \ - asmlinkage __weak long __ia32_sys_##name(const struct pt_regs *__unused)\ - { \ - return sys_ni_syscall(); \ - } +#define __IA32_COND_SYSCALL (name) \ + __COND_SYSCALL(ia32, sys_##name)#define SYS_NI (name) \ SYSCALL_ALIAS(__x64_sys_##name, sys_ni_posix_timers); \
@@ -87,8 +94,10 @@ struct pt_regs;#else /* CONFIG_IA32_EMULATION */ #define __IA32_COMPAT_SYS_STUB0 (name)#define __IA32_COMPAT_SYS_STUBx (x, name, ...) +#define __IA32_COMPAT_COND_SYSCALL (name)#define __IA32_SYS_STUB0 (name)#define __IA32_SYS_STUBx (x, name, ...) +#define __IA32_COND_SYSCALL (name)#endif /* CONFIG_IA32_EMULATION */
@@ -105,9 +114,12 @@ struct pt_regs; __SYS_STUBx(x32, compat_sys##name, \ SC_X86_64_REGS_TO_ARGS(x, __VA_ARGS__)) +#define __X32_COMPAT_COND_SYSCALL (name) \ + __COND_SYSCALL(x32, compat_sys_##name)#else /* CONFIG_X86_X32 */ #define __X32_COMPAT_SYS_STUB0 (name)#define __X32_COMPAT_SYS_STUBx (x, name, ...) +#define __X32_COMPAT_COND_SYSCALL (name)#endif /* CONFIG_X86_X32 */
@@ -142,8 +154,8 @@ struct pt_regs;* kernel/time/posix-stubs.c to cover this case as well. */ #define COND_SYSCALL_COMPAT (name) \ - cond_syscall(__ia32_compat_sys_##name); \ - cond_syscall(__x32_compat_sys_##name) + __IA32_COMPAT_COND_SYSCALL(name) \ + __X32_COMPAT_COND_SYSCALL(name)#define COMPAT_SYS_NI (name) \ SYSCALL_ALIAS(__ia32_compat_sys_##name, sys_ni_posix_timers); \
@@ -215,13 +227,9 @@ struct pt_regs; static asmlinkage long \ __do_sys_##sname(const struct pt_regs *__unused) -#ifndef COND_SYSCALL -#define COND_SYSCALL (name) \ - asmlinkage __weak long __x64_sys_##name(const struct pt_regs *__unused) \ - { \ - return sys_ni_syscall(); \ - } -#endif +#define COND_SYSCALL (name) \ + __X64_COND_SYSCALL(name) \ + __IA32_COND_SYSCALL(name)#ifndef SYS_NI #define SYS_NI (name) SYSCALL_ALIAS(__x64_sys_##name, sys_ni_posix_timers);
PATCH v4 4/18 x86, syscalls: Refactor SYS_NI macros
In reply to Brian GerstPull the common code out from the SYS_NI macros into a new __SYS_NI macro. Also conditionalize the X64 version in preparation for enabling syscall wrappers on 32-bit native kernels.
--- arch/x86/include/asm/syscall_wrapper.h | 32 ++++++++++++++++++-------- 1 file changed, 23 insertions(+), 9 deletions(-)
arch/x86/include/asm/syscall_wrapper.h +23 -9
@@ -42,6 +42,9 @@ struct pt_regs;return sys_ni_syscall (); \ } +#define __SYS_NI (abi, name) \ + SYSCALL_ALIAS(__##abi##_##name, sys_ni_posix_timers) +#ifdef CONFIG_X86_64 #define __X64_SYS_STUB0 (name) \ __SYS_STUB0(x64, sys_##name)
@@ -52,10 +55,14 @@ struct pt_regs;#define __X64_COND_SYSCALL (name) \ __COND_SYSCALL(x64, sys_##name) + +#define __X64_SYS_NI (name) \ + __SYS_NI(x64, sys_##name)#else /* CONFIG_X86_64 */ #define __X64_SYS_STUB0 (name)#define __X64_SYS_STUBx (x, name, ...)#define __X64_COND_SYSCALL (name) +#define __X64_SYS_NI (name)#endif /* CONFIG_X86_64 */ #ifdef CONFIG_IA32_EMULATION
@@ -77,6 +84,9 @@ struct pt_regs;#define __IA32_COMPAT_COND_SYSCALL (name) \ __COND_SYSCALL(ia32, compat_sys_##name) +#define __IA32_COMPAT_SYS_NI (name) \ + __SYS_NI(ia32, compat_sys_##name) +#define __IA32_SYS_STUB0 (name) \ __SYS_STUB0(ia32, sys_##name)
@@ -87,17 +97,17 @@ struct pt_regs;#define __IA32_COND_SYSCALL (name) \ __COND_SYSCALL(ia32, sys_##name) -#define SYS_NI (name) \ - SYSCALL_ALIAS(__x64_sys_##name, sys_ni_posix_timers); \ - SYSCALL_ALIAS(__ia32_sys_##name, sys_ni_posix_timers) - +#define __IA32_SYS_NI (name) \ + __SYS_NI(ia32, sys_##name)#else /* CONFIG_IA32_EMULATION */ #define __IA32_COMPAT_SYS_STUB0 (name)#define __IA32_COMPAT_SYS_STUBx (x, name, ...)#define __IA32_COMPAT_COND_SYSCALL (name) +#define __IA32_COMPAT_SYS_NI (name)#define __IA32_SYS_STUB0 (name)#define __IA32_SYS_STUBx (x, name, ...)#define __IA32_COND_SYSCALL (name) +#define __IA32_SYS_NI (name)#endif /* CONFIG_IA32_EMULATION */
@@ -116,10 +126,14 @@ struct pt_regs;#define __X32_COMPAT_COND_SYSCALL (name) \ __COND_SYSCALL(x32, compat_sys_##name) + +#define __X32_COMPAT_SYS_NI (name) \ + __SYS_NI(x32, compat_sys_##name)#else /* CONFIG_X86_X32 */ #define __X32_COMPAT_SYS_STUB0 (name)#define __X32_COMPAT_SYS_STUBx (x, name, ...)#define __X32_COMPAT_COND_SYSCALL (name) +#define __X32_COMPAT_SYS_NI (name)#endif /* CONFIG_X86_X32 */
@@ -158,8 +172,8 @@ struct pt_regs; __X32_COMPAT_COND_SYSCALL(name)#define COMPAT_SYS_NI (name) \ - SYSCALL_ALIAS(__ia32_compat_sys_##name, sys_ni_posix_timers); \ - SYSCALL_ALIAS(__x32_compat_sys_##name, sys_ni_posix_timers) + __IA32_COMPAT_SYS_NI(name) \ + __X32_COMPAT_SYS_NI(name)#endif /* CONFIG_COMPAT */
@@ -231,9 +245,9 @@ struct pt_regs; __X64_COND_SYSCALL(name) \ __IA32_COND_SYSCALL(name) -#ifndef SYS_NI -#define SYS_NI (name) SYSCALL_ALIAS(__x64_sys_##name, sys_ni_posix_timers); -#endif +#define SYS_NI(name) \ + __X64_SYS_NI(name) \ + __IA32_SYS_NI(name)/*
Signature · 1 line
2.24.1
[tip: x86/entry] x86/entry: Refactor SYS_NI macros
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: a74d187c2df3a382b8ab6227da34cba690e71e4d Gitweb: https://git.kernel.org/tip/a74d187c2df3a382b8ab6227da34cba690e71e4d Author: Brian Gerst <[email protected]> AuthorDate: Fri, 13 Mar 2020 15:51:30 -04:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:20 +01:00
x86/entry: Refactor SYS_NI macros
Pull the common code out from the SYS_NI macros into a new __SYS_NI macro. Also conditionalize the X64 version in preparation for enabling syscall wrappers on 32-bit native kernels.
--- arch/x86/include/asm/syscall_wrapper.h | 32 +++++++++++++++++-------- 1 file changed, 23 insertions(+), 9 deletions(-)
arch/x86/include/asm/syscall_wrapper.h +23 -9
@@ -42,6 +42,9 @@ struct pt_regs;return sys_ni_syscall (); \ } +#define __SYS_NI (abi, name) \ + SYSCALL_ALIAS(__##abi##_##name, sys_ni_posix_timers) +#ifdef CONFIG_X86_64 #define __X64_SYS_STUB0 (name) \ __SYS_STUB0(x64, sys_##name)
@@ -52,10 +55,14 @@ struct pt_regs;#define __X64_COND_SYSCALL (name) \ __COND_SYSCALL(x64, sys_##name) + +#define __X64_SYS_NI (name) \ + __SYS_NI(x64, sys_##name)#else /* CONFIG_X86_64 */ #define __X64_SYS_STUB0 (name)#define __X64_SYS_STUBx (x, name, ...)#define __X64_COND_SYSCALL (name) +#define __X64_SYS_NI (name)#endif /* CONFIG_X86_64 */ #ifdef CONFIG_IA32_EMULATION
@@ -77,6 +84,9 @@ struct pt_regs;#define __IA32_COMPAT_COND_SYSCALL (name) \ __COND_SYSCALL(ia32, compat_sys_##name) +#define __IA32_COMPAT_SYS_NI (name) \ + __SYS_NI(ia32, compat_sys_##name) +#define __IA32_SYS_STUB0 (name) \ __SYS_STUB0(ia32, sys_##name)
@@ -87,17 +97,17 @@ struct pt_regs;#define __IA32_COND_SYSCALL (name) \ __COND_SYSCALL(ia32, sys_##name) -#define SYS_NI (name) \ - SYSCALL_ALIAS(__x64_sys_##name, sys_ni_posix_timers); \ - SYSCALL_ALIAS(__ia32_sys_##name, sys_ni_posix_timers) - +#define __IA32_SYS_NI (name) \ + __SYS_NI(ia32, sys_##name)#else /* CONFIG_IA32_EMULATION */ #define __IA32_COMPAT_SYS_STUB0 (name)#define __IA32_COMPAT_SYS_STUBx (x, name, ...)#define __IA32_COMPAT_COND_SYSCALL (name) +#define __IA32_COMPAT_SYS_NI (name)#define __IA32_SYS_STUB0 (name)#define __IA32_SYS_STUBx (x, name, ...)#define __IA32_COND_SYSCALL (name) +#define __IA32_SYS_NI (name)#endif /* CONFIG_IA32_EMULATION */
@@ -116,10 +126,14 @@ struct pt_regs;#define __X32_COMPAT_COND_SYSCALL (name) \ __COND_SYSCALL(x32, compat_sys_##name) + +#define __X32_COMPAT_SYS_NI (name) \ + __SYS_NI(x32, compat_sys_##name)#else /* CONFIG_X86_X32 */ #define __X32_COMPAT_SYS_STUB0 (name)#define __X32_COMPAT_SYS_STUBx (x, name, ...)#define __X32_COMPAT_COND_SYSCALL (name) +#define __X32_COMPAT_SYS_NI (name)#endif /* CONFIG_X86_X32 */
@@ -158,8 +172,8 @@ struct pt_regs; __X32_COMPAT_COND_SYSCALL(name)#define COMPAT_SYS_NI (name) \ - SYSCALL_ALIAS(__ia32_compat_sys_##name, sys_ni_posix_timers); \ - SYSCALL_ALIAS(__x32_compat_sys_##name, sys_ni_posix_timers) + __IA32_COMPAT_SYS_NI(name) \ + __X32_COMPAT_SYS_NI(name)#endif /* CONFIG_COMPAT */
@@ -231,9 +245,9 @@ struct pt_regs; __X64_COND_SYSCALL(name) \ __IA32_COND_SYSCALL(name) -#ifndef SYS_NI -#define SYS_NI (name) SYSCALL_ALIAS(__x64_sys_##name, sys_ni_posix_timers); -#endif +#define SYS_NI(name) \ + __X64_SYS_NI(name) \ + __IA32_SYS_NI(name)/*
PATCH 1/1 x86/entry: Fix SYS_NI() build failure
In reply to Brian GerstQuoted 17 lines · Brian Gerst
Pull the common code out from the
SYS_NImacros into a new__SYS_NImacro. Also conditionalize the X64 version in preparation for enabling syscall wrappers on 32-bit native kernels.Signed-off-by Brian Gerst <[email protected]>Reviewed-by Dominik Brodowski <[email protected]>Reviewed-by Andy Lutomirski <[email protected]>#define
COMPAT_SYS_NI(name)\(quoted diff) +2
-2- SYSCALL_ALIAS(__ia32_compat_sys_##name, sys_ni_posix_timers); \ - SYSCALL_ALIAS(__x32_compat_sys_##name, sys_ni_posix_timers) + __IA32_COMPAT_SYS_NI(name) \ + __X32_COMPAT_SYS_NI(name) #endif /* CONFIG_COMPAT */
Review struct pt_regs; · line 250
Quoted 9 lines
(quoted diff) +3
-3@@ -231,9 +245,9 @@ struct pt_regs; __X64_COND_SYSCALL(name) \ __IA32_COND_SYSCALL(name) -#ifndef SYS_NI -#define SYS_NI(name) SYSCALL_ALIAS(__x64_sys_##name, sys_ni_posix_timers); -#endif +#define SYS_NI(name) \ + __X64_SYS_NI(name) \ + __IA32_SYS_NI(name)
This breaks the x86-64 build on !CONFIG_POSIX_TIMERS (and probably also with some x32 build variants), because of a missing ';' between __X64_SYS_NI() and __IA32_SYS_NI().
I suspect testing didn't catch this because SYS_NI() is rarely used in our x86-64 Kconfig space.
Very lightly tested fix attached.
I didn't see the COND_SYSCALL_COMPAT() build failure, but seems to have a similar bug.
Thanks,
Ingo
--- arch/x86/include/asm/syscall_wrapper.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/x86/include/asm/syscall_wrapper.h +4 -4
@@ -214,12 +214,12 @@ extern long __ia32_sys_ni_syscall(const struct pt_regs *regs);* COND_SYSCALL_COMPAT in kernel/sys_ni.c and COMPAT_SYS_NI in * kernel/time/posix-stubs.c to cover this case as well. */ -#define COND_SYSCALL_COMPAT (name) \ - __IA32_COMPAT_COND_SYSCALL(name) \ +#define COND_SYSCALL_COMPAT (name) \ + __IA32_COMPAT_COND_SYSCALL(name); \ __X32_COMPAT_COND_SYSCALL(name)#define COMPAT_SYS_NI (name) \ - __IA32_COMPAT_SYS_NI(name) \ + __IA32_COMPAT_SYS_NI(name); \ __X32_COMPAT_SYS_NI(name)#endif /* CONFIG_COMPAT */
@@ -257,7 +257,7 @@ extern long __ia32_sys_ni_syscall(const struct pt_regs *regs); __IA32_COND_SYSCALL(name)#define SYS_NI (name) \ - __X64_SYS_NI(name) \ + __X64_SYS_NI(name); \ __IA32_SYS_NI(name)
Re: [PATCH] x86/entry: Fix SYS_NI() build failure
Quoted 74 lines · Ingo Molnar
Quoted 17 lines · Brian Gerst
Pull the common code out from the
SYS_NImacros into a new__SYS_NImacro. Also conditionalize the X64 version in preparation for enabling syscall wrappers on 32-bit native kernels.Signed-off-by Brian Gerst <[email protected]>Reviewed-by Dominik Brodowski <[email protected]>Reviewed-by Andy Lutomirski <[email protected]>#define
COMPAT_SYS_NI(name)\(quoted diff) +2
-2- SYSCALL_ALIAS(__ia32_compat_sys_##name, sys_ni_posix_timers); \ - SYSCALL_ALIAS(__x32_compat_sys_##name, sys_ni_posix_timers) + __IA32_COMPAT_SYS_NI(name) \ + __X32_COMPAT_SYS_NI(name) #endif /* CONFIG_COMPAT */Review struct pt_regs; · line 250
Quoted 9 lines
(quoted diff) +3
-3@@ -231,9 +245,9 @@ struct pt_regs; __X64_COND_SYSCALL(name) \ __IA32_COND_SYSCALL(name) -#ifndef SYS_NI -#define SYS_NI(name) SYSCALL_ALIAS(__x64_sys_##name, sys_ni_posix_timers); -#endif +#define SYS_NI(name) \ + __X64_SYS_NI(name) \ + __IA32_SYS_NI(name)This breaks the x86-64 build on !CONFIG_POSIX_TIMERS (and probably also with some x32 build variants), because of a missing ';' between
__X64_SYS_NI()and__IA32_SYS_NI().I suspect testing didn't catch this because
SYS_NI()is rarely used in our x86-64Kconfigspace.Very lightly tested fix attached.
I didn't see the
COND_SYSCALL_COMPAT()build failure, but seems to have a similar bug.Thanks,
Ingo
Signed-off-by Ingo Molnar <[email protected]>--- arch/x86/include/asm/syscall_wrapper.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)arch/x86/include/asm/syscall_wrapper.h +3
-3@@ -214,12 +214,12 @@ extern long __ia32_sys_ni_syscall(const struct pt_regs *regs);* COND_SYSCALL_COMPAT in kernel/sys_ni.c and COMPAT_SYS_NI in * kernel/time/posix-stubs.c to cover this case as well. */ -#define COND_SYSCALL_COMPAT (name) \ - __IA32_COMPAT_COND_SYSCALL(name) \ +#define COND_SYSCALL_COMPAT (name) \ + __IA32_COMPAT_COND_SYSCALL(name); \ __X32_COMPAT_COND_SYSCALL(name)#define COMPAT_SYS_NI (name) \ - __IA32_COMPAT_SYS_NI(name) \ + __IA32_COMPAT_SYS_NI(name); \ __X32_COMPAT_SYS_NI(name)#endif /* CONFIG_COMPAT */
arch/x86/include/asm/syscall_wrapper.h extern long __ia32_sys_ni_syscall(const struct pt_regs *regs); · line 263
Quoted 8 lines
arch/x86/include/asm/syscall_wrapper.h +1
-1@@ -257,7 +257,7 @@ extern long __ia32_sys_ni_syscall(const struct pt_regs *regs); __IA32_COND_SYSCALL(name)#define SYS_NI (name) \ - __X64_SYS_NI(name) 6e4847640c6aebcaa2d9b3686cecc91b41f09269 \ + __X64_SYS_NI(name); \ __IA32_SYS_NI(name)
A simpler fix would be to add the semicolon to the end of the __SYS_NI macro. COND_SYSCALL_COMPAT isn't a problem because it expands to a function instead of an asm statement.
That said, I think __SYS_NI should be changed to mirror __COND_SYSCALL, so that the function prototypes match (see commit 6e484764)
--
Brian Gerst
PATCH v4 5/18 x86-64: Use syscall wrappers for x32_rt_sigreturn
In reply to Brian GerstAdd missing syscall wrapper for x32_rt_sigreturn().
--- arch/x86/entry/syscalls/syscall_64.tbl | 2 +- arch/x86/include/asm/sighandling.h | 5 ----- arch/x86/kernel/signal.c | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-)
arch/x86/entry/syscalls/syscall_64.tbl +1 -1
@@ -367,7 +367,7 @@ # is defined. # 512 x32 rt_sigaction __x32_compat_sys_rt_sigaction -513 x32 rt_sigreturn sys32_x32_rt_sigreturn +513 x32 rt_sigreturn __x32_compat_sys_x32_rt_sigreturn 514 x32 ioctl __x32_compat_sys_ioctl 515 x32 readv __x32_compat_sys_readv 516 x32 writev __x32_compat_sys_writev
arch/x86/include/asm/sighandling.h +0 -5
@@ -17,9 +17,4 @@ void signal_fault(struct pt_regs *regs, void __user *frame, char *where);int setup_sigcontext (struct sigcontext __user *sc,void __user *fpstate,struct pt_regs *regs,unsigned long mask); - -#ifdef CONFIG_X86_X32_ABI -asmlinkage long sys32_x32_rt_sigreturn (void ); -#endif -#endif /* _ASM_X86_SIGHANDLING_H */
arch/x86/kernel/signal.c +1 -1
@@ -859,7 +859,7 @@ void signal_fault(struct pt_regs *regs, void __user *frame, char *where) }#ifdef CONFIG_X86_X32_ABI -asmlinkage long sys32_x32_rt_sigreturn (void ) +COMPAT_SYSCALL_DEFINE0 (x32_rt_sigreturn) {struct pt_regs *regs =current_pt_regs ();struct rt_sigframe_x32 __user *frame;
Signature · 1 line
2.24.1
[tip: x86/entry] x86/entry/64: Use syscall wrappers for x32_rt_sigreturn
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 27dd84fafcd5e3c565164bb303fe8ec8ef59e147 Gitweb: https://git.kernel.org/tip/27dd84fafcd5e3c565164bb303fe8ec8ef59e147 Author: Brian Gerst <[email protected]> AuthorDate: Fri, 13 Mar 2020 15:51:31 -04:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:20 +01:00
x86/entry/64: Use syscall wrappers for x32_rt_sigreturn
Add missing syscall wrapper for x32_rt_sigreturn().
--- arch/x86/entry/syscalls/syscall_64.tbl | 2 +- arch/x86/include/asm/sighandling.h | 5 ----- arch/x86/kernel/signal.c | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-)
arch/x86/entry/syscalls/syscall_64.tbl +1 -1
@@ -367,7 +367,7 @@ # is defined. # 512 x32 rt_sigaction __x32_compat_sys_rt_sigaction -513 x32 rt_sigreturn sys32_x32_rt_sigreturn +513 x32 rt_sigreturn __x32_compat_sys_x32_rt_sigreturn 514 x32 ioctl __x32_compat_sys_ioctl 515 x32 readv __x32_compat_sys_readv 516 x32 writev __x32_compat_sys_writev
arch/x86/include/asm/sighandling.h +0 -5
@@ -17,9 +17,4 @@ void signal_fault(struct pt_regs *regs, void __user *frame, char *where);int setup_sigcontext (struct sigcontext __user *sc,void __user *fpstate,struct pt_regs *regs,unsigned long mask); - -#ifdef CONFIG_X86_X32_ABI -asmlinkage long sys32_x32_rt_sigreturn (void ); -#endif -#endif /* _ASM_X86_SIGHANDLING_H */
arch/x86/kernel/signal.c +1 -1
@@ -859,7 +859,7 @@ void signal_fault(struct pt_regs *regs, void __user *frame, char *where) }#ifdef CONFIG_X86_X32_ABI -asmlinkage long sys32_x32_rt_sigreturn (void ) +COMPAT_SYSCALL_DEFINE0 (x32_rt_sigreturn) {struct pt_regs *regs =current_pt_regs ();struct rt_sigframe_x32 __user *frame;
PATCH v4 6/18 x86-64: Move sys_ni_syscall stub to common.c
In reply to Brian Gerstso it can be available to multiple syscall tables. Also directly return -ENOSYS instead of bouncing to the generic sys_ni_syscall().
--- arch/x86/entry/common.c | 7 +++++++ arch/x86/entry/syscall_64.c | 7 ------- arch/x86/include/asm/syscall_wrapper.h | 3 +++ 3 files changed, 10 insertions(+), 7 deletions(-)
arch/x86/entry/common.c +7 -0
@@ -439,3 +439,10 @@ __visible long do_fast_syscall_32(struct pt_regs *regs) #endif }#endif + +#ifdef CONFIG_X86_64 +SYSCALL_DEFINE0 (ni_syscall) +{ +return -ENOSYS ; +} +#endif
arch/x86/entry/syscall_64.c +0 -7
@@ -8,13 +8,6 @@#include <asm/asm-offsets.h> #include <asm/syscall.h> -extern asmlinkage long sys_ni_syscall (void ); - -SYSCALL_DEFINE0 (ni_syscall) -{ -return sys_ni_syscall (); -} -#define __SYSCALL_64 (nr, sym, qual) extern asmlinkage long sym(const struct pt_regs *);#define __SYSCALL_X32 (nr, sym, qual) __SYSCALL_64(nr, sym, qual)#include <asm/syscalls_64.h>
arch/x86/include/asm/syscall_wrapper.h +3 -0
@@ -8,6 +8,9 @@struct pt_regs ; +extern asmlinkage long __x64_sys_ni_syscall (const struct pt_regs *regs); +extern asmlinkage long __ia32_sys_ni_syscall (const struct pt_regs *regs); +/* Mapping of registers to parameters for syscalls on x86-64 and x32 */ #define SC_X86_64_REGS_TO_ARGS (x, ...) \ __MAP(x,__SC_ARGS \
Signature · 1 line
2.24.1
[tip: x86/entry] x86/entry/64: Move sys_ni_syscall stub to common.c
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: cc42c045af1ff4dee875196f8fe7d6ed1f29ea64 Gitweb: https://git.kernel.org/tip/cc42c045af1ff4dee875196f8fe7d6ed1f29ea64 Author: Brian Gerst <[email protected]> AuthorDate: Fri, 13 Mar 2020 15:51:32 -04:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:20 +01:00
x86/entry/64: Move sys_ni_syscall stub to common.c
so it can be available to multiple syscall tables. Also directly return -ENOSYS instead of bouncing to the generic sys_ni_syscall().
--- arch/x86/entry/common.c | 7 +++++++ arch/x86/entry/syscall_64.c | 7 ------- arch/x86/include/asm/syscall_wrapper.h | 3 +++ 3 files changed, 10 insertions(+), 7 deletions(-)
arch/x86/entry/common.c +7 -0
@@ -438,3 +438,10 @@ __visible long do_fast_syscall_32(struct pt_regs *regs) #endif }#endif + +#ifdef CONFIG_X86_64 +SYSCALL_DEFINE0 (ni_syscall) +{ +return -ENOSYS ; +} +#endif
arch/x86/entry/syscall_64.c +0 -7
@@ -8,13 +8,6 @@#include <asm/asm-offsets.h> #include <asm/syscall.h> -extern asmlinkage long sys_ni_syscall (void ); - -SYSCALL_DEFINE0 (ni_syscall) -{ -return sys_ni_syscall (); -} -#define __SYSCALL_64 (nr, sym, qual) extern asmlinkage long sym(const struct pt_regs *);#define __SYSCALL_X32 (nr, sym, qual) __SYSCALL_64(nr, sym, qual)#include <asm/syscalls_64.h>
arch/x86/include/asm/syscall_wrapper.h +3 -0
@@ -8,6 +8,9 @@struct pt_regs ; +extern asmlinkage long __x64_sys_ni_syscall (const struct pt_regs *regs); +extern asmlinkage long __ia32_sys_ni_syscall (const struct pt_regs *regs); +/* Mapping of registers to parameters for syscalls on x86-64 and x32 */ #define SC_X86_64_REGS_TO_ARGS (x, ...) \ __MAP(x,__SC_ARGS \
PATCH v4 7/18 x86-64: Split X32 syscall table into its own file
In reply to Brian GerstSince X32 has its own syscall table now, move it to a separate file.
--- arch/x86/entry/Makefile | 1 + arch/x86/entry/syscall_64.c | 27 ++------------------------- arch/x86/entry/syscall_x32.c | 26 ++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 25 deletions(-) create mode 100644 arch/x86/entry/syscall_x32.c
arch/x86/entry/Makefile +1 -0
@@ -14,4 +14,5 @@ obj-y += vdso/ obj-y += vsyscall/ obj-$(CONFIG_IA32_EMULATION) += entry_64_compat.o syscall_32.o +obj-$(CONFIG_X86_X32_ABI) += syscall_x32.o
arch/x86/entry/syscall_64.c +2 -25
@@ -8,14 +8,13 @@#include <asm/asm-offsets.h> #include <asm/syscall.h> +#define __SYSCALL_X32 (nr, sym, qual) +#define __SYSCALL_64 (nr, sym, qual) extern asmlinkage long sym(const struct pt_regs *); -#define __SYSCALL_X32 (nr, sym, qual) __SYSCALL_64(nr, sym, qual)#include <asm/syscalls_64.h> #undef __SYSCALL_64 -#undef __SYSCALL_X32#define __SYSCALL_64 (nr, sym, qual) [nr] = sym, -#define __SYSCALL_X32 (nr, sym, qual) asmlinkage const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {/*
@@ -25,25 +24,3 @@ asmlinkage const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = { [0 ... __NR_syscall_max] = &__x64_sys_ni_syscall,#include <asm/syscalls_64.h> }; - -#undef __SYSCALL_64 -#undef __SYSCALL_X32 - -#ifdef CONFIG_X86_X32_ABI - -#define __SYSCALL_64 (nr, sym, qual) -#define __SYSCALL_X32 (nr, sym, qual) [nr] = sym, - -asmlinkage const sys_call_ptr_t x32_sys_call_table[__NR_syscall_x32_max+1] = { -/* -* Smells like a compiler bug -- it doesn't work -* when the & below is removed. -*/ - [0 ... __NR_syscall_x32_max] = &__x64_sys_ni_syscall, -#include <asm/syscalls_64.h> -}; - -#undef __SYSCALL_64 -#undef __SYSCALL_X32 - -#endif
arch/x86/entry/syscall_x32.c new file +26 -0
@@ -0,0 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0 +/* System call table for x32 ABI. */ + +#include <linux/linkage.h> +#include <linux/sys.h> +#include <linux/cache.h> +#include <linux/syscalls.h> +#include <asm/asm-offsets.h> +#include <asm/syscall.h> + +#define __SYSCALL_64 (nr, sym, qual) + +#define __SYSCALL_X32 (nr, sym, qual) extern asmlinkage long sym(const struct pt_regs *); +#include <asm/syscalls_64.h> +#undef __SYSCALL_X32 + +#define __SYSCALL_X32 (nr, sym, qual) [nr] = sym, + +asmlinkage const sys_call_ptr_t x32_sys_call_table[__NR_syscall_x32_max+1] = { +/* +* Smells like a compiler bug -- it doesn't work +* when the & below is removed. +*/ + [0 ... __NR_syscall_x32_max] = &__x64_sys_ni_syscall, +#include <asm/syscalls_64.h> +};
Signature · 1 line
2.24.1
Re: [PATCH v4 07/18] x86-64: Split X32 syscall table into its own file
Quoted 3 lines · Brian Gerst
Since X32 has its own syscall table now, move it to a separate file.
Signed-off-by Brian Gerst <[email protected]>
Thanks,
Dominik
[tip: x86/entry] x86/entry/64: Split X32 syscall table into its own file
In reply to Brian GerstThe following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 2e487c357917b98adc6a6dafa612c435cad1af41 Gitweb: https://git.kernel.org/tip/2e487c357917b98adc6a6dafa612c435cad1af41 Author: Brian Gerst <[email protected]> AuthorDate: Fri, 13 Mar 2020 15:51:33 -04:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:21 +01:00
x86/entry/64: Split X32 syscall table into its own file
Since X32 has its own syscall table now, move it to a separate file.
--- arch/x86/entry/Makefile | 1 + arch/x86/entry/syscall_64.c | 27 ++------------------------- arch/x86/entry/syscall_x32.c | 26 ++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 25 deletions(-) create mode 100644 arch/x86/entry/syscall_x32.c
arch/x86/entry/Makefile +1 -0
@@ -14,4 +14,5 @@ obj-y += vdso/ obj-y += vsyscall/ obj-$(CONFIG_IA32_EMULATION) += entry_64_compat.o syscall_32.o +obj-$(CONFIG_X86_X32_ABI) += syscall_x32.o
arch/x86/entry/syscall_64.c +2 -25
@@ -8,14 +8,13 @@#include <asm/asm-offsets.h> #include <asm/syscall.h> +#define __SYSCALL_X32 (nr, sym, qual) +#define __SYSCALL_64 (nr, sym, qual) extern asmlinkage long sym(const struct pt_regs *); -#define __SYSCALL_X32 (nr, sym, qual) __SYSCALL_64(nr, sym, qual)#include <asm/syscalls_64.h> #undef __SYSCALL_64 -#undef __SYSCALL_X32#define __SYSCALL_64 (nr, sym, qual) [nr] = sym, -#define __SYSCALL_X32 (nr, sym, qual) asmlinkage const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {/*
@@ -25,25 +24,3 @@ asmlinkage const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = { [0 ... __NR_syscall_max] = &__x64_sys_ni_syscall,#include <asm/syscalls_64.h> }; - -#undef __SYSCALL_64 -#undef __SYSCALL_X32 - -#ifdef CONFIG_X86_X32_ABI - -#define __SYSCALL_64 (nr, sym, qual) -#define __SYSCALL_X32 (nr, sym, qual) [nr] = sym, - -asmlinkage const sys_call_ptr_t x32_sys_call_table[__NR_syscall_x32_max+1] = { -/* -* Smells like a compiler bug -- it doesn't work -* when the & below is removed. -*/ - [0 ... __NR_syscall_x32_max] = &__x64_sys_ni_syscall, -#include <asm/syscalls_64.h> -}; - -#undef __SYSCALL_64 -#undef __SYSCALL_X32 - -#endif
arch/x86/entry/syscall_x32.c new file +26 -0
@@ -0,0 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0 +/* System call table for x32 ABI. */ + +#include <linux/linkage.h> +#include <linux/sys.h> +#include <linux/cache.h> +#include <linux/syscalls.h> +#include <asm/asm-offsets.h> +#include <asm/syscall.h> + +#define __SYSCALL_64 (nr, sym, qual) + +#define __SYSCALL_X32 (nr, sym, qual) extern asmlinkage long sym(const struct pt_regs *); +#include <asm/syscalls_64.h> +#undef __SYSCALL_X32 + +#define __SYSCALL_X32 (nr, sym, qual) [nr] = sym, + +asmlinkage const sys_call_ptr_t x32_sys_call_table[__NR_syscall_x32_max+1] = { +/* +* Smells like a compiler bug -- it doesn't work +* when the & below is removed. +*/ + [0 ... __NR_syscall_x32_max] = &__x64_sys_ni_syscall, +#include <asm/syscalls_64.h> +};
PATCH v4 8/18 x86: Move max syscall number calculation to syscallhdr.sh
In reply to Brian GerstInstead of using an array in asm-offsets to calculate the max syscall number, calculate it when writing out the syscall headers.
--- arch/x86/entry/syscall_32.c | 6 ++-- arch/x86/entry/syscall_64.c | 2 +- arch/x86/entry/syscall_x32.c | 6 ++-- arch/x86/entry/syscalls/syscallhdr.sh | 7 ++++ arch/x86/entry/vdso/vdso32/vclock_gettime.c | 1 + arch/x86/include/asm/syscall.h | 3 -- arch/x86/include/asm/unistd.h | 7 ++++ arch/x86/kernel/asm-offsets_32.c | 9 ------ arch/x86/kernel/asm-offsets_64.c | 36 --------------------- arch/x86/um/sys_call_table_32.c | 2 +- arch/x86/um/sys_call_table_64.c | 2 +- arch/x86/um/user-offsets.c | 15 --------- 12 files changed, 24 insertions(+), 72 deletions(-)
arch/x86/entry/syscall_32.c +3 -3
@@ -4,7 +4,7 @@#include <linux/linkage.h> #include <linux/sys.h> #include <linux/cache.h> -#include <asm/asm-offsets.h> +#include <asm/unistd.h> #include <asm/syscall.h> #ifdef CONFIG_IA32_EMULATION
@@ -22,11 +22,11 @@ extern asmlinkage long sys_ni_syscall(unsigned long, unsigned long, unsigned lon#define __SYSCALL_I386 (nr, sym, qual) [nr] = sym, -__visible const sys_call_ptr_t ia32_sys_call_table[__NR_syscall_compat_max+1] = { +__visible const sys_call_ptr_t ia32_sys_call_table[__NR_ia32_syscall_max+1] = {/* * Smells like a compiler bug -- it doesn't work * when the & below is removed. */ - [0 ... __NR_syscall_compat_max] = &__sys_ni_syscall, + [0 ... __NR_ia32_syscall_max] = &__sys_ni_syscall, #include <asm/syscalls_32.h> };
arch/x86/entry/syscall_64.c +1 -1
@@ -5,7 +5,7 @@#include <linux/sys.h> #include <linux/cache.h> #include <linux/syscalls.h> -#include <asm/asm-offsets.h> +#include <asm/unistd.h> #include <asm/syscall.h> #define __SYSCALL_X32 (nr, sym, qual)
arch/x86/entry/syscall_x32.c +3 -3
@@ -5,7 +5,7 @@#include <linux/sys.h> #include <linux/cache.h> #include <linux/syscalls.h> -#include <asm/asm-offsets.h> +#include <asm/unistd.h> #include <asm/syscall.h> #define __SYSCALL_64 (nr, sym, qual)
@@ -16,11 +16,11 @@#define __SYSCALL_X32 (nr, sym, qual) [nr] = sym, -asmlinkage const sys_call_ptr_t x32_sys_call_table[__NR_syscall_x32_max+1] = { +asmlinkage const sys_call_ptr_t x32_sys_call_table[__NR_x32_syscall_max+1] = {/* * Smells like a compiler bug -- it doesn't work * when the & below is removed. */ - [0 ... __NR_syscall_x32_max] = &__x64_sys_ni_syscall, + [0 ... __NR_x32_syscall_max] = &__x64_sys_ni_syscall, #include <asm/syscalls_64.h> };
arch/x86/entry/syscalls/syscallhdr.sh +7 -0
@@ -15,14 +15,21 @@ grep -E "^[0-9A-Fa-fXx]+[[:space:]]+${my_abis}" "$in" | sort -n | ( echo "#define ${fileguard} 1" echo "" + max=0 while read nr abi name entry ; do if [ -z "$offset" ]; then echo "#define __NR_${prefix}${name} $nr" else echo "#define __NR_${prefix}${name} ($offset + $nr)" fi + + max=$nr done + echo "" + echo "#ifdef __KERNEL__" + echo "#define __NR_${prefix}syscall_max $max" + echo "#endif" echo "" echo "#endif /* ${fileguard} */" ) > "$out"
arch/x86/entry/vdso/vdso32/vclock_gettime.c +1 -0
@@ -13,6 +13,7 @@*/ #undef CONFIG_64BIT#undef CONFIG_X86_64 +#undef CONFIG_COMPAT#undef CONFIG_PGTABLE_LEVELS#undef CONFIG_ILLEGAL_POINTER_VALUE#undef CONFIG_SPARSEMEM_VMEMMAP
arch/x86/include/asm/syscall.h +0 -3
@@ -13,7 +13,6 @@#include <uapi/linux/audit.h> #include <linux/sched.h> #include <linux/err.h> -#include <asm/asm-offsets.h> /* For NR_syscalls */ #include <asm/thread_info.h> /* for TS_COMPAT */ #include <asm/unistd.h>
@@ -28,8 +27,6 @@ extern const sys_call_ptr_t sys_call_table[];#if defined(CONFIG_X86_32 )#define ia32_sys_call_table sys_call_table -#define __NR_syscall_compat_max __NR_syscall_max -#define IA32_NR_syscalls NR_syscalls#endif #if defined(CONFIG_IA32_EMULATION )
arch/x86/include/asm/unistd.h +7 -0
@@ -13,10 +13,13 @@# define __ARCH_WANT_SYS_OLD_MMAP# define __ARCH_WANT_SYS_OLD_SELECT +# define __NR_ia32_syscall_max __NR_syscall_max +# else # include <asm/unistd_64.h> # include <asm/unistd_64_x32.h> +# include <asm/unistd_32_ia32.h> # define __ARCH_WANT_SYS_TIME# define __ARCH_WANT_SYS_UTIME# define __ARCH_WANT_COMPAT_SYS_PREADV64
@@ -26,6 +29,10 @@# endif +# define NR_syscalls (__NR_syscall_max + 1) +# define X32_NR_syscalls (__NR_x32_syscall_max + 1) +# define IA32_NR_syscalls (__NR_ia32_syscall_max + 1) +# define __ARCH_WANT_NEW_STAT# define __ARCH_WANT_OLD_READDIR# define __ARCH_WANT_OLD_STAT
arch/x86/kernel/asm-offsets_32.c +0 -9
@@ -7,11 +7,6 @@#include <asm/ucontext.h> -#define __SYSCALL_I386 (nr, sym, qual) [nr] = 1, -static char syscalls[] = { -#include <asm/syscalls_32.h> -}; -/* workaround for a warning with -Wmissing-prototypes */ void foo (void );
@@ -63,10 +58,6 @@ void foo(void)OFFSET (stack_canary_offset, stack_canary, canary);#endif -BLANK (); -DEFINE (__NR_syscall_max,sizeof (syscalls) -1 ); -DEFINE (NR_syscalls,sizeof (syscalls)); -BLANK ();DEFINE (EFI_svam, offsetof(efi_runtime_services_t , set_virtual_address_map)); }
arch/x86/kernel/asm-offsets_64.c +0 -36
@@ -5,30 +5,6 @@#include <asm/ia32.h> -#define __SYSCALL_64 (nr, sym, qual) [nr] = 1, -#define __SYSCALL_X32 (nr, sym, qual) -static char syscalls_64[] = { -#include <asm/syscalls_64.h> -}; -#undef __SYSCALL_64 -#undef __SYSCALL_X32 - -#ifdef CONFIG_X86_X32_ABI -#define __SYSCALL_64 (nr, sym, qual) -#define __SYSCALL_X32 (nr, sym, qual) [nr] = 1, -static char syscalls_x32[] = { -#include <asm/syscalls_64.h> -}; -#undef __SYSCALL_64 -#undef __SYSCALL_X32 -#endif - -#define __SYSCALL_I386 (nr, sym, qual) [nr] = 1, -static char syscalls_ia32[] = { -#include <asm/syscalls_32.h> -}; -#undef __SYSCALL_I386 -#if defined(CONFIG_KVM_GUEST ) && defined(CONFIG_PARAVIRT_SPINLOCKS )#include <asm/kvm_para.h> #endif
@@ -90,17 +66,5 @@ int main(void)DEFINE (stack_canary_offset, offsetof(struct fixed_percpu_data , stack_canary));BLANK ();#endif - -DEFINE (__NR_syscall_max,sizeof (syscalls_64) -1 ); -DEFINE (NR_syscalls,sizeof (syscalls_64)); - -#ifdef CONFIG_X86_X32_ABI -DEFINE (__NR_syscall_x32_max,sizeof (syscalls_x32) -1 ); -DEFINE (X32_NR_syscalls,sizeof (syscalls_x32)); -#endif - -DEFINE (__NR_syscall_compat_max,sizeof (syscalls_ia32) -1 ); -DEFINE (IA32_NR_syscalls,sizeof (syscalls_ia32)); -return 0 ; }
arch/x86/um/sys_call_table_32.c +1 -1
@@ -7,7 +7,7 @@#include <linux/linkage.h> #include <linux/sys.h> #include <linux/cache.h> -#include <generated/user_constants.h> +#include <asm/unistd.h> #include <asm/syscall.h> #define __NO_STUBS
arch/x86/um/sys_call_table_64.c +1 -1
@@ -7,7 +7,7 @@#include <linux/linkage.h> #include <linux/sys.h> #include <linux/cache.h> -#include <generated/user_constants.h> +#include <asm/unistd.h> #include <asm/syscall.h> #define __NO_STUBS
arch/x86/um/user-offsets.c +0 -15
@@ -9,18 +9,6 @@#include <linux/ptrace.h> #include <asm/types.h> -#ifdef __i386__ -#define __SYSCALL_I386 (nr, sym, qual) [nr] = 1, -static char syscalls[] = { -#include <asm/syscalls_32.h> -}; -#else -#define __SYSCALL_64 (nr, sym, qual) [nr] = 1, -static char syscalls[] = { -#include <asm/syscalls_64.h> -}; -#endif -#define DEFINE (sym, val) \ asm volatile("\n->" #sym " %0 " #val : : "i" (val))
@@ -94,7 +82,4 @@ void foo(void)DEFINE (UM_PROT_READ ,PROT_READ );DEFINE (UM_PROT_WRITE ,PROT_WRITE );DEFINE (UM_PROT_EXEC ,PROT_EXEC ); - -DEFINE (__NR_syscall_max,sizeof (syscalls) -1 ); -DEFINE (NR_syscalls,sizeof (syscalls)); }
Signature · 1 line
2.24.1
[tip: x86/entry] x86/entry: Move max syscall number calculation to syscallhdr.sh
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 0872098804b5f44bab91f80b6df55df32894fee3 Gitweb: https://git.kernel.org/tip/0872098804b5f44bab91f80b6df55df32894fee3 Author: Brian Gerst <[email protected]> AuthorDate: Fri, 13 Mar 2020 15:51:34 -04:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:21 +01:00
x86/entry: Move max syscall number calculation to syscallhdr.sh
Instead of using an array in asm-offsets to calculate the max syscall number, calculate it when writing out the syscall headers.
--- arch/x86/entry/syscall_32.c | 6 +-- arch/x86/entry/syscall_64.c | 2 +- arch/x86/entry/syscall_x32.c | 6 +-- arch/x86/entry/syscalls/syscallhdr.sh | 7 ++++- arch/x86/entry/vdso/vdso32/vclock_gettime.c | 1 +- arch/x86/include/asm/syscall.h | 3 +-- arch/x86/include/asm/unistd.h | 7 ++++- arch/x86/kernel/asm-offsets_32.c | 9 +----- arch/x86/kernel/asm-offsets_64.c | 36 +-------------------- arch/x86/um/sys_call_table_32.c | 2 +- arch/x86/um/sys_call_table_64.c | 2 +- arch/x86/um/user-offsets.c | 15 +-------- 12 files changed, 24 insertions(+), 72 deletions(-)
arch/x86/entry/syscall_32.c +3 -3
@@ -4,7 +4,7 @@#include <linux/linkage.h> #include <linux/sys.h> #include <linux/cache.h> -#include <asm/asm-offsets.h> +#include <asm/unistd.h> #include <asm/syscall.h> #ifdef CONFIG_IA32_EMULATION
@@ -22,11 +22,11 @@ extern asmlinkage long sys_ni_syscall(unsigned long, unsigned long, unsigned lon#define __SYSCALL_I386 (nr, sym, qual) [nr] = sym, -__visible const sys_call_ptr_t ia32_sys_call_table[__NR_syscall_compat_max+1] = { +__visible const sys_call_ptr_t ia32_sys_call_table[__NR_ia32_syscall_max+1] = {/* * Smells like a compiler bug -- it doesn't work * when the & below is removed. */ - [0 ... __NR_syscall_compat_max] = &__sys_ni_syscall, + [0 ... __NR_ia32_syscall_max] = &__sys_ni_syscall, #include <asm/syscalls_32.h> };
arch/x86/entry/syscall_64.c +1 -1
@@ -5,7 +5,7 @@#include <linux/sys.h> #include <linux/cache.h> #include <linux/syscalls.h> -#include <asm/asm-offsets.h> +#include <asm/unistd.h> #include <asm/syscall.h> #define __SYSCALL_X32 (nr, sym, qual)
arch/x86/entry/syscall_x32.c +3 -3
@@ -5,7 +5,7 @@#include <linux/sys.h> #include <linux/cache.h> #include <linux/syscalls.h> -#include <asm/asm-offsets.h> +#include <asm/unistd.h> #include <asm/syscall.h> #define __SYSCALL_64 (nr, sym, qual)
@@ -16,11 +16,11 @@#define __SYSCALL_X32 (nr, sym, qual) [nr] = sym, -asmlinkage const sys_call_ptr_t x32_sys_call_table[__NR_syscall_x32_max+1] = { +asmlinkage const sys_call_ptr_t x32_sys_call_table[__NR_x32_syscall_max+1] = {/* * Smells like a compiler bug -- it doesn't work * when the & below is removed. */ - [0 ... __NR_syscall_x32_max] = &__x64_sys_ni_syscall, + [0 ... __NR_x32_syscall_max] = &__x64_sys_ni_syscall, #include <asm/syscalls_64.h> };
arch/x86/entry/syscalls/syscallhdr.sh +7 -0
@@ -15,14 +15,21 @@ grep -E "^[0-9A-Fa-fXx]+[[:space:]]+${my_abis}" "$in" | sort -n | ( echo "#define ${fileguard} 1" echo "" + max=0 while read nr abi name entry ; do if [ -z "$offset" ]; then echo "#define __NR_${prefix}${name} $nr" else echo "#define __NR_${prefix}${name} ($offset + $nr)" fi + + max=$nr done echo "" + echo "#ifdef __KERNEL__" + echo "#define __NR_${prefix}syscall_max $max" + echo "#endif" + echo "" echo "#endif /* ${fileguard} */" ) > "$out"
arch/x86/entry/vdso/vdso32/vclock_gettime.c +1 -0
@@ -13,6 +13,7 @@*/ #undef CONFIG_64BIT#undef CONFIG_X86_64 +#undef CONFIG_COMPAT#undef CONFIG_PGTABLE_LEVELS#undef CONFIG_ILLEGAL_POINTER_VALUE#undef CONFIG_SPARSEMEM_VMEMMAP
arch/x86/include/asm/syscall.h +0 -3
@@ -13,7 +13,6 @@#include <uapi/linux/audit.h> #include <linux/sched.h> #include <linux/err.h> -#include <asm/asm-offsets.h> /* For NR_syscalls */ #include <asm/thread_info.h> /* for TS_COMPAT */ #include <asm/unistd.h>
@@ -28,8 +27,6 @@ extern const sys_call_ptr_t sys_call_table[];#if defined(CONFIG_X86_32 )#define ia32_sys_call_table sys_call_table -#define __NR_syscall_compat_max __NR_syscall_max -#define IA32_NR_syscalls NR_syscalls#endif #if defined(CONFIG_IA32_EMULATION )
arch/x86/include/asm/unistd.h +7 -0
@@ -13,10 +13,13 @@# define __ARCH_WANT_SYS_OLD_MMAP# define __ARCH_WANT_SYS_OLD_SELECT +# define __NR_ia32_syscall_max __NR_syscall_max +# else # include <asm/unistd_64.h> # include <asm/unistd_64_x32.h> +# include <asm/unistd_32_ia32.h> # define __ARCH_WANT_SYS_TIME# define __ARCH_WANT_SYS_UTIME# define __ARCH_WANT_COMPAT_SYS_PREADV64
@@ -26,6 +29,10 @@# endif +# define NR_syscalls (__NR_syscall_max + 1) +# define X32_NR_syscalls (__NR_x32_syscall_max + 1) +# define IA32_NR_syscalls (__NR_ia32_syscall_max + 1) +# define __ARCH_WANT_NEW_STAT# define __ARCH_WANT_OLD_READDIR# define __ARCH_WANT_OLD_STAT
arch/x86/kernel/asm-offsets_32.c +0 -9
@@ -5,11 +5,6 @@#include <asm/ucontext.h> -#define __SYSCALL_I386 (nr, sym, qual) [nr] = 1, -static char syscalls[] = { -#include <asm/syscalls_32.h> -}; -/* workaround for a warning with -Wmissing-prototypes */ void foo (void );
@@ -60,8 +55,4 @@ void foo(void)BLANK ();OFFSET (stack_canary_offset, stack_canary, canary);#endif - -BLANK (); -DEFINE (__NR_syscall_max,sizeof (syscalls) -1 ); -DEFINE (NR_syscalls,sizeof (syscalls)); }
arch/x86/kernel/asm-offsets_64.c +0 -36
@@ -5,30 +5,6 @@#include <asm/ia32.h> -#define __SYSCALL_64 (nr, sym, qual) [nr] = 1, -#define __SYSCALL_X32 (nr, sym, qual) -static char syscalls_64[] = { -#include <asm/syscalls_64.h> -}; -#undef __SYSCALL_64 -#undef __SYSCALL_X32 - -#ifdef CONFIG_X86_X32_ABI -#define __SYSCALL_64 (nr, sym, qual) -#define __SYSCALL_X32 (nr, sym, qual) [nr] = 1, -static char syscalls_x32[] = { -#include <asm/syscalls_64.h> -}; -#undef __SYSCALL_64 -#undef __SYSCALL_X32 -#endif - -#define __SYSCALL_I386 (nr, sym, qual) [nr] = 1, -static char syscalls_ia32[] = { -#include <asm/syscalls_32.h> -}; -#undef __SYSCALL_I386 -#if defined(CONFIG_KVM_GUEST ) && defined(CONFIG_PARAVIRT_SPINLOCKS )#include <asm/kvm_para.h> #endif
@@ -90,17 +66,5 @@ int main(void)DEFINE (stack_canary_offset, offsetof(struct fixed_percpu_data , stack_canary));BLANK ();#endif - -DEFINE (__NR_syscall_max,sizeof (syscalls_64) -1 ); -DEFINE (NR_syscalls,sizeof (syscalls_64)); - -#ifdef CONFIG_X86_X32_ABI -DEFINE (__NR_syscall_x32_max,sizeof (syscalls_x32) -1 ); -DEFINE (X32_NR_syscalls,sizeof (syscalls_x32)); -#endif - -DEFINE (__NR_syscall_compat_max,sizeof (syscalls_ia32) -1 ); -DEFINE (IA32_NR_syscalls,sizeof (syscalls_ia32)); -return 0 ; }
arch/x86/um/sys_call_table_32.c +1 -1
@@ -7,7 +7,7 @@#include <linux/linkage.h> #include <linux/sys.h> #include <linux/cache.h> -#include <generated/user_constants.h> +#include <asm/unistd.h> #include <asm/syscall.h> #define __NO_STUBS
arch/x86/um/sys_call_table_64.c +1 -1
@@ -7,7 +7,7 @@#include <linux/linkage.h> #include <linux/sys.h> #include <linux/cache.h> -#include <generated/user_constants.h> +#include <asm/unistd.h> #include <asm/syscall.h> #define __NO_STUBS
arch/x86/um/user-offsets.c +0 -15
@@ -9,18 +9,6 @@#include <linux/ptrace.h> #include <asm/types.h> -#ifdef __i386__ -#define __SYSCALL_I386 (nr, sym, qual) [nr] = 1, -static char syscalls[] = { -#include <asm/syscalls_32.h> -}; -#else -#define __SYSCALL_64 (nr, sym, qual) [nr] = 1, -static char syscalls[] = { -#include <asm/syscalls_64.h> -}; -#endif -#define DEFINE (sym, val) \ asm volatile("\n->" #sym " %0 " #val : : "i" (val))
@@ -94,7 +82,4 @@ void foo(void)DEFINE (UM_PROT_READ ,PROT_READ );DEFINE (UM_PROT_WRITE ,PROT_WRITE );DEFINE (UM_PROT_EXEC ,PROT_EXEC ); - -DEFINE (__NR_syscall_max,sizeof (syscalls) -1 ); -DEFINE (NR_syscalls,sizeof (syscalls)); }
PATCH v4 9/18 x86-64: Remove ptregs qualifier from syscall table
In reply to Brian GerstNow that the fast syscall path is removed, the ptregs qualifier is unused.
--- arch/x86/entry/syscalls/syscall_64.tbl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
arch/x86/entry/syscalls/syscall_64.tbl +10 -10
@@ -23,7 +23,7 @@ 12 common brk __x64_sys_brk 13 64 rt_sigaction __x64_sys_rt_sigaction 14 common rt_sigprocmask __x64_sys_rt_sigprocmask -15 64 rt_sigreturn __x64_sys_rt_sigreturn/ptregs +15 64 rt_sigreturn __x64_sys_rt_sigreturn 16 64 ioctl __x64_sys_ioctl 17 common pread64 __x64_sys_pread64 18 common pwrite64 __x64_sys_pwrite64
@@ -64,10 +64,10 @@ 53 common socketpair __x64_sys_socketpair 54 64 setsockopt __x64_sys_setsockopt 55 64 getsockopt __x64_sys_getsockopt -56 common clone __x64_sys_clone/ptregs -57 common fork __x64_sys_fork/ptregs -58 common vfork __x64_sys_vfork/ptregs -59 64 execve __x64_sys_execve/ptregs +56 common clone __x64_sys_clone +57 common fork __x64_sys_fork +58 common vfork __x64_sys_vfork +59 64 execve __x64_sys_execve 60 common exit __x64_sys_exit 61 common wait4 __x64_sys_wait4 62 common kill __x64_sys_kill
@@ -180,7 +180,7 @@ 169 common reboot __x64_sys_reboot 170 common sethostname __x64_sys_sethostname 171 common setdomainname __x64_sys_setdomainname -172 common iopl __x64_sys_iopl/ptregs +172 common iopl __x64_sys_iopl 173 common ioperm __x64_sys_ioperm 174 64 create_module 175 common init_module __x64_sys_init_module
@@ -330,7 +330,7 @@ 319 common memfd_create __x64_sys_memfd_create 320 common kexec_file_load __x64_sys_kexec_file_load 321 common bpf __x64_sys_bpf -322 64 execveat __x64_sys_execveat/ptregs +322 64 execveat __x64_sys_execveat 323 common userfaultfd __x64_sys_userfaultfd 324 common membarrier __x64_sys_membarrier 325 common mlock2 __x64_sys_mlock2
@@ -356,7 +356,7 @@ 432 common fsmount __x64_sys_fsmount 433 common fspick __x64_sys_fspick 434 common pidfd_open __x64_sys_pidfd_open -435 common clone3 __x64_sys_clone3/ptregs +435 common clone3 __x64_sys_clone3 437 common openat2 __x64_sys_openat2 438 common pidfd_getfd __x64_sys_pidfd_getfd
@@ -374,7 +374,7 @@ 517 x32 recvfrom __x32_compat_sys_recvfrom 518 x32 sendmsg __x32_compat_sys_sendmsg 519 x32 recvmsg __x32_compat_sys_recvmsg -520 x32 execve __x32_compat_sys_execve/ptregs +520 x32 execve __x32_compat_sys_execve 521 x32 ptrace __x32_compat_sys_ptrace 522 x32 rt_sigpending __x32_compat_sys_rt_sigpending 523 x32 rt_sigtimedwait __x32_compat_sys_rt_sigtimedwait_time64
@@ -399,6 +399,6 @@ 542 x32 getsockopt __x32_compat_sys_getsockopt 543 x32 io_setup __x32_compat_sys_io_setup 544 x32 io_submit __x32_compat_sys_io_submit -545 x32 execveat __x32_compat_sys_execveat/ptregs +545 x32 execveat __x32_compat_sys_execveat 546 x32 preadv2 __x32_compat_sys_preadv64v2 547 x32 pwritev2 __x32_compat_sys_pwritev64v2
Signature · 1 line
2.24.1
Re: [PATCH v4 09/18] x86-64: Remove ptregs qualifier from syscall table
Quoted 3 lines · Brian Gerst
Now that the fast syscall path is removed, the ptregs qualifier is unused.
Signed-off-by Brian Gerst <[email protected]>
Thanks,
Dominik
[tip: x86/entry] x86/entry/64: Remove ptregs qualifier from syscall table
In reply to Brian GerstThe following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: d3b1b776eefcc1695d15730f37cdaab201fd8707 Gitweb: https://git.kernel.org/tip/d3b1b776eefcc1695d15730f37cdaab201fd8707 Author: Brian Gerst <[email protected]> AuthorDate: Fri, 13 Mar 2020 15:51:35 -04:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:21 +01:00
x86/entry/64: Remove ptregs qualifier from syscall table
Now that the fast syscall path is removed, the ptregs qualifier is unused.
--- arch/x86/entry/syscalls/syscall_64.tbl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
arch/x86/entry/syscalls/syscall_64.tbl +10 -10
@@ -23,7 +23,7 @@ 12 common brk __x64_sys_brk 13 64 rt_sigaction __x64_sys_rt_sigaction 14 common rt_sigprocmask __x64_sys_rt_sigprocmask -15 64 rt_sigreturn __x64_sys_rt_sigreturn/ptregs +15 64 rt_sigreturn __x64_sys_rt_sigreturn 16 64 ioctl __x64_sys_ioctl 17 common pread64 __x64_sys_pread64 18 common pwrite64 __x64_sys_pwrite64
@@ -64,10 +64,10 @@ 53 common socketpair __x64_sys_socketpair 54 64 setsockopt __x64_sys_setsockopt 55 64 getsockopt __x64_sys_getsockopt -56 common clone __x64_sys_clone/ptregs -57 common fork __x64_sys_fork/ptregs -58 common vfork __x64_sys_vfork/ptregs -59 64 execve __x64_sys_execve/ptregs +56 common clone __x64_sys_clone +57 common fork __x64_sys_fork +58 common vfork __x64_sys_vfork +59 64 execve __x64_sys_execve 60 common exit __x64_sys_exit 61 common wait4 __x64_sys_wait4 62 common kill __x64_sys_kill
@@ -180,7 +180,7 @@ 169 common reboot __x64_sys_reboot 170 common sethostname __x64_sys_sethostname 171 common setdomainname __x64_sys_setdomainname -172 common iopl __x64_sys_iopl/ptregs +172 common iopl __x64_sys_iopl 173 common ioperm __x64_sys_ioperm 174 64 create_module 175 common init_module __x64_sys_init_module
@@ -330,7 +330,7 @@ 319 common memfd_create __x64_sys_memfd_create 320 common kexec_file_load __x64_sys_kexec_file_load 321 common bpf __x64_sys_bpf -322 64 execveat __x64_sys_execveat/ptregs +322 64 execveat __x64_sys_execveat 323 common userfaultfd __x64_sys_userfaultfd 324 common membarrier __x64_sys_membarrier 325 common mlock2 __x64_sys_mlock2
@@ -356,7 +356,7 @@ 432 common fsmount __x64_sys_fsmount 433 common fspick __x64_sys_fspick 434 common pidfd_open __x64_sys_pidfd_open -435 common clone3 __x64_sys_clone3/ptregs +435 common clone3 __x64_sys_clone3 437 common openat2 __x64_sys_openat2 438 common pidfd_getfd __x64_sys_pidfd_getfd
@@ -374,7 +374,7 @@ 517 x32 recvfrom __x32_compat_sys_recvfrom 518 x32 sendmsg __x32_compat_sys_sendmsg 519 x32 recvmsg __x32_compat_sys_recvmsg -520 x32 execve __x32_compat_sys_execve/ptregs +520 x32 execve __x32_compat_sys_execve 521 x32 ptrace __x32_compat_sys_ptrace 522 x32 rt_sigpending __x32_compat_sys_rt_sigpending 523 x32 rt_sigtimedwait __x32_compat_sys_rt_sigtimedwait_time64
@@ -399,6 +399,6 @@ 542 x32 getsockopt __x32_compat_sys_getsockopt 543 x32 io_setup __x32_compat_sys_io_setup 544 x32 io_submit __x32_compat_sys_io_submit -545 x32 execveat __x32_compat_sys_execveat/ptregs +545 x32 execveat __x32_compat_sys_execveat 546 x32 preadv2 __x32_compat_sys_preadv64v2 547 x32 pwritev2 __x32_compat_sys_pwritev64v2
PATCH v4 10/18 x86: Remove syscall qualifier support
In reply to Brian GerstSyscall qualifier support is no longer needed.
--- arch/x86/entry/syscall_32.c | 6 +++--- arch/x86/entry/syscall_64.c | 6 +++--- arch/x86/entry/syscall_x32.c | 6 +++--- arch/x86/entry/syscalls/syscalltbl.sh | 10 +--------- arch/x86/um/sys_call_table_32.c | 4 ++-- arch/x86/um/sys_call_table_64.c | 4 ++-- 6 files changed, 14 insertions(+), 22 deletions(-)
arch/x86/entry/syscall_32.c +3 -3
@@ -9,10 +9,10 @@#ifdef CONFIG_IA32_EMULATION /* On X86_64, we use struct pt_regs * to pass parameters to syscalls */ -#define __SYSCALL_I386 (nr, sym, qual) extern asmlinkage long sym(const struct pt_regs *); +#define __SYSCALL_I386 (nr, sym) extern asmlinkage long sym(const struct pt_regs *);#define __sys_ni_syscall __ia32_sys_ni_syscall#else /* CONFIG_IA32_EMULATION */ -#define __SYSCALL_I386 (nr, sym, qual) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long); +#define __SYSCALL_I386 (nr, sym) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long);extern asmlinkage long sys_ni_syscall (unsigned long ,unsigned long ,unsigned long ,unsigned long ,unsigned long ,unsigned long );#define __sys_ni_syscall sys_ni_syscall#endif /* CONFIG_IA32_EMULATION */
@@ -20,7 +20,7 @@ extern asmlinkage long sys_ni_syscall(unsigned long, unsigned long, unsigned lon#include <asm/syscalls_32.h> #undef __SYSCALL_I386 -#define __SYSCALL_I386 (nr, sym, qual) [nr] = sym, +#define __SYSCALL_I386 (nr, sym) [nr] = sym, __visible const sys_call_ptr_t ia32_sys_call_table[__NR_ia32_syscall_max+1] = {/*
arch/x86/entry/syscall_64.c +3 -3
@@ -8,13 +8,13 @@#include <asm/unistd.h> #include <asm/syscall.h> -#define __SYSCALL_X32 (nr, sym, qual) +#define __SYSCALL_X32 (nr, sym) -#define __SYSCALL_64 (nr, sym, qual) extern asmlinkage long sym(const struct pt_regs *); +#define __SYSCALL_64 (nr, sym) extern asmlinkage long sym(const struct pt_regs *);#include <asm/syscalls_64.h> #undef __SYSCALL_64 -#define __SYSCALL_64 (nr, sym, qual) [nr] = sym, +#define __SYSCALL_64 (nr, sym) [nr] = sym, asmlinkage const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {/*
arch/x86/entry/syscall_x32.c +3 -3
@@ -8,13 +8,13 @@#include <asm/unistd.h> #include <asm/syscall.h> -#define __SYSCALL_64 (nr, sym, qual) +#define __SYSCALL_64 (nr, sym) -#define __SYSCALL_X32 (nr, sym, qual) extern asmlinkage long sym(const struct pt_regs *); +#define __SYSCALL_X32 (nr, sym) extern asmlinkage long sym(const struct pt_regs *);#include <asm/syscalls_64.h> #undef __SYSCALL_X32 -#define __SYSCALL_X32 (nr, sym, qual) [nr] = sym, +#define __SYSCALL_X32 (nr, sym) [nr] = sym, asmlinkage const sys_call_ptr_t x32_sys_call_table[__NR_x32_syscall_max+1] = {/*
arch/x86/entry/syscalls/syscalltbl.sh +1 -9
@@ -9,15 +9,7 @@ syscall_macro() { local nr="$2" local entry="$3" - # Entry can be either just a function name or "function/qualifier" - real_entry="${entry%%/*}" - if [ "$entry" = "$real_entry" ]; then - qualifier= - else - qualifier=${entry#*/} - fi - - echo "__SYSCALL_${abi}($nr, $real_entry, $qualifier)" + echo "__SYSCALL_${abi}($nr, $entry)" } emit() {
arch/x86/um/sys_call_table_32.c +2 -2
@@ -26,11 +26,11 @@#define old_mmap sys_old_mmap -#define __SYSCALL_I386 (nr, sym, qual) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long) ; +#define __SYSCALL_I386 (nr, sym) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long) ;#include <asm/syscalls_32.h> #undef __SYSCALL_I386 -#define __SYSCALL_I386 (nr, sym, qual) [ nr ] = sym, +#define __SYSCALL_I386 (nr, sym) [ nr ] = sym,extern asmlinkage long sys_ni_syscall (unsigned long ,unsigned long ,unsigned long ,unsigned long ,unsigned long ,unsigned long );
arch/x86/um/sys_call_table_64.c +2 -2
@@ -36,11 +36,11 @@#define stub_execveat sys_execveat#define stub_rt_sigreturn sys_rt_sigreturn -#define __SYSCALL_64 (nr, sym, qual) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long) ; +#define __SYSCALL_64 (nr, sym) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long) ;#include <asm/syscalls_64.h> #undef __SYSCALL_64 -#define __SYSCALL_64 (nr, sym, qual) [ nr ] = sym, +#define __SYSCALL_64 (nr, sym) [ nr ] = sym,extern asmlinkage long sys_ni_syscall (unsigned long ,unsigned long ,unsigned long ,unsigned long ,unsigned long ,unsigned long );
Signature · 1 line
2.24.1
Re: [PATCH v4 10/18] x86: Remove syscall qualifier support
Quoted 3 lines · Brian Gerst
Syscall qualifier support is no longer needed.
Signed-off-by Brian Gerst <[email protected]>
Thanks,
Dominik
[tip: x86/entry] x86/entry: Remove syscall qualifier support
In reply to Brian GerstThe following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: b5592e5c0d8682e0e82b42c91fd7265c3cce19e1 Gitweb: https://git.kernel.org/tip/b5592e5c0d8682e0e82b42c91fd7265c3cce19e1 Author: Brian Gerst <[email protected]> AuthorDate: Fri, 13 Mar 2020 15:51:36 -04:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:22 +01:00
x86/entry: Remove syscall qualifier support
Syscall qualifier support is no longer needed.
--- arch/x86/entry/syscall_32.c | 6 +++--- arch/x86/entry/syscall_64.c | 6 +++--- arch/x86/entry/syscall_x32.c | 6 +++--- arch/x86/entry/syscalls/syscalltbl.sh | 10 +--------- arch/x86/um/sys_call_table_32.c | 4 ++-- arch/x86/um/sys_call_table_64.c | 4 ++-- 6 files changed, 14 insertions(+), 22 deletions(-)
arch/x86/entry/syscall_32.c +3 -3
@@ -9,10 +9,10 @@#ifdef CONFIG_IA32_EMULATION /* On X86_64, we use struct pt_regs * to pass parameters to syscalls */ -#define __SYSCALL_I386 (nr, sym, qual) extern asmlinkage long sym(const struct pt_regs *); +#define __SYSCALL_I386 (nr, sym) extern asmlinkage long sym(const struct pt_regs *);#define __sys_ni_syscall __ia32_sys_ni_syscall#else /* CONFIG_IA32_EMULATION */ -#define __SYSCALL_I386 (nr, sym, qual) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long); +#define __SYSCALL_I386 (nr, sym) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long);extern asmlinkage long sys_ni_syscall (unsigned long ,unsigned long ,unsigned long ,unsigned long ,unsigned long ,unsigned long );#define __sys_ni_syscall sys_ni_syscall#endif /* CONFIG_IA32_EMULATION */
@@ -20,7 +20,7 @@ extern asmlinkage long sys_ni_syscall(unsigned long, unsigned long, unsigned lon#include <asm/syscalls_32.h> #undef __SYSCALL_I386 -#define __SYSCALL_I386 (nr, sym, qual) [nr] = sym, +#define __SYSCALL_I386 (nr, sym) [nr] = sym, __visible const sys_call_ptr_t ia32_sys_call_table[__NR_ia32_syscall_max+1] = {/*
arch/x86/entry/syscall_64.c +3 -3
@@ -8,13 +8,13 @@#include <asm/unistd.h> #include <asm/syscall.h> -#define __SYSCALL_X32 (nr, sym, qual) +#define __SYSCALL_X32 (nr, sym) -#define __SYSCALL_64 (nr, sym, qual) extern asmlinkage long sym(const struct pt_regs *); +#define __SYSCALL_64 (nr, sym) extern asmlinkage long sym(const struct pt_regs *);#include <asm/syscalls_64.h> #undef __SYSCALL_64 -#define __SYSCALL_64 (nr, sym, qual) [nr] = sym, +#define __SYSCALL_64 (nr, sym) [nr] = sym, asmlinkage const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {/*
arch/x86/entry/syscall_x32.c +3 -3
@@ -8,13 +8,13 @@#include <asm/unistd.h> #include <asm/syscall.h> -#define __SYSCALL_64 (nr, sym, qual) +#define __SYSCALL_64 (nr, sym) -#define __SYSCALL_X32 (nr, sym, qual) extern asmlinkage long sym(const struct pt_regs *); +#define __SYSCALL_X32 (nr, sym) extern asmlinkage long sym(const struct pt_regs *);#include <asm/syscalls_64.h> #undef __SYSCALL_X32 -#define __SYSCALL_X32 (nr, sym, qual) [nr] = sym, +#define __SYSCALL_X32 (nr, sym) [nr] = sym, asmlinkage const sys_call_ptr_t x32_sys_call_table[__NR_x32_syscall_max+1] = {/*
arch/x86/entry/syscalls/syscalltbl.sh +1 -9
@@ -9,15 +9,7 @@ syscall_macro() { local nr="$2" local entry="$3" - # Entry can be either just a function name or "function/qualifier" - real_entry="${entry%%/*}" - if [ "$entry" = "$real_entry" ]; then - qualifier= - else - qualifier=${entry#*/} - fi - - echo "__SYSCALL_${abi}($nr, $real_entry, $qualifier)" + echo "__SYSCALL_${abi}($nr, $entry)" } emit() {
arch/x86/um/sys_call_table_32.c +2 -2
@@ -26,11 +26,11 @@#define old_mmap sys_old_mmap -#define __SYSCALL_I386 (nr, sym, qual) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long) ; +#define __SYSCALL_I386 (nr, sym) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long) ;#include <asm/syscalls_32.h> #undef __SYSCALL_I386 -#define __SYSCALL_I386 (nr, sym, qual) [ nr ] = sym, +#define __SYSCALL_I386 (nr, sym) [ nr ] = sym,extern asmlinkage long sys_ni_syscall (unsigned long ,unsigned long ,unsigned long ,unsigned long ,unsigned long ,unsigned long );
arch/x86/um/sys_call_table_64.c +2 -2
@@ -36,11 +36,11 @@#define stub_execveat sys_execveat#define stub_rt_sigreturn sys_rt_sigreturn -#define __SYSCALL_64 (nr, sym, qual) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long) ; +#define __SYSCALL_64 (nr, sym) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long) ;#include <asm/syscalls_64.h> #undef __SYSCALL_64 -#define __SYSCALL_64 (nr, sym, qual) [ nr ] = sym, +#define __SYSCALL_64 (nr, sym) [ nr ] = sym,extern asmlinkage long sys_ni_syscall (unsigned long ,unsigned long ,unsigned long ,unsigned long ,unsigned long ,unsigned long );
PATCH v4 11/18 x86-64: Add __SYSCALL_COMMON()
In reply to Brian GerstAdd a __SYSCALL_COMMON() macro to the syscall table, which simplifies syscalltbl.sh.
--- arch/x86/entry/syscall_64.c | 1 + arch/x86/entry/syscall_x32.c | 3 +++ arch/x86/entry/syscalls/syscalltbl.sh | 22 ++-------------------- arch/x86/um/sys_call_table_64.c | 3 +++ 4 files changed, 9 insertions(+), 20 deletions(-)
arch/x86/entry/syscall_64.c +1 -0
@@ -9,6 +9,7 @@#include <asm/syscall.h> #define __SYSCALL_X32 (nr, sym) +#define __SYSCALL_COMMON (nr, sym) __SYSCALL_64(nr, sym)#define __SYSCALL_64 (nr, sym) extern asmlinkage long sym(const struct pt_regs *);#include <asm/syscalls_64.h>
arch/x86/entry/syscall_x32.c +3 -0
@@ -11,10 +11,13 @@#define __SYSCALL_64 (nr, sym)#define __SYSCALL_X32 (nr, sym) extern asmlinkage long sym(const struct pt_regs *); +#define __SYSCALL_COMMON (nr, sym) extern asmlinkage long sym(const struct pt_regs *);#include <asm/syscalls_64.h> #undef __SYSCALL_X32 +#undef __SYSCALL_COMMON#define __SYSCALL_X32 (nr, sym) [nr] = sym, +#define __SYSCALL_COMMON (nr, sym) [nr] = sym, asmlinkage const sys_call_ptr_t x32_sys_call_table[__NR_x32_syscall_max+1] = {/*
arch/x86/entry/syscalls/syscalltbl.sh +2 -20
@@ -25,7 +25,7 @@ emit() { fi # For CONFIG_UML, we need to strip the __x64_sys prefix - if [ "$abi" = "64" -a "${entry}" != "${entry#__x64_sys}" ]; then + if [ "${entry}" != "${entry#__x64_sys}" ]; then umlentry="sys${entry#__x64_sys}" fi
@@ -53,24 +53,6 @@ emit() { grep '^[0-9]' "$in" | sort -n | ( while read nr abi name entry compat; do abi=`echo "$abi" | tr '[a-z]' '[A-Z]'` - if [ "$abi" = "COMMON" -o "$abi" = "64" ]; then - emit 64 "$nr" "$entry" "$compat" - if [ "$abi" = "COMMON" ]; then - # COMMON means that this syscall exists in the same form for - # 64-bit and X32. - echo "#ifdef CONFIG_X86_X32_ABI" - emit X32 "$nr" "$entry" "$compat" - echo "#endif" - fi - elif [ "$abi" = "X32" ]; then - echo "#ifdef CONFIG_X86_X32_ABI" - emit X32 "$nr" "$entry" "$compat" - echo "#endif" - elif [ "$abi" = "I386" ]; then - emit "$abi" "$nr" "$entry" "$compat" - else - echo "Unknown abi $abi" >&2 - exit 1 - fi + emit "$abi" "$nr" "$entry" "$compat" done ) > "$out"
arch/x86/um/sys_call_table_64.c +3 -0
@@ -36,6 +36,9 @@#define stub_execveat sys_execveat#define stub_rt_sigreturn sys_rt_sigreturn +#define __SYSCALL_X32 (nr, sym) +#define __SYSCALL_COMMON (nr, sym) __SYSCALL_64(nr, sym) +#define __SYSCALL_64 (nr, sym) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long) ;#include <asm/syscalls_64.h>
Signature · 1 line
2.24.1
[tip: x86/entry] x86/entry/64: Add __SYSCALL_COMMON()
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 8210efcb153625d2bf4bb79875ddc78eee2aba3e Gitweb: https://git.kernel.org/tip/8210efcb153625d2bf4bb79875ddc78eee2aba3e Author: Brian Gerst <[email protected]> AuthorDate: Fri, 13 Mar 2020 15:51:37 -04:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:22 +01:00
x86/entry/64: Add __SYSCALL_COMMON()
Add a __SYSCALL_COMMON() macro to the syscall table, which simplifies syscalltbl.sh.
--- arch/x86/entry/syscall_64.c | 1 + arch/x86/entry/syscall_x32.c | 3 +++ arch/x86/entry/syscalls/syscalltbl.sh | 22 ++-------------------- arch/x86/um/sys_call_table_64.c | 3 +++ 4 files changed, 9 insertions(+), 20 deletions(-)
arch/x86/entry/syscall_64.c +1 -0
@@ -9,6 +9,7 @@#include <asm/syscall.h> #define __SYSCALL_X32 (nr, sym) +#define __SYSCALL_COMMON (nr, sym) __SYSCALL_64(nr, sym)#define __SYSCALL_64 (nr, sym) extern asmlinkage long sym(const struct pt_regs *);#include <asm/syscalls_64.h>
arch/x86/entry/syscall_x32.c +3 -0
@@ -11,10 +11,13 @@#define __SYSCALL_64 (nr, sym)#define __SYSCALL_X32 (nr, sym) extern asmlinkage long sym(const struct pt_regs *); +#define __SYSCALL_COMMON (nr, sym) extern asmlinkage long sym(const struct pt_regs *);#include <asm/syscalls_64.h> #undef __SYSCALL_X32 +#undef __SYSCALL_COMMON#define __SYSCALL_X32 (nr, sym) [nr] = sym, +#define __SYSCALL_COMMON (nr, sym) [nr] = sym, asmlinkage const sys_call_ptr_t x32_sys_call_table[__NR_x32_syscall_max+1] = {/*
arch/x86/entry/syscalls/syscalltbl.sh +2 -20
@@ -25,7 +25,7 @@ emit() { fi # For CONFIG_UML, we need to strip the __x64_sys prefix - if [ "$abi" = "64" -a "${entry}" != "${entry#__x64_sys}" ]; then + if [ "${entry}" != "${entry#__x64_sys}" ]; then umlentry="sys${entry#__x64_sys}" fi
@@ -53,24 +53,6 @@ emit() { grep '^[0-9]' "$in" | sort -n | ( while read nr abi name entry compat; do abi=`echo "$abi" | tr '[a-z]' '[A-Z]'` - if [ "$abi" = "COMMON" -o "$abi" = "64" ]; then - emit 64 "$nr" "$entry" "$compat" - if [ "$abi" = "COMMON" ]; then - # COMMON means that this syscall exists in the same form for - # 64-bit and X32. - echo "#ifdef CONFIG_X86_X32_ABI" - emit X32 "$nr" "$entry" "$compat" - echo "#endif" - fi - elif [ "$abi" = "X32" ]; then - echo "#ifdef CONFIG_X86_X32_ABI" - emit X32 "$nr" "$entry" "$compat" - echo "#endif" - elif [ "$abi" = "I386" ]; then - emit "$abi" "$nr" "$entry" "$compat" - else - echo "Unknown abi $abi" >&2 - exit 1 - fi + emit "$abi" "$nr" "$entry" "$compat" done ) > "$out"
arch/x86/um/sys_call_table_64.c +3 -0
@@ -36,6 +36,9 @@#define stub_execveat sys_execveat#define stub_rt_sigreturn sys_rt_sigreturn +#define __SYSCALL_X32 (nr, sym) +#define __SYSCALL_COMMON (nr, sym) __SYSCALL_64(nr, sym) +#define __SYSCALL_64 (nr, sym) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long) ;#include <asm/syscalls_64.h>
PATCH v4 12/18 x86: Remove ABI prefixes from functions in syscall tables
In reply to Brian GerstMove the ABI prefixes to the __SYSCALL_[abi]() macros. This allows removal of the need to strip the prefix for UML.
--- arch/x86/entry/syscall_32.c | 6 +- arch/x86/entry/syscall_64.c | 4 +- arch/x86/entry/syscall_x32.c | 8 +- arch/x86/entry/syscalls/syscall_32.tbl | 818 ++++++++++++------------- arch/x86/entry/syscalls/syscall_64.tbl | 740 +++++++++++----------- arch/x86/entry/syscalls/syscalltbl.sh | 14 +- 6 files changed, 791 insertions(+), 799 deletions(-)
arch/x86/entry/syscall_32.c +5 -1
@@ -9,7 +9,7 @@#ifdef CONFIG_IA32_EMULATION /* On X86_64, we use struct pt_regs * to pass parameters to syscalls */ -#define __SYSCALL_I386 (nr, sym) extern asmlinkage long sym(const struct pt_regs *); +#define __SYSCALL_I386 (nr, sym) extern asmlinkage long __ia32_##sym(const struct pt_regs *);#define __sys_ni_syscall __ia32_sys_ni_syscall#else /* CONFIG_IA32_EMULATION */ #define __SYSCALL_I386 (nr, sym) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long);
@@ -20,7 +20,11 @@ extern asmlinkage long sys_ni_syscall(unsigned long, unsigned long, unsigned lon#include <asm/syscalls_32.h> #undef __SYSCALL_I386 +#ifdef CONFIG_IA32_EMULATION +#define __SYSCALL_I386 (nr, sym) [nr] = __ia32_##sym, +#else /* CONFIG_IA32_EMULATION */ #define __SYSCALL_I386 (nr, sym) [nr] = sym, +#endif /* CONFIG_IA32_EMULATION */ __visible const sys_call_ptr_t ia32_sys_call_table[__NR_ia32_syscall_max+1] = {/*
arch/x86/entry/syscall_64.c +2 -2
@@ -11,11 +11,11 @@#define __SYSCALL_X32 (nr, sym)#define __SYSCALL_COMMON (nr, sym) __SYSCALL_64(nr, sym) -#define __SYSCALL_64 (nr, sym) extern asmlinkage long sym(const struct pt_regs *); +#define __SYSCALL_64 (nr, sym) extern asmlinkage long __x64_##sym(const struct pt_regs *);#include <asm/syscalls_64.h> #undef __SYSCALL_64 -#define __SYSCALL_64 (nr, sym) [nr] = sym, +#define __SYSCALL_64 (nr, sym) [nr] = __x64_##sym, asmlinkage const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {/*
arch/x86/entry/syscall_x32.c +4 -4
@@ -10,14 +10,14 @@#define __SYSCALL_64 (nr, sym) -#define __SYSCALL_X32 (nr, sym) extern asmlinkage long sym(const struct pt_regs *); -#define __SYSCALL_COMMON (nr, sym) extern asmlinkage long sym(const struct pt_regs *); +#define __SYSCALL_X32 (nr, sym) extern asmlinkage long __x32_##sym(const struct pt_regs *); +#define __SYSCALL_COMMON (nr, sym) extern asmlinkage long __x64_##sym(const struct pt_regs *);#include <asm/syscalls_64.h> #undef __SYSCALL_X32#undef __SYSCALL_COMMON -#define __SYSCALL_X32 (nr, sym) [nr] = sym, -#define __SYSCALL_COMMON (nr, sym) [nr] = sym, +#define __SYSCALL_X32 (nr, sym) [nr] = __x32_##sym, +#define __SYSCALL_COMMON (nr, sym) [nr] = __x64_##sym, asmlinkage const sys_call_ptr_t x32_sys_call_table[__NR_x32_syscall_max+1] = {/*
arch/x86/entry/syscalls/syscall_32.tbl +409 -409
843 lines not on this page · raw message
arch/x86/entry/syscalls/syscall_64.tbl +370 -370
766 lines not on this page · raw message
arch/x86/entry/syscalls/syscalltbl.sh +1 -13
@@ -17,27 +17,15 @@ emit() { local nr="$2" local entry="$3" local compat="$4" - local umlentry="" if [ "$abi" != "I386" -a -n "$compat" ]; then echo "a compat entry ($abi: $compat) for a 64-bit syscall makes no sense" >&2 exit 1 fi - # For CONFIG_UML, we need to strip the __x64_sys prefix - if [ "${entry}" != "${entry#__x64_sys}" ]; then - umlentry="sys${entry#__x64_sys}" - fi - if [ -z "$compat" ]; then - if [ -n "$entry" -a -z "$umlentry" ]; then - syscall_macro "$abi" "$nr" "$entry" - elif [ -n "$umlentry" ]; then # implies -n "$entry" - echo "#ifdef CONFIG_X86" + if [ -n "$entry" ]; then syscall_macro "$abi" "$nr" "$entry" - echo "#else /* CONFIG_UML */" - syscall_macro "$abi" "$nr" "$umlentry" - echo "#endif" fi else echo "#ifdef CONFIG_X86_32"
Signature · 1 line
2.24.1
[tip: x86/entry] x86/entry: Remove ABI prefixes from functions in syscall tables
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: cab56d3484d4bb8b21e4d9500392ac1ce99af026 Gitweb: https://git.kernel.org/tip/cab56d3484d4bb8b21e4d9500392ac1ce99af026 Author: Brian Gerst <[email protected]> AuthorDate: Fri, 13 Mar 2020 15:51:38 -04:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:23 +01:00
x86/entry: Remove ABI prefixes from functions in syscall tables
Move the ABI prefixes to the __SYSCALL_[abi]() macros. This allows removal of the need to strip the prefix for UML.
--- arch/x86/entry/syscall_32.c | 6 +- arch/x86/entry/syscall_64.c | 4 +- arch/x86/entry/syscall_x32.c | 8 +- arch/x86/entry/syscalls/syscall_32.tbl | 818 ++++++++++++------------ arch/x86/entry/syscalls/syscall_64.tbl | 740 +++++++++++----------- arch/x86/entry/syscalls/syscalltbl.sh | 14 +- 6 files changed, 791 insertions(+), 799 deletions(-)
arch/x86/entry/syscall_32.c +5 -1
@@ -9,7 +9,7 @@#ifdef CONFIG_IA32_EMULATION /* On X86_64, we use struct pt_regs * to pass parameters to syscalls */ -#define __SYSCALL_I386 (nr, sym) extern asmlinkage long sym(const struct pt_regs *); +#define __SYSCALL_I386 (nr, sym) extern asmlinkage long __ia32_##sym(const struct pt_regs *);#define __sys_ni_syscall __ia32_sys_ni_syscall#else /* CONFIG_IA32_EMULATION */ #define __SYSCALL_I386 (nr, sym) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long);
@@ -20,7 +20,11 @@ extern asmlinkage long sys_ni_syscall(unsigned long, unsigned long, unsigned lon#include <asm/syscalls_32.h> #undef __SYSCALL_I386 +#ifdef CONFIG_IA32_EMULATION +#define __SYSCALL_I386 (nr, sym) [nr] = __ia32_##sym, +#else /* CONFIG_IA32_EMULATION */ #define __SYSCALL_I386 (nr, sym) [nr] = sym, +#endif /* CONFIG_IA32_EMULATION */ __visible const sys_call_ptr_t ia32_sys_call_table[__NR_ia32_syscall_max+1] = {/*
arch/x86/entry/syscall_64.c +2 -2
@@ -11,11 +11,11 @@#define __SYSCALL_X32 (nr, sym)#define __SYSCALL_COMMON (nr, sym) __SYSCALL_64(nr, sym) -#define __SYSCALL_64 (nr, sym) extern asmlinkage long sym(const struct pt_regs *); +#define __SYSCALL_64 (nr, sym) extern asmlinkage long __x64_##sym(const struct pt_regs *);#include <asm/syscalls_64.h> #undef __SYSCALL_64 -#define __SYSCALL_64 (nr, sym) [nr] = sym, +#define __SYSCALL_64 (nr, sym) [nr] = __x64_##sym, asmlinkage const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {/*
arch/x86/entry/syscall_x32.c +4 -4
@@ -10,14 +10,14 @@#define __SYSCALL_64 (nr, sym) -#define __SYSCALL_X32 (nr, sym) extern asmlinkage long sym(const struct pt_regs *); -#define __SYSCALL_COMMON (nr, sym) extern asmlinkage long sym(const struct pt_regs *); +#define __SYSCALL_X32 (nr, sym) extern asmlinkage long __x32_##sym(const struct pt_regs *); +#define __SYSCALL_COMMON (nr, sym) extern asmlinkage long __x64_##sym(const struct pt_regs *);#include <asm/syscalls_64.h> #undef __SYSCALL_X32#undef __SYSCALL_COMMON -#define __SYSCALL_X32 (nr, sym) [nr] = sym, -#define __SYSCALL_COMMON (nr, sym) [nr] = sym, +#define __SYSCALL_X32 (nr, sym) [nr] = __x32_##sym, +#define __SYSCALL_COMMON (nr, sym) [nr] = __x64_##sym, asmlinkage const sys_call_ptr_t x32_sys_call_table[__NR_x32_syscall_max+1] = {/*
arch/x86/entry/syscalls/syscall_32.tbl +409 -409
843 lines not on this page · raw message
arch/x86/entry/syscalls/syscall_64.tbl +370 -370
766 lines not on this page · raw message
arch/x86/entry/syscalls/syscalltbl.sh +1 -13
@@ -17,27 +17,15 @@ emit() { local nr="$2" local entry="$3" local compat="$4" - local umlentry="" if [ "$abi" != "I386" -a -n "$compat" ]; then echo "a compat entry ($abi: $compat) for a 64-bit syscall makes no sense" >&2 exit 1 fi - # For CONFIG_UML, we need to strip the __x64_sys prefix - if [ "${entry}" != "${entry#__x64_sys}" ]; then - umlentry="sys${entry#__x64_sys}" - fi - if [ -z "$compat" ]; then - if [ -n "$entry" -a -z "$umlentry" ]; then - syscall_macro "$abi" "$nr" "$entry" - elif [ -n "$umlentry" ]; then # implies -n "$entry" - echo "#ifdef CONFIG_X86" + if [ -n "$entry" ]; then syscall_macro "$abi" "$nr" "$entry" - echo "#else /* CONFIG_UML */" - syscall_macro "$abi" "$nr" "$umlentry" - echo "#endif" fi else echo "#ifdef CONFIG_X86_32"
PATCH v4 13/18 x86: Clean up syscall_32.tbl
In reply to Brian GerstAfter removal of the __ia32_ prefix, remove compat entries that are now identical to the native entry.
Converted with this script and fixing up whitespace:
while read nr abi name entry compat; do
if [ "${nr:0:1}" = "#" ]; then
echo $nr $abi $name $entry $compat
continue
fi
if [ "$entry" = "$compat" ]; then
compat=""
fi
echo "$nr $abi $name $entry $compat"done
--- arch/x86/entry/syscalls/syscall_32.tbl | 578 ++++++++++++------------- 1 file changed, 289 insertions(+), 289 deletions(-)
arch/x86/entry/syscalls/syscall_32.tbl +289 -289
@@ -11,179 +11,179 @@ # # The abi is always "i386" for this file. # -0 i386 restart_syscall sys_restart_syscall sys_restart_syscall -1 i386 exit sys_exit sys_exit -2 i386 fork sys_fork sys_fork -3 i386 read sys_read sys_read -4 i386 write sys_write sys_write +0 i386 restart_syscall sys_restart_syscall +1 i386 exit sys_exit +2 i386 fork sys_fork +3 i386 read sys_read +4 i386 write sys_write 5 i386 open sys_open compat_sys_open -6 i386 close sys_close sys_close -7 i386 waitpid sys_waitpid sys_waitpid -8 i386 creat sys_creat sys_creat -9 i386 link sys_link sys_link -10 i386 unlink sys_unlink sys_unlink +6 i386 close sys_close +7 i386 waitpid sys_waitpid +8 i386 creat sys_creat +9 i386 link sys_link +10 i386 unlink sys_unlink 11 i386 execve sys_execve compat_sys_execve -12 i386 chdir sys_chdir sys_chdir -13 i386 time sys_time32 sys_time32 -14 i386 mknod sys_mknod sys_mknod -15 i386 chmod sys_chmod sys_chmod -16 i386 lchown sys_lchown16 sys_lchown16 +12 i386 chdir sys_chdir +13 i386 time sys_time32 +14 i386 mknod sys_mknod +15 i386 chmod sys_chmod +16 i386 lchown sys_lchown16 17 i386 break -18 i386 oldstat sys_stat sys_stat +18 i386 oldstat sys_stat 19 i386 lseek sys_lseek compat_sys_lseek -20 i386 getpid sys_getpid sys_getpid +20 i386 getpid sys_getpid 21 i386 mount sys_mount compat_sys_mount -22 i386 umount sys_oldumount sys_oldumount -23 i386 setuid sys_setuid16 sys_setuid16 -24 i386 getuid sys_getuid16 sys_getuid16 -25 i386 stime sys_stime32 sys_stime32 +22 i386 umount sys_oldumount +23 i386 setuid sys_setuid16 +24 i386 getuid sys_getuid16 +25 i386 stime sys_stime32 26 i386 ptrace sys_ptrace compat_sys_ptrace -27 i386 alarm sys_alarm sys_alarm -28 i386 oldfstat sys_fstat sys_fstat -29 i386 pause sys_pause sys_pause -30 i386 utime sys_utime32 sys_utime32 +27 i386 alarm sys_alarm +28 i386 oldfstat sys_fstat +29 i386 pause sys_pause +30 i386 utime sys_utime32 31 i386 stty 32 i386 gtty -33 i386 access sys_access sys_access -34 i386 nice sys_nice sys_nice +33 i386 access sys_access +34 i386 nice sys_nice 35 i386 ftime -36 i386 sync sys_sync sys_sync -37 i386 kill sys_kill sys_kill -38 i386 rename sys_rename sys_rename -39 i386 mkdir sys_mkdir sys_mkdir -40 i386 rmdir sys_rmdir sys_rmdir -41 i386 dup sys_dup sys_dup -42 i386 pipe sys_pipe sys_pipe +36 i386 sync sys_sync +37 i386 kill sys_kill +38 i386 rename sys_rename +39 i386 mkdir sys_mkdir +40 i386 rmdir sys_rmdir +41 i386 dup sys_dup +42 i386 pipe sys_pipe 43 i386 times sys_times compat_sys_times 44 i386 prof -45 i386 brk sys_brk sys_brk -46 i386 setgid sys_setgid16 sys_setgid16 -47 i386 getgid sys_getgid16 sys_getgid16 -48 i386 signal sys_signal sys_signal -49 i386 geteuid sys_geteuid16 sys_geteuid16 -50 i386 getegid sys_getegid16 sys_getegid16 -51 i386 acct sys_acct sys_acct -52 i386 umount2 sys_umount sys_umount +45 i386 brk sys_brk +46 i386 setgid sys_setgid16 +47 i386 getgid sys_getgid16 +48 i386 signal sys_signal +49 i386 geteuid sys_geteuid16 +50 i386 getegid sys_getegid16 +51 i386 acct sys_acct +52 i386 umount2 sys_umount 53 i386 lock 54 i386 ioctl sys_ioctl compat_sys_ioctl 55 i386 fcntl sys_fcntl compat_sys_fcntl64 56 i386 mpx -57 i386 setpgid sys_setpgid sys_setpgid +57 i386 setpgid sys_setpgid 58 i386 ulimit -59 i386 oldolduname sys_olduname sys_olduname -60 i386 umask sys_umask sys_umask -61 i386 chroot sys_chroot sys_chroot +59 i386 oldolduname sys_olduname +60 i386 umask sys_umask +61 i386 chroot sys_chroot 62 i386 ustat sys_ustat compat_sys_ustat -63 i386 dup2 sys_dup2 sys_dup2 -64 i386 getppid sys_getppid sys_getppid -65 i386 getpgrp sys_getpgrp sys_getpgrp -66 i386 setsid sys_setsid sys_setsid +63 i386 dup2 sys_dup2 +64 i386 getppid sys_getppid +65 i386 getpgrp sys_getpgrp +66 i386 setsid sys_setsid 67 i386 sigaction sys_sigaction compat_sys_sigaction -68 i386 sgetmask sys_sgetmask sys_sgetmask -69 i386 ssetmask sys_ssetmask sys_ssetmask -70 i386 setreuid sys_setreuid16 sys_setreuid16 -71 i386 setregid sys_setregid16 sys_setregid16 -72 i386 sigsuspend sys_sigsuspend sys_sigsuspend +68 i386 sgetmask sys_sgetmask +69 i386 ssetmask sys_ssetmask +70 i386 setreuid sys_setreuid16 +71 i386 setregid sys_setregid16 +72 i386 sigsuspend sys_sigsuspend 73 i386 sigpending sys_sigpending compat_sys_sigpending -74 i386 sethostname sys_sethostname sys_sethostname +74 i386 sethostname sys_sethostname 75 i386 setrlimit sys_setrlimit compat_sys_setrlimit 76 i386 getrlimit sys_old_getrlimit compat_sys_old_getrlimit 77 i386 getrusage sys_getrusage compat_sys_getrusage 78 i386 gettimeofday sys_gettimeofday compat_sys_gettimeofday 79 i386 settimeofday sys_settimeofday compat_sys_settimeofday -80 i386 getgroups sys_getgroups16 sys_getgroups16 -81 i386 setgroups sys_setgroups16 sys_setgroups16 +80 i386 getgroups sys_getgroups16 +81 i386 setgroups sys_setgroups16 82 i386 select sys_old_select compat_sys_old_select -83 i386 symlink sys_symlink sys_symlink -84 i386 oldlstat sys_lstat sys_lstat -85 i386 readlink sys_readlink sys_readlink -86 i386 uselib sys_uselib sys_uselib -87 i386 swapon sys_swapon sys_swapon -88 i386 reboot sys_reboot sys_reboot +83 i386 symlink sys_symlink +84 i386 oldlstat sys_lstat +85 i386 readlink sys_readlink +86 i386 uselib sys_uselib +87 i386 swapon sys_swapon +88 i386 reboot sys_reboot 89 i386 readdir sys_old_readdir compat_sys_old_readdir 90 i386 mmap sys_old_mmap compat_sys_x86_mmap -91 i386 munmap sys_munmap sys_munmap +91 i386 munmap sys_munmap 92 i386 truncate sys_truncate compat_sys_truncate 93 i386 ftruncate sys_ftruncate compat_sys_ftruncate -94 i386 fchmod sys_fchmod sys_fchmod -95 i386 fchown sys_fchown16 sys_fchown16 -96 i386 getpriority sys_getpriority sys_getpriority -97 i386 setpriority sys_setpriority sys_setpriority +94 i386 fchmod sys_fchmod +95 i386 fchown sys_fchown16 +96 i386 getpriority sys_getpriority +97 i386 setpriority sys_setpriority 98 i386 profil 99 i386 statfs sys_statfs compat_sys_statfs 100 i386 fstatfs sys_fstatfs compat_sys_fstatfs -101 i386 ioperm sys_ioperm sys_ioperm +101 i386 ioperm sys_ioperm 102 i386 socketcall sys_socketcall compat_sys_socketcall -103 i386 syslog sys_syslog sys_syslog +103 i386 syslog sys_syslog 104 i386 setitimer sys_setitimer compat_sys_setitimer 105 i386 getitimer sys_getitimer compat_sys_getitimer 106 i386 stat sys_newstat compat_sys_newstat 107 i386 lstat sys_newlstat compat_sys_newlstat 108 i386 fstat sys_newfstat compat_sys_newfstat -109 i386 olduname sys_uname sys_uname -110 i386 iopl sys_iopl sys_iopl -111 i386 vhangup sys_vhangup sys_vhangup +109 i386 olduname sys_uname +110 i386 iopl sys_iopl +111 i386 vhangup sys_vhangup 112 i386 idle 113 i386 vm86old sys_vm86old sys_ni_syscall 114 i386 wait4 sys_wait4 compat_sys_wait4 -115 i386 swapoff sys_swapoff sys_swapoff +115 i386 swapoff sys_swapoff 116 i386 sysinfo sys_sysinfo compat_sys_sysinfo 117 i386 ipc sys_ipc compat_sys_ipc -118 i386 fsync sys_fsync sys_fsync +118 i386 fsync sys_fsync 119 i386 sigreturn sys_sigreturn compat_sys_sigreturn 120 i386 clone sys_clone compat_sys_x86_clone -121 i386 setdomainname sys_setdomainname sys_setdomainname -122 i386 uname sys_newuname sys_newuname -123 i386 modify_ldt sys_modify_ldt sys_modify_ldt -124 i386 adjtimex sys_adjtimex_time32 sys_adjtimex_time32 -125 i386 mprotect sys_mprotect sys_mprotect +121 i386 setdomainname sys_setdomainname +122 i386 uname sys_newuname +123 i386 modify_ldt sys_modify_ldt +124 i386 adjtimex sys_adjtimex_time32 +125 i386 mprotect sys_mprotect 126 i386 sigprocmask sys_sigprocmask compat_sys_sigprocmask 127 i386 create_module -128 i386 init_module sys_init_module sys_init_module -129 i386 delete_module sys_delete_module sys_delete_module +128 i386 init_module sys_init_module +129 i386 delete_module sys_delete_module 130 i386 get_kernel_syms 131 i386 quotactl sys_quotactl compat_sys_quotactl32 -132 i386 getpgid sys_getpgid sys_getpgid -133 i386 fchdir sys_fchdir sys_fchdir -134 i386 bdflush sys_bdflush sys_bdflush -135 i386 sysfs sys_sysfs sys_sysfs -136 i386 personality sys_personality sys_personality +132 i386 getpgid sys_getpgid +133 i386 fchdir sys_fchdir +134 i386 bdflush sys_bdflush +135 i386 sysfs sys_sysfs +136 i386 personality sys_personality 137 i386 afs_syscall -138 i386 setfsuid sys_setfsuid16 sys_setfsuid16 -139 i386 setfsgid sys_setfsgid16 sys_setfsgid16 -140 i386 _llseek sys_llseek sys_llseek +138 i386 setfsuid sys_setfsuid16 +139 i386 setfsgid sys_setfsgid16 +140 i386 _llseek sys_llseek 141 i386 getdents sys_getdents compat_sys_getdents 142 i386 _newselect sys_select compat_sys_select -143 i386 flock sys_flock sys_flock -144 i386 msync sys_msync sys_msync +143 i386 flock sys_flock +144 i386 msync sys_msync 145 i386 readv sys_readv compat_sys_readv 146 i386 writev sys_writev compat_sys_writev -147 i386 getsid sys_getsid sys_getsid -148 i386 fdatasync sys_fdatasync sys_fdatasync +147 i386 getsid sys_getsid +148 i386 fdatasync sys_fdatasync 149 i386 _sysctl sys_sysctl compat_sys_sysctl -150 i386 mlock sys_mlock sys_mlock -151 i386 munlock sys_munlock sys_munlock -152 i386 mlockall sys_mlockall sys_mlockall -153 i386 munlockall sys_munlockall sys_munlockall -154 i386 sched_setparam sys_sched_setparam sys_sched_setparam -155 i386 sched_getparam sys_sched_getparam sys_sched_getparam -156 i386 sched_setscheduler sys_sched_setscheduler sys_sched_setscheduler -157 i386 sched_getscheduler sys_sched_getscheduler sys_sched_getscheduler -158 i386 sched_yield sys_sched_yield sys_sched_yield -159 i386 sched_get_priority_max sys_sched_get_priority_max sys_sched_get_priority_max -160 i386 sched_get_priority_min sys_sched_get_priority_min sys_sched_get_priority_min -161 i386 sched_rr_get_interval sys_sched_rr_get_interval_time32 sys_sched_rr_get_interval_time32 -162 i386 nanosleep sys_nanosleep_time32 sys_nanosleep_time32 -163 i386 mremap sys_mremap sys_mremap -164 i386 setresuid sys_setresuid16 sys_setresuid16 -165 i386 getresuid sys_getresuid16 sys_getresuid16 +150 i386 mlock sys_mlock +151 i386 munlock sys_munlock +152 i386 mlockall sys_mlockall +153 i386 munlockall sys_munlockall +154 i386 sched_setparam sys_sched_setparam +155 i386 sched_getparam sys_sched_getparam +156 i386 sched_setscheduler sys_sched_setscheduler +157 i386 sched_getscheduler sys_sched_getscheduler +158 i386 sched_yield sys_sched_yield +159 i386 sched_get_priority_max sys_sched_get_priority_max +160 i386 sched_get_priority_min sys_sched_get_priority_min +161 i386 sched_rr_get_interval sys_sched_rr_get_interval_time32 +162 i386 nanosleep sys_nanosleep_time32 +163 i386 mremap sys_mremap +164 i386 setresuid sys_setresuid16 +165 i386 getresuid sys_getresuid16 166 i386 vm86 sys_vm86 sys_ni_syscall 167 i386 query_module -168 i386 poll sys_poll sys_poll +168 i386 poll sys_poll 169 i386 nfsservctl -170 i386 setresgid sys_setresgid16 sys_setresgid16 -171 i386 getresgid sys_getresgid16 sys_getresgid16 -172 i386 prctl sys_prctl sys_prctl +170 i386 setresgid sys_setresgid16 +171 i386 getresgid sys_getresgid16 +172 i386 prctl sys_prctl 173 i386 rt_sigreturn sys_rt_sigreturn compat_sys_rt_sigreturn 174 i386 rt_sigaction sys_rt_sigaction compat_sys_rt_sigaction 175 i386 rt_sigprocmask sys_rt_sigprocmask compat_sys_rt_sigprocmask
@@ -193,252 +193,252 @@ 179 i386 rt_sigsuspend sys_rt_sigsuspend compat_sys_rt_sigsuspend 180 i386 pread64 sys_pread64 compat_sys_x86_pread 181 i386 pwrite64 sys_pwrite64 compat_sys_x86_pwrite -182 i386 chown sys_chown16 sys_chown16 -183 i386 getcwd sys_getcwd sys_getcwd -184 i386 capget sys_capget sys_capget -185 i386 capset sys_capset sys_capset +182 i386 chown sys_chown16 +183 i386 getcwd sys_getcwd +184 i386 capget sys_capget +185 i386 capset sys_capset 186 i386 sigaltstack sys_sigaltstack compat_sys_sigaltstack 187 i386 sendfile sys_sendfile compat_sys_sendfile 188 i386 getpmsg 189 i386 putpmsg -190 i386 vfork sys_vfork sys_vfork +190 i386 vfork sys_vfork 191 i386 ugetrlimit sys_getrlimit compat_sys_getrlimit -192 i386 mmap2 sys_mmap_pgoff sys_mmap_pgoff +192 i386 mmap2 sys_mmap_pgoff 193 i386 truncate64 sys_truncate64 compat_sys_x86_truncate64 194 i386 ftruncate64 sys_ftruncate64 compat_sys_x86_ftruncate64 195 i386 stat64 sys_stat64 compat_sys_x86_stat64 196 i386 lstat64 sys_lstat64 compat_sys_x86_lstat64 197 i386 fstat64 sys_fstat64 compat_sys_x86_fstat64 -198 i386 lchown32 sys_lchown sys_lchown -199 i386 getuid32 sys_getuid sys_getuid -200 i386 getgid32 sys_getgid sys_getgid -201 i386 geteuid32 sys_geteuid sys_geteuid -202 i386 getegid32 sys_getegid sys_getegid -203 i386 setreuid32 sys_setreuid sys_setreuid -204 i386 setregid32 sys_setregid sys_setregid -205 i386 getgroups32 sys_getgroups sys_getgroups -206 i386 setgroups32 sys_setgroups sys_setgroups -207 i386 fchown32 sys_fchown sys_fchown -208 i386 setresuid32 sys_setresuid sys_setresuid -209 i386 getresuid32 sys_getresuid sys_getresuid -210 i386 setresgid32 sys_setresgid sys_setresgid -211 i386 getresgid32 sys_getresgid sys_getresgid -212 i386 chown32 sys_chown sys_chown -213 i386 setuid32 sys_setuid sys_setuid -214 i386 setgid32 sys_setgid sys_setgid -215 i386 setfsuid32 sys_setfsuid sys_setfsuid -216 i386 setfsgid32 sys_setfsgid sys_setfsgid -217 i386 pivot_root sys_pivot_root sys_pivot_root -218 i386 mincore sys_mincore sys_mincore -219 i386 madvise sys_madvise sys_madvise -220 i386 getdents64 sys_getdents64 sys_getdents64 +198 i386 lchown32 sys_lchown +199 i386 getuid32 sys_getuid +200 i386 getgid32 sys_getgid +201 i386 geteuid32 sys_geteuid +202 i386 getegid32 sys_getegid +203 i386 setreuid32 sys_setreuid +204 i386 setregid32 sys_setregid +205 i386 getgroups32 sys_getgroups +206 i386 setgroups32 sys_setgroups +207 i386 fchown32 sys_fchown +208 i386 setresuid32 sys_setresuid +209 i386 getresuid32 sys_getresuid +210 i386 setresgid32 sys_setresgid +211 i386 getresgid32 sys_getresgid +212 i386 chown32 sys_chown +213 i386 setuid32 sys_setuid +214 i386 setgid32 sys_setgid +215 i386 setfsuid32 sys_setfsuid +216 i386 setfsgid32 sys_setfsgid +217 i386 pivot_root sys_pivot_root +218 i386 mincore sys_mincore +219 i386 madvise sys_madvise +220 i386 getdents64 sys_getdents64 221 i386 fcntl64 sys_fcntl64 compat_sys_fcntl64 # 222 is unused # 223 is unused -224 i386 gettid sys_gettid sys_gettid +224 i386 gettid sys_gettid 225 i386 readahead sys_readahead compat_sys_x86_readahead -226 i386 setxattr sys_setxattr sys_setxattr -227 i386 lsetxattr sys_lsetxattr sys_lsetxattr -228 i386 fsetxattr sys_fsetxattr sys_fsetxattr -229 i386 getxattr sys_getxattr sys_getxattr -230 i386 lgetxattr sys_lgetxattr sys_lgetxattr -231 i386 fgetxattr sys_fgetxattr sys_fgetxattr -232 i386 listxattr sys_listxattr sys_listxattr -233 i386 llistxattr sys_llistxattr sys_llistxattr -234 i386 flistxattr sys_flistxattr sys_flistxattr -235 i386 removexattr sys_removexattr sys_removexattr -236 i386 lremovexattr sys_lremovexattr sys_lremovexattr -237 i386 fremovexattr sys_fremovexattr sys_fremovexattr -238 i386 tkill sys_tkill sys_tkill -239 i386 sendfile64 sys_sendfile64 sys_sendfile64 -240 i386 futex sys_futex_time32 sys_futex_time32 +226 i386 setxattr sys_setxattr +227 i386 lsetxattr sys_lsetxattr +228 i386 fsetxattr sys_fsetxattr +229 i386 getxattr sys_getxattr +230 i386 lgetxattr sys_lgetxattr +231 i386 fgetxattr sys_fgetxattr +232 i386 listxattr sys_listxattr +233 i386 llistxattr sys_llistxattr +234 i386 flistxattr sys_flistxattr +235 i386 removexattr sys_removexattr +236 i386 lremovexattr sys_lremovexattr +237 i386 fremovexattr sys_fremovexattr +238 i386 tkill sys_tkill +239 i386 sendfile64 sys_sendfile64 +240 i386 futex sys_futex_time32 241 i386 sched_setaffinity sys_sched_setaffinity compat_sys_sched_setaffinity 242 i386 sched_getaffinity sys_sched_getaffinity compat_sys_sched_getaffinity -243 i386 set_thread_area sys_set_thread_area sys_set_thread_area -244 i386 get_thread_area sys_get_thread_area sys_get_thread_area +243 i386 set_thread_area sys_set_thread_area +244 i386 get_thread_area sys_get_thread_area 245 i386 io_setup sys_io_setup compat_sys_io_setup -246 i386 io_destroy sys_io_destroy sys_io_destroy -247 i386 io_getevents sys_io_getevents_time32 sys_io_getevents_time32 +246 i386 io_destroy sys_io_destroy +247 i386 io_getevents sys_io_getevents_time32 248 i386 io_submit sys_io_submit compat_sys_io_submit -249 i386 io_cancel sys_io_cancel sys_io_cancel +249 i386 io_cancel sys_io_cancel 250 i386 fadvise64 sys_fadvise64 compat_sys_x86_fadvise64 # 251 is available for reuse (was briefly sys_set_zone_reclaim) -252 i386 exit_group sys_exit_group sys_exit_group +252 i386 exit_group sys_exit_group 253 i386 lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie -254 i386 epoll_create sys_epoll_create sys_epoll_create -255 i386 epoll_ctl sys_epoll_ctl sys_epoll_ctl -256 i386 epoll_wait sys_epoll_wait sys_epoll_wait -257 i386 remap_file_pages sys_remap_file_pages sys_remap_file_pages -258 i386 set_tid_address sys_set_tid_address sys_set_tid_address +254 i386 epoll_create sys_epoll_create +255 i386 epoll_ctl sys_epoll_ctl +256 i386 epoll_wait sys_epoll_wait +257 i386 remap_file_pages sys_remap_file_pages +258 i386 set_tid_address sys_set_tid_address 259 i386 timer_create sys_timer_create compat_sys_timer_create -260 i386 timer_settime sys_timer_settime32 sys_timer_settime32 -261 i386 timer_gettime sys_timer_gettime32 sys_timer_gettime32 -262 i386 timer_getoverrun sys_timer_getoverrun sys_timer_getoverrun -263 i386 timer_delete sys_timer_delete sys_timer_delete -264 i386 clock_settime sys_clock_settime32 sys_clock_settime32 -265 i386 clock_gettime sys_clock_gettime32 sys_clock_gettime32 -266 i386 clock_getres sys_clock_getres_time32 sys_clock_getres_time32 -267 i386 clock_nanosleep sys_clock_nanosleep_time32 sys_clock_nanosleep_time32 +260 i386 timer_settime sys_timer_settime32 +261 i386 timer_gettime sys_timer_gettime32 +262 i386 timer_getoverrun sys_timer_getoverrun +263 i386 timer_delete sys_timer_delete +264 i386 clock_settime sys_clock_settime32 +265 i386 clock_gettime sys_clock_gettime32 +266 i386 clock_getres sys_clock_getres_time32 +267 i386 clock_nanosleep sys_clock_nanosleep_time32 268 i386 statfs64 sys_statfs64 compat_sys_statfs64 269 i386 fstatfs64 sys_fstatfs64 compat_sys_fstatfs64 -270 i386 tgkill sys_tgkill sys_tgkill -271 i386 utimes sys_utimes_time32 sys_utimes_time32 +270 i386 tgkill sys_tgkill +271 i386 utimes sys_utimes_time32 272 i386 fadvise64_64 sys_fadvise64_64 compat_sys_x86_fadvise64_64 273 i386 vserver -274 i386 mbind sys_mbind sys_mbind +274 i386 mbind sys_mbind 275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy -276 i386 set_mempolicy sys_set_mempolicy sys_set_mempolicy +276 i386 set_mempolicy sys_set_mempolicy 277 i386 mq_open sys_mq_open compat_sys_mq_open -278 i386 mq_unlink sys_mq_unlink sys_mq_unlink -279 i386 mq_timedsend sys_mq_timedsend_time32 sys_mq_timedsend_time32 -280 i386 mq_timedreceive sys_mq_timedreceive_time32 sys_mq_timedreceive_time32 +278 i386 mq_unlink sys_mq_unlink +279 i386 mq_timedsend sys_mq_timedsend_time32 +280 i386 mq_timedreceive sys_mq_timedreceive_time32 281 i386 mq_notify sys_mq_notify compat_sys_mq_notify 282 i386 mq_getsetattr sys_mq_getsetattr compat_sys_mq_getsetattr 283 i386 kexec_load sys_kexec_load compat_sys_kexec_load 284 i386 waitid sys_waitid compat_sys_waitid # 285 sys_setaltroot -286 i386 add_key sys_add_key sys_add_key -287 i386 request_key sys_request_key sys_request_key +286 i386 add_key sys_add_key +287 i386 request_key sys_request_key 288 i386 keyctl sys_keyctl compat_sys_keyctl -289 i386 ioprio_set sys_ioprio_set sys_ioprio_set -290 i386 ioprio_get sys_ioprio_get sys_ioprio_get -291 i386 inotify_init sys_inotify_init sys_inotify_init -292 i386 inotify_add_watch sys_inotify_add_watch sys_inotify_add_watch -293 i386 inotify_rm_watch sys_inotify_rm_watch sys_inotify_rm_watch -294 i386 migrate_pages sys_migrate_pages sys_migrate_pages +289 i386 ioprio_set sys_ioprio_set +290 i386 ioprio_get sys_ioprio_get +291 i386 inotify_init sys_inotify_init +292 i386 inotify_add_watch sys_inotify_add_watch +293 i386 inotify_rm_watch sys_inotify_rm_watch +294 i386 migrate_pages sys_migrate_pages 295 i386 openat sys_openat compat_sys_openat -296 i386 mkdirat sys_mkdirat sys_mkdirat -297 i386 mknodat sys_mknodat sys_mknodat -298 i386 fchownat sys_fchownat sys_fchownat -299 i386 futimesat sys_futimesat_time32 sys_futimesat_time32 +296 i386 mkdirat sys_mkdirat +297 i386 mknodat sys_mknodat +298 i386 fchownat sys_fchownat +299 i386 futimesat sys_futimesat_time32 300 i386 fstatat64 sys_fstatat64 compat_sys_x86_fstatat -301 i386 unlinkat sys_unlinkat sys_unlinkat -302 i386 renameat sys_renameat sys_renameat -303 i386 linkat sys_linkat sys_linkat -304 i386 symlinkat sys_symlinkat sys_symlinkat -305 i386 readlinkat sys_readlinkat sys_readlinkat -306 i386 fchmodat sys_fchmodat sys_fchmodat -307 i386 faccessat sys_faccessat sys_faccessat +301 i386 unlinkat sys_unlinkat +302 i386 renameat sys_renameat +303 i386 linkat sys_linkat +304 i386 symlinkat sys_symlinkat +305 i386 readlinkat sys_readlinkat +306 i386 fchmodat sys_fchmodat +307 i386 faccessat sys_faccessat 308 i386 pselect6 sys_pselect6_time32 compat_sys_pselect6_time32 309 i386 ppoll sys_ppoll_time32 compat_sys_ppoll_time32 -310 i386 unshare sys_unshare sys_unshare +310 i386 unshare sys_unshare 311 i386 set_robust_list sys_set_robust_list compat_sys_set_robust_list 312 i386 get_robust_list sys_get_robust_list compat_sys_get_robust_list -313 i386 splice sys_splice sys_splice +313 i386 splice sys_splice 314 i386 sync_file_range sys_sync_file_range compat_sys_x86_sync_file_range -315 i386 tee sys_tee sys_tee +315 i386 tee sys_tee 316 i386 vmsplice sys_vmsplice compat_sys_vmsplice 317 i386 move_pages sys_move_pages compat_sys_move_pages -318 i386 getcpu sys_getcpu sys_getcpu -319 i386 epoll_pwait sys_epoll_pwait sys_epoll_pwait -320 i386 utimensat sys_utimensat_time32 sys_utimensat_time32 +318 i386 getcpu sys_getcpu +319 i386 epoll_pwait sys_epoll_pwait +320 i386 utimensat sys_utimensat_time32 321 i386 signalfd sys_signalfd compat_sys_signalfd -322 i386 timerfd_create sys_timerfd_create sys_timerfd_create -323 i386 eventfd sys_eventfd sys_eventfd +322 i386 timerfd_create sys_timerfd_create +323 i386 eventfd sys_eventfd 324 i386 fallocate sys_fallocate compat_sys_x86_fallocate -325 i386 timerfd_settime sys_timerfd_settime32 sys_timerfd_settime32 -326 i386 timerfd_gettime sys_timerfd_gettime32 sys_timerfd_gettime32 +325 i386 timerfd_settime sys_timerfd_settime32 +326 i386 timerfd_gettime sys_timerfd_gettime32 327 i386 signalfd4 sys_signalfd4 compat_sys_signalfd4 -328 i386 eventfd2 sys_eventfd2 sys_eventfd2 -329 i386 epoll_create1 sys_epoll_create1 sys_epoll_create1 -330 i386 dup3 sys_dup3 sys_dup3 -331 i386 pipe2 sys_pipe2 sys_pipe2 -332 i386 inotify_init1 sys_inotify_init1 sys_inotify_init1 +328 i386 eventfd2 sys_eventfd2 +329 i386 epoll_create1 sys_epoll_create1 +330 i386 dup3 sys_dup3 +331 i386 pipe2 sys_pipe2 +332 i386 inotify_init1 sys_inotify_init1 333 i386 preadv sys_preadv compat_sys_preadv 334 i386 pwritev sys_pwritev compat_sys_pwritev 335 i386 rt_tgsigqueueinfo sys_rt_tgsigqueueinfo compat_sys_rt_tgsigqueueinfo -336 i386 perf_event_open sys_perf_event_open sys_perf_event_open +336 i386 perf_event_open sys_perf_event_open 337 i386 recvmmsg sys_recvmmsg_time32 compat_sys_recvmmsg_time32 -338 i386 fanotify_init sys_fanotify_init sys_fanotify_init +338 i386 fanotify_init sys_fanotify_init 339 i386 fanotify_mark sys_fanotify_mark compat_sys_fanotify_mark -340 i386 prlimit64 sys_prlimit64 sys_prlimit64 -341 i386 name_to_handle_at sys_name_to_handle_at sys_name_to_handle_at +340 i386 prlimit64 sys_prlimit64 +341 i386 name_to_handle_at sys_name_to_handle_at 342 i386 open_by_handle_at sys_open_by_handle_at compat_sys_open_by_handle_at -343 i386 clock_adjtime sys_clock_adjtime32 sys_clock_adjtime32 -344 i386 syncfs sys_syncfs sys_syncfs +343 i386 clock_adjtime sys_clock_adjtime32 +344 i386 syncfs sys_syncfs 345 i386 sendmmsg sys_sendmmsg compat_sys_sendmmsg -346 i386 setns sys_setns sys_setns +346 i386 setns sys_setns 347 i386 process_vm_readv sys_process_vm_readv compat_sys_process_vm_readv 348 i386 process_vm_writev sys_process_vm_writev compat_sys_process_vm_writev -349 i386 kcmp sys_kcmp sys_kcmp -350 i386 finit_module sys_finit_module sys_finit_module -351 i386 sched_setattr sys_sched_setattr sys_sched_setattr -352 i386 sched_getattr sys_sched_getattr sys_sched_getattr -353 i386 renameat2 sys_renameat2 sys_renameat2 -354 i386 seccomp sys_seccomp sys_seccomp -355 i386 getrandom sys_getrandom sys_getrandom -356 i386 memfd_create sys_memfd_create sys_memfd_create -357 i386 bpf sys_bpf sys_bpf +349 i386 kcmp sys_kcmp +350 i386 finit_module sys_finit_module +351 i386 sched_setattr sys_sched_setattr +352 i386 sched_getattr sys_sched_getattr +353 i386 renameat2 sys_renameat2 +354 i386 seccomp sys_seccomp +355 i386 getrandom sys_getrandom +356 i386 memfd_create sys_memfd_create +357 i386 bpf sys_bpf 358 i386 execveat sys_execveat compat_sys_execveat -359 i386 socket sys_socket sys_socket -360 i386 socketpair sys_socketpair sys_socketpair -361 i386 bind sys_bind sys_bind -362 i386 connect sys_connect sys_connect -363 i386 listen sys_listen sys_listen -364 i386 accept4 sys_accept4 sys_accept4 +359 i386 socket sys_socket +360 i386 socketpair sys_socketpair +361 i386 bind sys_bind +362 i386 connect sys_connect +363 i386 listen sys_listen +364 i386 accept4 sys_accept4 365 i386 getsockopt sys_getsockopt compat_sys_getsockopt 366 i386 setsockopt sys_setsockopt compat_sys_setsockopt -367 i386 getsockname sys_getsockname sys_getsockname -368 i386 getpeername sys_getpeername sys_getpeername -369 i386 sendto sys_sendto sys_sendto +367 i386 getsockname sys_getsockname +368 i386 getpeername sys_getpeername +369 i386 sendto sys_sendto 370 i386 sendmsg sys_sendmsg compat_sys_sendmsg 371 i386 recvfrom sys_recvfrom compat_sys_recvfrom 372 i386 recvmsg sys_recvmsg compat_sys_recvmsg -373 i386 shutdown sys_shutdown sys_shutdown -374 i386 userfaultfd sys_userfaultfd sys_userfaultfd -375 i386 membarrier sys_membarrier sys_membarrier -376 i386 mlock2 sys_mlock2 sys_mlock2 -377 i386 copy_file_range sys_copy_file_range sys_copy_file_range +373 i386 shutdown sys_shutdown +374 i386 userfaultfd sys_userfaultfd +375 i386 membarrier sys_membarrier +376 i386 mlock2 sys_mlock2 +377 i386 copy_file_range sys_copy_file_range 378 i386 preadv2 sys_preadv2 compat_sys_preadv2 379 i386 pwritev2 sys_pwritev2 compat_sys_pwritev2 -380 i386 pkey_mprotect sys_pkey_mprotect sys_pkey_mprotect -381 i386 pkey_alloc sys_pkey_alloc sys_pkey_alloc -382 i386 pkey_free sys_pkey_free sys_pkey_free -383 i386 statx sys_statx sys_statx +380 i386 pkey_mprotect sys_pkey_mprotect +381 i386 pkey_alloc sys_pkey_alloc +382 i386 pkey_free sys_pkey_free +383 i386 statx sys_statx 384 i386 arch_prctl sys_arch_prctl compat_sys_arch_prctl 385 i386 io_pgetevents sys_io_pgetevents_time32 compat_sys_io_pgetevents -386 i386 rseq sys_rseq sys_rseq -393 i386 semget sys_semget sys_semget +386 i386 rseq sys_rseq +393 i386 semget sys_semget 394 i386 semctl sys_semctl compat_sys_semctl -395 i386 shmget sys_shmget sys_shmget +395 i386 shmget sys_shmget 396 i386 shmctl sys_shmctl compat_sys_shmctl 397 i386 shmat sys_shmat compat_sys_shmat -398 i386 shmdt sys_shmdt sys_shmdt -399 i386 msgget sys_msgget sys_msgget +398 i386 shmdt sys_shmdt +399 i386 msgget sys_msgget 400 i386 msgsnd sys_msgsnd compat_sys_msgsnd 401 i386 msgrcv sys_msgrcv compat_sys_msgrcv 402 i386 msgctl sys_msgctl compat_sys_msgctl -403 i386 clock_gettime64 sys_clock_gettime sys_clock_gettime -404 i386 clock_settime64 sys_clock_settime sys_clock_settime -405 i386 clock_adjtime64 sys_clock_adjtime sys_clock_adjtime -406 i386 clock_getres_time64 sys_clock_getres sys_clock_getres -407 i386 clock_nanosleep_time64 sys_clock_nanosleep sys_clock_nanosleep -408 i386 timer_gettime64 sys_timer_gettime sys_timer_gettime -409 i386 timer_settime64 sys_timer_settime sys_timer_settime -410 i386 timerfd_gettime64 sys_timerfd_gettime sys_timerfd_gettime -411 i386 timerfd_settime64 sys_timerfd_settime sys_timerfd_settime -412 i386 utimensat_time64 sys_utimensat sys_utimensat +403 i386 clock_gettime64 sys_clock_gettime +404 i386 clock_settime64 sys_clock_settime +405 i386 clock_adjtime64 sys_clock_adjtime +406 i386 clock_getres_time64 sys_clock_getres +407 i386 clock_nanosleep_time64 sys_clock_nanosleep +408 i386 timer_gettime64 sys_timer_gettime +409 i386 timer_settime64 sys_timer_settime +410 i386 timerfd_gettime64 sys_timerfd_gettime +411 i386 timerfd_settime64 sys_timerfd_settime +412 i386 utimensat_time64 sys_utimensat 413 i386 pselect6_time64 sys_pselect6 compat_sys_pselect6_time64 414 i386 ppoll_time64 sys_ppoll compat_sys_ppoll_time64 -416 i386 io_pgetevents_time64 sys_io_pgetevents sys_io_pgetevents +416 i386 io_pgetevents_time64 sys_io_pgetevents 417 i386 recvmmsg_time64 sys_recvmmsg compat_sys_recvmmsg_time64 -418 i386 mq_timedsend_time64 sys_mq_timedsend sys_mq_timedsend -419 i386 mq_timedreceive_time64 sys_mq_timedreceive sys_mq_timedreceive -420 i386 semtimedop_time64 sys_semtimedop sys_semtimedop +418 i386 mq_timedsend_time64 sys_mq_timedsend +419 i386 mq_timedreceive_time64 sys_mq_timedreceive +420 i386 semtimedop_time64 sys_semtimedop 421 i386 rt_sigtimedwait_time64 sys_rt_sigtimedwait compat_sys_rt_sigtimedwait_time64 -422 i386 futex_time64 sys_futex sys_futex -423 i386 sched_rr_get_interval_time64 sys_sched_rr_get_interval sys_sched_rr_get_interval -424 i386 pidfd_send_signal sys_pidfd_send_signal sys_pidfd_send_signal -425 i386 io_uring_setup sys_io_uring_setup sys_io_uring_setup -426 i386 io_uring_enter sys_io_uring_enter sys_io_uring_enter -427 i386 io_uring_register sys_io_uring_register sys_io_uring_register -428 i386 open_tree sys_open_tree sys_open_tree -429 i386 move_mount sys_move_mount sys_move_mount -430 i386 fsopen sys_fsopen sys_fsopen -431 i386 fsconfig sys_fsconfig sys_fsconfig -432 i386 fsmount sys_fsmount sys_fsmount -433 i386 fspick sys_fspick sys_fspick -434 i386 pidfd_open sys_pidfd_open sys_pidfd_open -435 i386 clone3 sys_clone3 sys_clone3 -437 i386 openat2 sys_openat2 sys_openat2 -438 i386 pidfd_getfd sys_pidfd_getfd sys_pidfd_getfd +422 i386 futex_time64 sys_futex +423 i386 sched_rr_get_interval_time64 sys_sched_rr_get_interval +424 i386 pidfd_send_signal sys_pidfd_send_signal +425 i386 io_uring_setup sys_io_uring_setup +426 i386 io_uring_enter sys_io_uring_enter +427 i386 io_uring_register sys_io_uring_register +428 i386 open_tree sys_open_tree +429 i386 move_mount sys_move_mount +430 i386 fsopen sys_fsopen +431 i386 fsconfig sys_fsconfig +432 i386 fsmount sys_fsmount +433 i386 fspick sys_fspick +434 i386 pidfd_open sys_pidfd_open +435 i386 clone3 sys_clone3 +437 i386 openat2 sys_openat2 +438 i386 pidfd_getfd sys_pidfd_getfd
Signature · 1 line
2.24.1
[tip: x86/entry] x86/entry/32: Clean up syscall_32.tbl
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: a845a6cf1dad16fa86007c86702fb27fec89d38b Gitweb: https://git.kernel.org/tip/a845a6cf1dad16fa86007c86702fb27fec89d38b Author: Brian Gerst <[email protected]> AuthorDate: Fri, 13 Mar 2020 15:51:39 -04:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:23 +01:00
x86/entry/32: Clean up syscall_32.tbl
After removal of the __ia32_ prefix, remove compat entries that are now identical to the native entry.
Converted with this script and fixing up whitespace:
while read nr abi name entry compat; do
if [ "${nr:0:1}" = "#" ]; then
echo $nr $abi $name $entry $compat
continue
fi
if [ "$entry" = "$compat" ]; then
compat=""
fi
echo "$nr $abi $name $entry $compat"done
--- arch/x86/entry/syscalls/syscall_32.tbl | 578 ++++++++++++------------ 1 file changed, 289 insertions(+), 289 deletions(-)
arch/x86/entry/syscalls/syscall_32.tbl +289 -289
@@ -11,179 +11,179 @@ # # The abi is always "i386" for this file. # -0 i386 restart_syscall sys_restart_syscall sys_restart_syscall -1 i386 exit sys_exit sys_exit -2 i386 fork sys_fork sys_fork -3 i386 read sys_read sys_read -4 i386 write sys_write sys_write +0 i386 restart_syscall sys_restart_syscall +1 i386 exit sys_exit +2 i386 fork sys_fork +3 i386 read sys_read +4 i386 write sys_write 5 i386 open sys_open compat_sys_open -6 i386 close sys_close sys_close -7 i386 waitpid sys_waitpid sys_waitpid -8 i386 creat sys_creat sys_creat -9 i386 link sys_link sys_link -10 i386 unlink sys_unlink sys_unlink +6 i386 close sys_close +7 i386 waitpid sys_waitpid +8 i386 creat sys_creat +9 i386 link sys_link +10 i386 unlink sys_unlink 11 i386 execve sys_execve compat_sys_execve -12 i386 chdir sys_chdir sys_chdir -13 i386 time sys_time32 sys_time32 -14 i386 mknod sys_mknod sys_mknod -15 i386 chmod sys_chmod sys_chmod -16 i386 lchown sys_lchown16 sys_lchown16 +12 i386 chdir sys_chdir +13 i386 time sys_time32 +14 i386 mknod sys_mknod +15 i386 chmod sys_chmod +16 i386 lchown sys_lchown16 17 i386 break -18 i386 oldstat sys_stat sys_stat +18 i386 oldstat sys_stat 19 i386 lseek sys_lseek compat_sys_lseek -20 i386 getpid sys_getpid sys_getpid +20 i386 getpid sys_getpid 21 i386 mount sys_mount compat_sys_mount -22 i386 umount sys_oldumount sys_oldumount -23 i386 setuid sys_setuid16 sys_setuid16 -24 i386 getuid sys_getuid16 sys_getuid16 -25 i386 stime sys_stime32 sys_stime32 +22 i386 umount sys_oldumount +23 i386 setuid sys_setuid16 +24 i386 getuid sys_getuid16 +25 i386 stime sys_stime32 26 i386 ptrace sys_ptrace compat_sys_ptrace -27 i386 alarm sys_alarm sys_alarm -28 i386 oldfstat sys_fstat sys_fstat -29 i386 pause sys_pause sys_pause -30 i386 utime sys_utime32 sys_utime32 +27 i386 alarm sys_alarm +28 i386 oldfstat sys_fstat +29 i386 pause sys_pause +30 i386 utime sys_utime32 31 i386 stty 32 i386 gtty -33 i386 access sys_access sys_access -34 i386 nice sys_nice sys_nice +33 i386 access sys_access +34 i386 nice sys_nice 35 i386 ftime -36 i386 sync sys_sync sys_sync -37 i386 kill sys_kill sys_kill -38 i386 rename sys_rename sys_rename -39 i386 mkdir sys_mkdir sys_mkdir -40 i386 rmdir sys_rmdir sys_rmdir -41 i386 dup sys_dup sys_dup -42 i386 pipe sys_pipe sys_pipe +36 i386 sync sys_sync +37 i386 kill sys_kill +38 i386 rename sys_rename +39 i386 mkdir sys_mkdir +40 i386 rmdir sys_rmdir +41 i386 dup sys_dup +42 i386 pipe sys_pipe 43 i386 times sys_times compat_sys_times 44 i386 prof -45 i386 brk sys_brk sys_brk -46 i386 setgid sys_setgid16 sys_setgid16 -47 i386 getgid sys_getgid16 sys_getgid16 -48 i386 signal sys_signal sys_signal -49 i386 geteuid sys_geteuid16 sys_geteuid16 -50 i386 getegid sys_getegid16 sys_getegid16 -51 i386 acct sys_acct sys_acct -52 i386 umount2 sys_umount sys_umount +45 i386 brk sys_brk +46 i386 setgid sys_setgid16 +47 i386 getgid sys_getgid16 +48 i386 signal sys_signal +49 i386 geteuid sys_geteuid16 +50 i386 getegid sys_getegid16 +51 i386 acct sys_acct +52 i386 umount2 sys_umount 53 i386 lock 54 i386 ioctl sys_ioctl compat_sys_ioctl 55 i386 fcntl sys_fcntl compat_sys_fcntl64 56 i386 mpx -57 i386 setpgid sys_setpgid sys_setpgid +57 i386 setpgid sys_setpgid 58 i386 ulimit -59 i386 oldolduname sys_olduname sys_olduname -60 i386 umask sys_umask sys_umask -61 i386 chroot sys_chroot sys_chroot +59 i386 oldolduname sys_olduname +60 i386 umask sys_umask +61 i386 chroot sys_chroot 62 i386 ustat sys_ustat compat_sys_ustat -63 i386 dup2 sys_dup2 sys_dup2 -64 i386 getppid sys_getppid sys_getppid -65 i386 getpgrp sys_getpgrp sys_getpgrp -66 i386 setsid sys_setsid sys_setsid +63 i386 dup2 sys_dup2 +64 i386 getppid sys_getppid +65 i386 getpgrp sys_getpgrp +66 i386 setsid sys_setsid 67 i386 sigaction sys_sigaction compat_sys_sigaction -68 i386 sgetmask sys_sgetmask sys_sgetmask -69 i386 ssetmask sys_ssetmask sys_ssetmask -70 i386 setreuid sys_setreuid16 sys_setreuid16 -71 i386 setregid sys_setregid16 sys_setregid16 -72 i386 sigsuspend sys_sigsuspend sys_sigsuspend +68 i386 sgetmask sys_sgetmask +69 i386 ssetmask sys_ssetmask +70 i386 setreuid sys_setreuid16 +71 i386 setregid sys_setregid16 +72 i386 sigsuspend sys_sigsuspend 73 i386 sigpending sys_sigpending compat_sys_sigpending -74 i386 sethostname sys_sethostname sys_sethostname +74 i386 sethostname sys_sethostname 75 i386 setrlimit sys_setrlimit compat_sys_setrlimit 76 i386 getrlimit sys_old_getrlimit compat_sys_old_getrlimit 77 i386 getrusage sys_getrusage compat_sys_getrusage 78 i386 gettimeofday sys_gettimeofday compat_sys_gettimeofday 79 i386 settimeofday sys_settimeofday compat_sys_settimeofday -80 i386 getgroups sys_getgroups16 sys_getgroups16 -81 i386 setgroups sys_setgroups16 sys_setgroups16 +80 i386 getgroups sys_getgroups16 +81 i386 setgroups sys_setgroups16 82 i386 select sys_old_select compat_sys_old_select -83 i386 symlink sys_symlink sys_symlink -84 i386 oldlstat sys_lstat sys_lstat -85 i386 readlink sys_readlink sys_readlink -86 i386 uselib sys_uselib sys_uselib -87 i386 swapon sys_swapon sys_swapon -88 i386 reboot sys_reboot sys_reboot +83 i386 symlink sys_symlink +84 i386 oldlstat sys_lstat +85 i386 readlink sys_readlink +86 i386 uselib sys_uselib +87 i386 swapon sys_swapon +88 i386 reboot sys_reboot 89 i386 readdir sys_old_readdir compat_sys_old_readdir 90 i386 mmap sys_old_mmap compat_sys_x86_mmap -91 i386 munmap sys_munmap sys_munmap +91 i386 munmap sys_munmap 92 i386 truncate sys_truncate compat_sys_truncate 93 i386 ftruncate sys_ftruncate compat_sys_ftruncate -94 i386 fchmod sys_fchmod sys_fchmod -95 i386 fchown sys_fchown16 sys_fchown16 -96 i386 getpriority sys_getpriority sys_getpriority -97 i386 setpriority sys_setpriority sys_setpriority +94 i386 fchmod sys_fchmod +95 i386 fchown sys_fchown16 +96 i386 getpriority sys_getpriority +97 i386 setpriority sys_setpriority 98 i386 profil 99 i386 statfs sys_statfs compat_sys_statfs 100 i386 fstatfs sys_fstatfs compat_sys_fstatfs -101 i386 ioperm sys_ioperm sys_ioperm +101 i386 ioperm sys_ioperm 102 i386 socketcall sys_socketcall compat_sys_socketcall -103 i386 syslog sys_syslog sys_syslog +103 i386 syslog sys_syslog 104 i386 setitimer sys_setitimer compat_sys_setitimer 105 i386 getitimer sys_getitimer compat_sys_getitimer 106 i386 stat sys_newstat compat_sys_newstat 107 i386 lstat sys_newlstat compat_sys_newlstat 108 i386 fstat sys_newfstat compat_sys_newfstat -109 i386 olduname sys_uname sys_uname -110 i386 iopl sys_iopl sys_iopl -111 i386 vhangup sys_vhangup sys_vhangup +109 i386 olduname sys_uname +110 i386 iopl sys_iopl +111 i386 vhangup sys_vhangup 112 i386 idle 113 i386 vm86old sys_vm86old sys_ni_syscall 114 i386 wait4 sys_wait4 compat_sys_wait4 -115 i386 swapoff sys_swapoff sys_swapoff +115 i386 swapoff sys_swapoff 116 i386 sysinfo sys_sysinfo compat_sys_sysinfo 117 i386 ipc sys_ipc compat_sys_ipc -118 i386 fsync sys_fsync sys_fsync +118 i386 fsync sys_fsync 119 i386 sigreturn sys_sigreturn compat_sys_sigreturn 120 i386 clone sys_clone compat_sys_x86_clone -121 i386 setdomainname sys_setdomainname sys_setdomainname -122 i386 uname sys_newuname sys_newuname -123 i386 modify_ldt sys_modify_ldt sys_modify_ldt -124 i386 adjtimex sys_adjtimex_time32 sys_adjtimex_time32 -125 i386 mprotect sys_mprotect sys_mprotect +121 i386 setdomainname sys_setdomainname +122 i386 uname sys_newuname +123 i386 modify_ldt sys_modify_ldt +124 i386 adjtimex sys_adjtimex_time32 +125 i386 mprotect sys_mprotect 126 i386 sigprocmask sys_sigprocmask compat_sys_sigprocmask 127 i386 create_module -128 i386 init_module sys_init_module sys_init_module -129 i386 delete_module sys_delete_module sys_delete_module +128 i386 init_module sys_init_module +129 i386 delete_module sys_delete_module 130 i386 get_kernel_syms 131 i386 quotactl sys_quotactl compat_sys_quotactl32 -132 i386 getpgid sys_getpgid sys_getpgid -133 i386 fchdir sys_fchdir sys_fchdir -134 i386 bdflush sys_bdflush sys_bdflush -135 i386 sysfs sys_sysfs sys_sysfs -136 i386 personality sys_personality sys_personality +132 i386 getpgid sys_getpgid +133 i386 fchdir sys_fchdir +134 i386 bdflush sys_bdflush +135 i386 sysfs sys_sysfs +136 i386 personality sys_personality 137 i386 afs_syscall -138 i386 setfsuid sys_setfsuid16 sys_setfsuid16 -139 i386 setfsgid sys_setfsgid16 sys_setfsgid16 -140 i386 _llseek sys_llseek sys_llseek +138 i386 setfsuid sys_setfsuid16 +139 i386 setfsgid sys_setfsgid16 +140 i386 _llseek sys_llseek 141 i386 getdents sys_getdents compat_sys_getdents 142 i386 _newselect sys_select compat_sys_select -143 i386 flock sys_flock sys_flock -144 i386 msync sys_msync sys_msync +143 i386 flock sys_flock +144 i386 msync sys_msync 145 i386 readv sys_readv compat_sys_readv 146 i386 writev sys_writev compat_sys_writev -147 i386 getsid sys_getsid sys_getsid -148 i386 fdatasync sys_fdatasync sys_fdatasync +147 i386 getsid sys_getsid +148 i386 fdatasync sys_fdatasync 149 i386 _sysctl sys_sysctl compat_sys_sysctl -150 i386 mlock sys_mlock sys_mlock -151 i386 munlock sys_munlock sys_munlock -152 i386 mlockall sys_mlockall sys_mlockall -153 i386 munlockall sys_munlockall sys_munlockall -154 i386 sched_setparam sys_sched_setparam sys_sched_setparam -155 i386 sched_getparam sys_sched_getparam sys_sched_getparam -156 i386 sched_setscheduler sys_sched_setscheduler sys_sched_setscheduler -157 i386 sched_getscheduler sys_sched_getscheduler sys_sched_getscheduler -158 i386 sched_yield sys_sched_yield sys_sched_yield -159 i386 sched_get_priority_max sys_sched_get_priority_max sys_sched_get_priority_max -160 i386 sched_get_priority_min sys_sched_get_priority_min sys_sched_get_priority_min -161 i386 sched_rr_get_interval sys_sched_rr_get_interval_time32 sys_sched_rr_get_interval_time32 -162 i386 nanosleep sys_nanosleep_time32 sys_nanosleep_time32 -163 i386 mremap sys_mremap sys_mremap -164 i386 setresuid sys_setresuid16 sys_setresuid16 -165 i386 getresuid sys_getresuid16 sys_getresuid16 +150 i386 mlock sys_mlock +151 i386 munlock sys_munlock +152 i386 mlockall sys_mlockall +153 i386 munlockall sys_munlockall +154 i386 sched_setparam sys_sched_setparam +155 i386 sched_getparam sys_sched_getparam +156 i386 sched_setscheduler sys_sched_setscheduler +157 i386 sched_getscheduler sys_sched_getscheduler +158 i386 sched_yield sys_sched_yield +159 i386 sched_get_priority_max sys_sched_get_priority_max +160 i386 sched_get_priority_min sys_sched_get_priority_min +161 i386 sched_rr_get_interval sys_sched_rr_get_interval_time32 +162 i386 nanosleep sys_nanosleep_time32 +163 i386 mremap sys_mremap +164 i386 setresuid sys_setresuid16 +165 i386 getresuid sys_getresuid16 166 i386 vm86 sys_vm86 sys_ni_syscall 167 i386 query_module -168 i386 poll sys_poll sys_poll +168 i386 poll sys_poll 169 i386 nfsservctl -170 i386 setresgid sys_setresgid16 sys_setresgid16 -171 i386 getresgid sys_getresgid16 sys_getresgid16 -172 i386 prctl sys_prctl sys_prctl +170 i386 setresgid sys_setresgid16 +171 i386 getresgid sys_getresgid16 +172 i386 prctl sys_prctl 173 i386 rt_sigreturn sys_rt_sigreturn compat_sys_rt_sigreturn 174 i386 rt_sigaction sys_rt_sigaction compat_sys_rt_sigaction 175 i386 rt_sigprocmask sys_rt_sigprocmask compat_sys_rt_sigprocmask
@@ -193,252 +193,252 @@ 179 i386 rt_sigsuspend sys_rt_sigsuspend compat_sys_rt_sigsuspend 180 i386 pread64 sys_pread64 compat_sys_x86_pread 181 i386 pwrite64 sys_pwrite64 compat_sys_x86_pwrite -182 i386 chown sys_chown16 sys_chown16 -183 i386 getcwd sys_getcwd sys_getcwd -184 i386 capget sys_capget sys_capget -185 i386 capset sys_capset sys_capset +182 i386 chown sys_chown16 +183 i386 getcwd sys_getcwd +184 i386 capget sys_capget +185 i386 capset sys_capset 186 i386 sigaltstack sys_sigaltstack compat_sys_sigaltstack 187 i386 sendfile sys_sendfile compat_sys_sendfile 188 i386 getpmsg 189 i386 putpmsg -190 i386 vfork sys_vfork sys_vfork +190 i386 vfork sys_vfork 191 i386 ugetrlimit sys_getrlimit compat_sys_getrlimit -192 i386 mmap2 sys_mmap_pgoff sys_mmap_pgoff +192 i386 mmap2 sys_mmap_pgoff 193 i386 truncate64 sys_truncate64 compat_sys_x86_truncate64 194 i386 ftruncate64 sys_ftruncate64 compat_sys_x86_ftruncate64 195 i386 stat64 sys_stat64 compat_sys_x86_stat64 196 i386 lstat64 sys_lstat64 compat_sys_x86_lstat64 197 i386 fstat64 sys_fstat64 compat_sys_x86_fstat64 -198 i386 lchown32 sys_lchown sys_lchown -199 i386 getuid32 sys_getuid sys_getuid -200 i386 getgid32 sys_getgid sys_getgid -201 i386 geteuid32 sys_geteuid sys_geteuid -202 i386 getegid32 sys_getegid sys_getegid -203 i386 setreuid32 sys_setreuid sys_setreuid -204 i386 setregid32 sys_setregid sys_setregid -205 i386 getgroups32 sys_getgroups sys_getgroups -206 i386 setgroups32 sys_setgroups sys_setgroups -207 i386 fchown32 sys_fchown sys_fchown -208 i386 setresuid32 sys_setresuid sys_setresuid -209 i386 getresuid32 sys_getresuid sys_getresuid -210 i386 setresgid32 sys_setresgid sys_setresgid -211 i386 getresgid32 sys_getresgid sys_getresgid -212 i386 chown32 sys_chown sys_chown -213 i386 setuid32 sys_setuid sys_setuid -214 i386 setgid32 sys_setgid sys_setgid -215 i386 setfsuid32 sys_setfsuid sys_setfsuid -216 i386 setfsgid32 sys_setfsgid sys_setfsgid -217 i386 pivot_root sys_pivot_root sys_pivot_root -218 i386 mincore sys_mincore sys_mincore -219 i386 madvise sys_madvise sys_madvise -220 i386 getdents64 sys_getdents64 sys_getdents64 +198 i386 lchown32 sys_lchown +199 i386 getuid32 sys_getuid +200 i386 getgid32 sys_getgid +201 i386 geteuid32 sys_geteuid +202 i386 getegid32 sys_getegid +203 i386 setreuid32 sys_setreuid +204 i386 setregid32 sys_setregid +205 i386 getgroups32 sys_getgroups +206 i386 setgroups32 sys_setgroups +207 i386 fchown32 sys_fchown +208 i386 setresuid32 sys_setresuid +209 i386 getresuid32 sys_getresuid +210 i386 setresgid32 sys_setresgid +211 i386 getresgid32 sys_getresgid +212 i386 chown32 sys_chown +213 i386 setuid32 sys_setuid +214 i386 setgid32 sys_setgid +215 i386 setfsuid32 sys_setfsuid +216 i386 setfsgid32 sys_setfsgid +217 i386 pivot_root sys_pivot_root +218 i386 mincore sys_mincore +219 i386 madvise sys_madvise +220 i386 getdents64 sys_getdents64 221 i386 fcntl64 sys_fcntl64 compat_sys_fcntl64 # 222 is unused # 223 is unused -224 i386 gettid sys_gettid sys_gettid +224 i386 gettid sys_gettid 225 i386 readahead sys_readahead compat_sys_x86_readahead -226 i386 setxattr sys_setxattr sys_setxattr -227 i386 lsetxattr sys_lsetxattr sys_lsetxattr -228 i386 fsetxattr sys_fsetxattr sys_fsetxattr -229 i386 getxattr sys_getxattr sys_getxattr -230 i386 lgetxattr sys_lgetxattr sys_lgetxattr -231 i386 fgetxattr sys_fgetxattr sys_fgetxattr -232 i386 listxattr sys_listxattr sys_listxattr -233 i386 llistxattr sys_llistxattr sys_llistxattr -234 i386 flistxattr sys_flistxattr sys_flistxattr -235 i386 removexattr sys_removexattr sys_removexattr -236 i386 lremovexattr sys_lremovexattr sys_lremovexattr -237 i386 fremovexattr sys_fremovexattr sys_fremovexattr -238 i386 tkill sys_tkill sys_tkill -239 i386 sendfile64 sys_sendfile64 sys_sendfile64 -240 i386 futex sys_futex_time32 sys_futex_time32 +226 i386 setxattr sys_setxattr +227 i386 lsetxattr sys_lsetxattr +228 i386 fsetxattr sys_fsetxattr +229 i386 getxattr sys_getxattr +230 i386 lgetxattr sys_lgetxattr +231 i386 fgetxattr sys_fgetxattr +232 i386 listxattr sys_listxattr +233 i386 llistxattr sys_llistxattr +234 i386 flistxattr sys_flistxattr +235 i386 removexattr sys_removexattr +236 i386 lremovexattr sys_lremovexattr +237 i386 fremovexattr sys_fremovexattr +238 i386 tkill sys_tkill +239 i386 sendfile64 sys_sendfile64 +240 i386 futex sys_futex_time32 241 i386 sched_setaffinity sys_sched_setaffinity compat_sys_sched_setaffinity 242 i386 sched_getaffinity sys_sched_getaffinity compat_sys_sched_getaffinity -243 i386 set_thread_area sys_set_thread_area sys_set_thread_area -244 i386 get_thread_area sys_get_thread_area sys_get_thread_area +243 i386 set_thread_area sys_set_thread_area +244 i386 get_thread_area sys_get_thread_area 245 i386 io_setup sys_io_setup compat_sys_io_setup -246 i386 io_destroy sys_io_destroy sys_io_destroy -247 i386 io_getevents sys_io_getevents_time32 sys_io_getevents_time32 +246 i386 io_destroy sys_io_destroy +247 i386 io_getevents sys_io_getevents_time32 248 i386 io_submit sys_io_submit compat_sys_io_submit -249 i386 io_cancel sys_io_cancel sys_io_cancel +249 i386 io_cancel sys_io_cancel 250 i386 fadvise64 sys_fadvise64 compat_sys_x86_fadvise64 # 251 is available for reuse (was briefly sys_set_zone_reclaim) -252 i386 exit_group sys_exit_group sys_exit_group +252 i386 exit_group sys_exit_group 253 i386 lookup_dcookie sys_lookup_dcookie compat_sys_lookup_dcookie -254 i386 epoll_create sys_epoll_create sys_epoll_create -255 i386 epoll_ctl sys_epoll_ctl sys_epoll_ctl -256 i386 epoll_wait sys_epoll_wait sys_epoll_wait -257 i386 remap_file_pages sys_remap_file_pages sys_remap_file_pages -258 i386 set_tid_address sys_set_tid_address sys_set_tid_address +254 i386 epoll_create sys_epoll_create +255 i386 epoll_ctl sys_epoll_ctl +256 i386 epoll_wait sys_epoll_wait +257 i386 remap_file_pages sys_remap_file_pages +258 i386 set_tid_address sys_set_tid_address 259 i386 timer_create sys_timer_create compat_sys_timer_create -260 i386 timer_settime sys_timer_settime32 sys_timer_settime32 -261 i386 timer_gettime sys_timer_gettime32 sys_timer_gettime32 -262 i386 timer_getoverrun sys_timer_getoverrun sys_timer_getoverrun -263 i386 timer_delete sys_timer_delete sys_timer_delete -264 i386 clock_settime sys_clock_settime32 sys_clock_settime32 -265 i386 clock_gettime sys_clock_gettime32 sys_clock_gettime32 -266 i386 clock_getres sys_clock_getres_time32 sys_clock_getres_time32 -267 i386 clock_nanosleep sys_clock_nanosleep_time32 sys_clock_nanosleep_time32 +260 i386 timer_settime sys_timer_settime32 +261 i386 timer_gettime sys_timer_gettime32 +262 i386 timer_getoverrun sys_timer_getoverrun +263 i386 timer_delete sys_timer_delete +264 i386 clock_settime sys_clock_settime32 +265 i386 clock_gettime sys_clock_gettime32 +266 i386 clock_getres sys_clock_getres_time32 +267 i386 clock_nanosleep sys_clock_nanosleep_time32 268 i386 statfs64 sys_statfs64 compat_sys_statfs64 269 i386 fstatfs64 sys_fstatfs64 compat_sys_fstatfs64 -270 i386 tgkill sys_tgkill sys_tgkill -271 i386 utimes sys_utimes_time32 sys_utimes_time32 +270 i386 tgkill sys_tgkill +271 i386 utimes sys_utimes_time32 272 i386 fadvise64_64 sys_fadvise64_64 compat_sys_x86_fadvise64_64 273 i386 vserver -274 i386 mbind sys_mbind sys_mbind +274 i386 mbind sys_mbind 275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy -276 i386 set_mempolicy sys_set_mempolicy sys_set_mempolicy +276 i386 set_mempolicy sys_set_mempolicy 277 i386 mq_open sys_mq_open compat_sys_mq_open -278 i386 mq_unlink sys_mq_unlink sys_mq_unlink -279 i386 mq_timedsend sys_mq_timedsend_time32 sys_mq_timedsend_time32 -280 i386 mq_timedreceive sys_mq_timedreceive_time32 sys_mq_timedreceive_time32 +278 i386 mq_unlink sys_mq_unlink +279 i386 mq_timedsend sys_mq_timedsend_time32 +280 i386 mq_timedreceive sys_mq_timedreceive_time32 281 i386 mq_notify sys_mq_notify compat_sys_mq_notify 282 i386 mq_getsetattr sys_mq_getsetattr compat_sys_mq_getsetattr 283 i386 kexec_load sys_kexec_load compat_sys_kexec_load 284 i386 waitid sys_waitid compat_sys_waitid # 285 sys_setaltroot -286 i386 add_key sys_add_key sys_add_key -287 i386 request_key sys_request_key sys_request_key +286 i386 add_key sys_add_key +287 i386 request_key sys_request_key 288 i386 keyctl sys_keyctl compat_sys_keyctl -289 i386 ioprio_set sys_ioprio_set sys_ioprio_set -290 i386 ioprio_get sys_ioprio_get sys_ioprio_get -291 i386 inotify_init sys_inotify_init sys_inotify_init -292 i386 inotify_add_watch sys_inotify_add_watch sys_inotify_add_watch -293 i386 inotify_rm_watch sys_inotify_rm_watch sys_inotify_rm_watch -294 i386 migrate_pages sys_migrate_pages sys_migrate_pages +289 i386 ioprio_set sys_ioprio_set +290 i386 ioprio_get sys_ioprio_get +291 i386 inotify_init sys_inotify_init +292 i386 inotify_add_watch sys_inotify_add_watch +293 i386 inotify_rm_watch sys_inotify_rm_watch +294 i386 migrate_pages sys_migrate_pages 295 i386 openat sys_openat compat_sys_openat -296 i386 mkdirat sys_mkdirat sys_mkdirat -297 i386 mknodat sys_mknodat sys_mknodat -298 i386 fchownat sys_fchownat sys_fchownat -299 i386 futimesat sys_futimesat_time32 sys_futimesat_time32 +296 i386 mkdirat sys_mkdirat +297 i386 mknodat sys_mknodat +298 i386 fchownat sys_fchownat +299 i386 futimesat sys_futimesat_time32 300 i386 fstatat64 sys_fstatat64 compat_sys_x86_fstatat -301 i386 unlinkat sys_unlinkat sys_unlinkat -302 i386 renameat sys_renameat sys_renameat -303 i386 linkat sys_linkat sys_linkat -304 i386 symlinkat sys_symlinkat sys_symlinkat -305 i386 readlinkat sys_readlinkat sys_readlinkat -306 i386 fchmodat sys_fchmodat sys_fchmodat -307 i386 faccessat sys_faccessat sys_faccessat +301 i386 unlinkat sys_unlinkat +302 i386 renameat sys_renameat +303 i386 linkat sys_linkat +304 i386 symlinkat sys_symlinkat +305 i386 readlinkat sys_readlinkat +306 i386 fchmodat sys_fchmodat +307 i386 faccessat sys_faccessat 308 i386 pselect6 sys_pselect6_time32 compat_sys_pselect6_time32 309 i386 ppoll sys_ppoll_time32 compat_sys_ppoll_time32 -310 i386 unshare sys_unshare sys_unshare +310 i386 unshare sys_unshare 311 i386 set_robust_list sys_set_robust_list compat_sys_set_robust_list 312 i386 get_robust_list sys_get_robust_list compat_sys_get_robust_list -313 i386 splice sys_splice sys_splice +313 i386 splice sys_splice 314 i386 sync_file_range sys_sync_file_range compat_sys_x86_sync_file_range -315 i386 tee sys_tee sys_tee +315 i386 tee sys_tee 316 i386 vmsplice sys_vmsplice compat_sys_vmsplice 317 i386 move_pages sys_move_pages compat_sys_move_pages -318 i386 getcpu sys_getcpu sys_getcpu -319 i386 epoll_pwait sys_epoll_pwait sys_epoll_pwait -320 i386 utimensat sys_utimensat_time32 sys_utimensat_time32 +318 i386 getcpu sys_getcpu +319 i386 epoll_pwait sys_epoll_pwait +320 i386 utimensat sys_utimensat_time32 321 i386 signalfd sys_signalfd compat_sys_signalfd -322 i386 timerfd_create sys_timerfd_create sys_timerfd_create -323 i386 eventfd sys_eventfd sys_eventfd +322 i386 timerfd_create sys_timerfd_create +323 i386 eventfd sys_eventfd 324 i386 fallocate sys_fallocate compat_sys_x86_fallocate -325 i386 timerfd_settime sys_timerfd_settime32 sys_timerfd_settime32 -326 i386 timerfd_gettime sys_timerfd_gettime32 sys_timerfd_gettime32 +325 i386 timerfd_settime sys_timerfd_settime32 +326 i386 timerfd_gettime sys_timerfd_gettime32 327 i386 signalfd4 sys_signalfd4 compat_sys_signalfd4 -328 i386 eventfd2 sys_eventfd2 sys_eventfd2 -329 i386 epoll_create1 sys_epoll_create1 sys_epoll_create1 -330 i386 dup3 sys_dup3 sys_dup3 -331 i386 pipe2 sys_pipe2 sys_pipe2 -332 i386 inotify_init1 sys_inotify_init1 sys_inotify_init1 +328 i386 eventfd2 sys_eventfd2 +329 i386 epoll_create1 sys_epoll_create1 +330 i386 dup3 sys_dup3 +331 i386 pipe2 sys_pipe2 +332 i386 inotify_init1 sys_inotify_init1 333 i386 preadv sys_preadv compat_sys_preadv 334 i386 pwritev sys_pwritev compat_sys_pwritev 335 i386 rt_tgsigqueueinfo sys_rt_tgsigqueueinfo compat_sys_rt_tgsigqueueinfo -336 i386 perf_event_open sys_perf_event_open sys_perf_event_open +336 i386 perf_event_open sys_perf_event_open 337 i386 recvmmsg sys_recvmmsg_time32 compat_sys_recvmmsg_time32 -338 i386 fanotify_init sys_fanotify_init sys_fanotify_init +338 i386 fanotify_init sys_fanotify_init 339 i386 fanotify_mark sys_fanotify_mark compat_sys_fanotify_mark -340 i386 prlimit64 sys_prlimit64 sys_prlimit64 -341 i386 name_to_handle_at sys_name_to_handle_at sys_name_to_handle_at +340 i386 prlimit64 sys_prlimit64 +341 i386 name_to_handle_at sys_name_to_handle_at 342 i386 open_by_handle_at sys_open_by_handle_at compat_sys_open_by_handle_at -343 i386 clock_adjtime sys_clock_adjtime32 sys_clock_adjtime32 -344 i386 syncfs sys_syncfs sys_syncfs +343 i386 clock_adjtime sys_clock_adjtime32 +344 i386 syncfs sys_syncfs 345 i386 sendmmsg sys_sendmmsg compat_sys_sendmmsg -346 i386 setns sys_setns sys_setns +346 i386 setns sys_setns 347 i386 process_vm_readv sys_process_vm_readv compat_sys_process_vm_readv 348 i386 process_vm_writev sys_process_vm_writev compat_sys_process_vm_writev -349 i386 kcmp sys_kcmp sys_kcmp -350 i386 finit_module sys_finit_module sys_finit_module -351 i386 sched_setattr sys_sched_setattr sys_sched_setattr -352 i386 sched_getattr sys_sched_getattr sys_sched_getattr -353 i386 renameat2 sys_renameat2 sys_renameat2 -354 i386 seccomp sys_seccomp sys_seccomp -355 i386 getrandom sys_getrandom sys_getrandom -356 i386 memfd_create sys_memfd_create sys_memfd_create -357 i386 bpf sys_bpf sys_bpf +349 i386 kcmp sys_kcmp +350 i386 finit_module sys_finit_module +351 i386 sched_setattr sys_sched_setattr +352 i386 sched_getattr sys_sched_getattr +353 i386 renameat2 sys_renameat2 +354 i386 seccomp sys_seccomp +355 i386 getrandom sys_getrandom +356 i386 memfd_create sys_memfd_create +357 i386 bpf sys_bpf 358 i386 execveat sys_execveat compat_sys_execveat -359 i386 socket sys_socket sys_socket -360 i386 socketpair sys_socketpair sys_socketpair -361 i386 bind sys_bind sys_bind -362 i386 connect sys_connect sys_connect -363 i386 listen sys_listen sys_listen -364 i386 accept4 sys_accept4 sys_accept4 +359 i386 socket sys_socket +360 i386 socketpair sys_socketpair +361 i386 bind sys_bind +362 i386 connect sys_connect +363 i386 listen sys_listen +364 i386 accept4 sys_accept4 365 i386 getsockopt sys_getsockopt compat_sys_getsockopt 366 i386 setsockopt sys_setsockopt compat_sys_setsockopt -367 i386 getsockname sys_getsockname sys_getsockname -368 i386 getpeername sys_getpeername sys_getpeername -369 i386 sendto sys_sendto sys_sendto +367 i386 getsockname sys_getsockname +368 i386 getpeername sys_getpeername +369 i386 sendto sys_sendto 370 i386 sendmsg sys_sendmsg compat_sys_sendmsg 371 i386 recvfrom sys_recvfrom compat_sys_recvfrom 372 i386 recvmsg sys_recvmsg compat_sys_recvmsg -373 i386 shutdown sys_shutdown sys_shutdown -374 i386 userfaultfd sys_userfaultfd sys_userfaultfd -375 i386 membarrier sys_membarrier sys_membarrier -376 i386 mlock2 sys_mlock2 sys_mlock2 -377 i386 copy_file_range sys_copy_file_range sys_copy_file_range +373 i386 shutdown sys_shutdown +374 i386 userfaultfd sys_userfaultfd +375 i386 membarrier sys_membarrier +376 i386 mlock2 sys_mlock2 +377 i386 copy_file_range sys_copy_file_range 378 i386 preadv2 sys_preadv2 compat_sys_preadv2 379 i386 pwritev2 sys_pwritev2 compat_sys_pwritev2 -380 i386 pkey_mprotect sys_pkey_mprotect sys_pkey_mprotect -381 i386 pkey_alloc sys_pkey_alloc sys_pkey_alloc -382 i386 pkey_free sys_pkey_free sys_pkey_free -383 i386 statx sys_statx sys_statx +380 i386 pkey_mprotect sys_pkey_mprotect +381 i386 pkey_alloc sys_pkey_alloc +382 i386 pkey_free sys_pkey_free +383 i386 statx sys_statx 384 i386 arch_prctl sys_arch_prctl compat_sys_arch_prctl 385 i386 io_pgetevents sys_io_pgetevents_time32 compat_sys_io_pgetevents -386 i386 rseq sys_rseq sys_rseq -393 i386 semget sys_semget sys_semget +386 i386 rseq sys_rseq +393 i386 semget sys_semget 394 i386 semctl sys_semctl compat_sys_semctl -395 i386 shmget sys_shmget sys_shmget +395 i386 shmget sys_shmget 396 i386 shmctl sys_shmctl compat_sys_shmctl 397 i386 shmat sys_shmat compat_sys_shmat -398 i386 shmdt sys_shmdt sys_shmdt -399 i386 msgget sys_msgget sys_msgget +398 i386 shmdt sys_shmdt +399 i386 msgget sys_msgget 400 i386 msgsnd sys_msgsnd compat_sys_msgsnd 401 i386 msgrcv sys_msgrcv compat_sys_msgrcv 402 i386 msgctl sys_msgctl compat_sys_msgctl -403 i386 clock_gettime64 sys_clock_gettime sys_clock_gettime -404 i386 clock_settime64 sys_clock_settime sys_clock_settime -405 i386 clock_adjtime64 sys_clock_adjtime sys_clock_adjtime -406 i386 clock_getres_time64 sys_clock_getres sys_clock_getres -407 i386 clock_nanosleep_time64 sys_clock_nanosleep sys_clock_nanosleep -408 i386 timer_gettime64 sys_timer_gettime sys_timer_gettime -409 i386 timer_settime64 sys_timer_settime sys_timer_settime -410 i386 timerfd_gettime64 sys_timerfd_gettime sys_timerfd_gettime -411 i386 timerfd_settime64 sys_timerfd_settime sys_timerfd_settime -412 i386 utimensat_time64 sys_utimensat sys_utimensat +403 i386 clock_gettime64 sys_clock_gettime +404 i386 clock_settime64 sys_clock_settime +405 i386 clock_adjtime64 sys_clock_adjtime +406 i386 clock_getres_time64 sys_clock_getres +407 i386 clock_nanosleep_time64 sys_clock_nanosleep +408 i386 timer_gettime64 sys_timer_gettime +409 i386 timer_settime64 sys_timer_settime +410 i386 timerfd_gettime64 sys_timerfd_gettime +411 i386 timerfd_settime64 sys_timerfd_settime +412 i386 utimensat_time64 sys_utimensat 413 i386 pselect6_time64 sys_pselect6 compat_sys_pselect6_time64 414 i386 ppoll_time64 sys_ppoll compat_sys_ppoll_time64 -416 i386 io_pgetevents_time64 sys_io_pgetevents sys_io_pgetevents +416 i386 io_pgetevents_time64 sys_io_pgetevents 417 i386 recvmmsg_time64 sys_recvmmsg compat_sys_recvmmsg_time64 -418 i386 mq_timedsend_time64 sys_mq_timedsend sys_mq_timedsend -419 i386 mq_timedreceive_time64 sys_mq_timedreceive sys_mq_timedreceive -420 i386 semtimedop_time64 sys_semtimedop sys_semtimedop +418 i386 mq_timedsend_time64 sys_mq_timedsend +419 i386 mq_timedreceive_time64 sys_mq_timedreceive +420 i386 semtimedop_time64 sys_semtimedop 421 i386 rt_sigtimedwait_time64 sys_rt_sigtimedwait compat_sys_rt_sigtimedwait_time64 -422 i386 futex_time64 sys_futex sys_futex -423 i386 sched_rr_get_interval_time64 sys_sched_rr_get_interval sys_sched_rr_get_interval -424 i386 pidfd_send_signal sys_pidfd_send_signal sys_pidfd_send_signal -425 i386 io_uring_setup sys_io_uring_setup sys_io_uring_setup -426 i386 io_uring_enter sys_io_uring_enter sys_io_uring_enter -427 i386 io_uring_register sys_io_uring_register sys_io_uring_register -428 i386 open_tree sys_open_tree sys_open_tree -429 i386 move_mount sys_move_mount sys_move_mount -430 i386 fsopen sys_fsopen sys_fsopen -431 i386 fsconfig sys_fsconfig sys_fsconfig -432 i386 fsmount sys_fsmount sys_fsmount -433 i386 fspick sys_fspick sys_fspick -434 i386 pidfd_open sys_pidfd_open sys_pidfd_open -435 i386 clone3 sys_clone3 sys_clone3 -437 i386 openat2 sys_openat2 sys_openat2 -438 i386 pidfd_getfd sys_pidfd_getfd sys_pidfd_getfd +422 i386 futex_time64 sys_futex +423 i386 sched_rr_get_interval_time64 sys_sched_rr_get_interval +424 i386 pidfd_send_signal sys_pidfd_send_signal +425 i386 io_uring_setup sys_io_uring_setup +426 i386 io_uring_enter sys_io_uring_enter +427 i386 io_uring_register sys_io_uring_register +428 i386 open_tree sys_open_tree +429 i386 move_mount sys_move_mount +430 i386 fsopen sys_fsopen +431 i386 fsconfig sys_fsconfig +432 i386 fsmount sys_fsmount +433 i386 fspick sys_fspick +434 i386 pidfd_open sys_pidfd_open +435 i386 clone3 sys_clone3 +437 i386 openat2 sys_openat2 +438 i386 pidfd_getfd sys_pidfd_getfd
PATCH v4 14/18 x86, syscalls: Rename 32-bit specific syscalls
In reply to Brian GerstRename the syscalls that only exist for 32-bit from x86_* to ia32_* to make it clear they are for 32-bit only. Also rename the functions to match the syscall name.
--- arch/x86/entry/syscalls/syscall_32.tbl | 30 +++++++++++++------------- arch/x86/ia32/sys_ia32.c | 30 +++++++++++++------------- 2 files changed, 30 insertions(+), 30 deletions(-)
arch/x86/entry/syscalls/syscall_32.tbl +15 -15
@@ -101,7 +101,7 @@ 87 i386 swapon sys_swapon 88 i386 reboot sys_reboot 89 i386 readdir sys_old_readdir compat_sys_old_readdir -90 i386 mmap sys_old_mmap compat_sys_x86_mmap +90 i386 mmap sys_old_mmap compat_sys_ia32_mmap 91 i386 munmap sys_munmap 92 i386 truncate sys_truncate compat_sys_truncate 93 i386 ftruncate sys_ftruncate compat_sys_ftruncate
@@ -131,7 +131,7 @@ 117 i386 ipc sys_ipc compat_sys_ipc 118 i386 fsync sys_fsync 119 i386 sigreturn sys_sigreturn compat_sys_sigreturn -120 i386 clone sys_clone compat_sys_x86_clone +120 i386 clone sys_clone compat_sys_ia32_clone 121 i386 setdomainname sys_setdomainname 122 i386 uname sys_newuname 123 i386 modify_ldt sys_modify_ldt
@@ -191,8 +191,8 @@ 177 i386 rt_sigtimedwait sys_rt_sigtimedwait_time32 compat_sys_rt_sigtimedwait_time32 178 i386 rt_sigqueueinfo sys_rt_sigqueueinfo compat_sys_rt_sigqueueinfo 179 i386 rt_sigsuspend sys_rt_sigsuspend compat_sys_rt_sigsuspend -180 i386 pread64 sys_pread64 compat_sys_x86_pread -181 i386 pwrite64 sys_pwrite64 compat_sys_x86_pwrite +180 i386 pread64 sys_pread64 compat_sys_ia32_pread64 +181 i386 pwrite64 sys_pwrite64 compat_sys_ia32_pwrite64 182 i386 chown sys_chown16 183 i386 getcwd sys_getcwd 184 i386 capget sys_capget
@@ -204,11 +204,11 @@ 190 i386 vfork sys_vfork 191 i386 ugetrlimit sys_getrlimit compat_sys_getrlimit 192 i386 mmap2 sys_mmap_pgoff -193 i386 truncate64 sys_truncate64 compat_sys_x86_truncate64 -194 i386 ftruncate64 sys_ftruncate64 compat_sys_x86_ftruncate64 -195 i386 stat64 sys_stat64 compat_sys_x86_stat64 -196 i386 lstat64 sys_lstat64 compat_sys_x86_lstat64 -197 i386 fstat64 sys_fstat64 compat_sys_x86_fstat64 +193 i386 truncate64 sys_truncate64 compat_sys_ia32_truncate64 +194 i386 ftruncate64 sys_ftruncate64 compat_sys_ia32_ftruncate64 +195 i386 stat64 sys_stat64 compat_sys_ia32_stat64 +196 i386 lstat64 sys_lstat64 compat_sys_ia32_lstat64 +197 i386 fstat64 sys_fstat64 compat_sys_ia32_fstat64 198 i386 lchown32 sys_lchown 199 i386 getuid32 sys_getuid 200 i386 getgid32 sys_getgid
@@ -236,7 +236,7 @@ # 222 is unused # 223 is unused 224 i386 gettid sys_gettid -225 i386 readahead sys_readahead compat_sys_x86_readahead +225 i386 readahead sys_readahead compat_sys_ia32_readahead 226 i386 setxattr sys_setxattr 227 i386 lsetxattr sys_lsetxattr 228 i386 fsetxattr sys_fsetxattr
@@ -261,7 +261,7 @@ 247 i386 io_getevents sys_io_getevents_time32 248 i386 io_submit sys_io_submit compat_sys_io_submit 249 i386 io_cancel sys_io_cancel -250 i386 fadvise64 sys_fadvise64 compat_sys_x86_fadvise64 +250 i386 fadvise64 sys_fadvise64 compat_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
@@ -283,7 +283,7 @@ 269 i386 fstatfs64 sys_fstatfs64 compat_sys_fstatfs64 270 i386 tgkill sys_tgkill 271 i386 utimes sys_utimes_time32 -272 i386 fadvise64_64 sys_fadvise64_64 compat_sys_x86_fadvise64_64 +272 i386 fadvise64_64 sys_fadvise64_64 compat_sys_ia32_fadvise64_64 273 i386 vserver 274 i386 mbind sys_mbind 275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy
@@ -311,7 +311,7 @@ 297 i386 mknodat sys_mknodat 298 i386 fchownat sys_fchownat 299 i386 futimesat sys_futimesat_time32 -300 i386 fstatat64 sys_fstatat64 compat_sys_x86_fstatat +300 i386 fstatat64 sys_fstatat64 compat_sys_ia32_fstatat64 301 i386 unlinkat sys_unlinkat 302 i386 renameat sys_renameat 303 i386 linkat sys_linkat
@@ -325,7 +325,7 @@ 311 i386 set_robust_list sys_set_robust_list compat_sys_set_robust_list 312 i386 get_robust_list sys_get_robust_list compat_sys_get_robust_list 313 i386 splice sys_splice -314 i386 sync_file_range sys_sync_file_range compat_sys_x86_sync_file_range +314 i386 sync_file_range sys_sync_file_range compat_sys_ia32_sync_file_range 315 i386 tee sys_tee 316 i386 vmsplice sys_vmsplice compat_sys_vmsplice 317 i386 move_pages sys_move_pages compat_sys_move_pages
@@ -335,7 +335,7 @@ 321 i386 signalfd sys_signalfd compat_sys_signalfd 322 i386 timerfd_create sys_timerfd_create 323 i386 eventfd sys_eventfd -324 i386 fallocate sys_fallocate compat_sys_x86_fallocate +324 i386 fallocate sys_fallocate compat_sys_ia32_fallocate 325 i386 timerfd_settime sys_timerfd_settime32 326 i386 timerfd_gettime sys_timerfd_gettime32 327 i386 signalfd4 sys_signalfd4 compat_sys_signalfd4
arch/x86/ia32/sys_ia32.c +15 -15
@@ -52,14 +52,14 @@#define AA (__x) ((unsigned long)(__x)) -COMPAT_SYSCALL_DEFINE3(x86_truncate64, const char __user *, filename, +COMPAT_SYSCALL_DEFINE3(ia32_truncate64, const char __user *, filename, unsigned long, offset_low, unsigned long, offset_high) {return ksys_truncate (filename, ((loff_t ) offset_high <<32 ) | offset_low); } -COMPAT_SYSCALL_DEFINE3(x86_ftruncate64, unsigned int, fd, +COMPAT_SYSCALL_DEFINE3(ia32_ftruncate64, unsigned int, fd, unsigned long, offset_low, unsigned long, offset_high) {return ksys_ftruncate (fd, ((loff_t ) offset_high <<32 ) | offset_low);
@@ -97,7 +97,7 @@ static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)return 0 ; } -COMPAT_SYSCALL_DEFINE2(x86_stat64, const char __user *, filename, +COMPAT_SYSCALL_DEFINE2(ia32_stat64, const char __user *, filename, struct stat64 __user *, statbuf) {struct kstat stat;
@@ -108,7 +108,7 @@ COMPAT_SYSCALL_DEFINE2(x86_stat64, const char __user *, filename,return ret; } -COMPAT_SYSCALL_DEFINE2(x86_lstat64, const char __user *, filename, +COMPAT_SYSCALL_DEFINE2(ia32_lstat64, const char __user *, filename, struct stat64 __user *, statbuf) {struct kstat stat;
@@ -118,7 +118,7 @@ COMPAT_SYSCALL_DEFINE2(x86_lstat64, const char __user *, filename,return ret; } -COMPAT_SYSCALL_DEFINE2(x86_fstat64, unsigned int, fd, +COMPAT_SYSCALL_DEFINE2(ia32_fstat64, unsigned int, fd, struct stat64 __user *, statbuf) {struct kstat stat;
@@ -128,7 +128,7 @@ COMPAT_SYSCALL_DEFINE2(x86_fstat64, unsigned int, fd,return ret; } -COMPAT_SYSCALL_DEFINE4(x86_fstatat, unsigned int, dfd, +COMPAT_SYSCALL_DEFINE4(ia32_fstatat64, unsigned int, dfd, const char __user *, filename, struct stat64 __user *, statbuf, int, flag) {
@@ -156,7 +156,7 @@ struct mmap_arg_struct32 {unsigned int offset; }; -COMPAT_SYSCALL_DEFINE1(x86_mmap, struct mmap_arg_struct32 __user *, arg) +COMPAT_SYSCALL_DEFINE1(ia32_mmap, struct mmap_arg_struct32 __user *, arg) {struct mmap_arg_struct32 a;
@@ -171,14 +171,14 @@ COMPAT_SYSCALL_DEFINE1(x86_mmap, struct mmap_arg_struct32 __user *, arg) }/* warning: next two assume little endian */ -COMPAT_SYSCALL_DEFINE5(x86_pread, unsigned int, fd, char __user *, ubuf, +COMPAT_SYSCALL_DEFINE5(ia32_pread64, unsigned int, fd, char __user *, ubuf, u32, count, u32, poslo, u32, poshi) {return ksys_pread64 (fd, ubuf, count, ((loff_t )AA (poshi) <<32 ) |AA (poslo)); } -COMPAT_SYSCALL_DEFINE5(x86_pwrite, unsigned int, fd, const char __user *, ubuf, +COMPAT_SYSCALL_DEFINE5(ia32_pwrite64, unsigned int, fd, const char __user *, ubuf, u32, count, u32, poslo, u32, poshi) { return ksys_pwrite64(fd, ubuf, count,
@@ -190,7 +190,7 @@ COMPAT_SYSCALL_DEFINE5(x86_pwrite, unsigned int, fd, const char __user *, ubuf,* Some system calls that need sign extended arguments. This could be * done by a generic wrapper. */ -COMPAT_SYSCALL_DEFINE6 (x86_fadvise64_64, int, fd, __u32, offset_low, +COMPAT_SYSCALL_DEFINE6 (ia32_fadvise64_64, int, fd, __u32, offset_low, __u32, offset_high, __u32, len_low, __u32, len_high, int, advice) {
@@ -200,13 +200,13 @@ COMPAT_SYSCALL_DEFINE6(x86_fadvise64_64, int, fd, __u32, offset_low, advice); } -COMPAT_SYSCALL_DEFINE4(x86_readahead, int, fd, unsigned int, off_lo, +COMPAT_SYSCALL_DEFINE4(ia32_readahead, int, fd, unsigned int, off_lo, unsigned int, off_hi, size_t, count) {return ksys_readahead (fd, ((u64 )off_hi <<32 ) | off_lo, count); } -COMPAT_SYSCALL_DEFINE6(x86_sync_file_range, int, fd, unsigned int, off_low, +COMPAT_SYSCALL_DEFINE6(ia32_sync_file_range, int, fd, unsigned int, off_low, unsigned int, off_hi, unsigned int, n_low, unsigned int, n_hi, int, flags) {
@@ -215,14 +215,14 @@ COMPAT_SYSCALL_DEFINE6(x86_sync_file_range, int, fd, unsigned int, off_low, ((u64)n_hi << 32) | n_low, flags); } -COMPAT_SYSCALL_DEFINE5(x86_fadvise64, int, fd, unsigned int, offset_lo, +COMPAT_SYSCALL_DEFINE5(ia32_fadvise64, int, fd, unsigned int, offset_lo, unsigned int, offset_hi, size_t, len, int, advice) {return ksys_fadvise64_64 (fd, ((u64 )offset_hi <<32 ) | offset_lo, len, advice); } -COMPAT_SYSCALL_DEFINE6 (x86_fallocate, int, fd, int, mode, +COMPAT_SYSCALL_DEFINE6 (ia32_fallocate, int, fd, int, mode, unsigned int, offset_lo, unsigned int, offset_hi, unsigned int, len_lo, unsigned int, len_hi) {
@@ -233,7 +233,7 @@ COMPAT_SYSCALL_DEFINE6(x86_fallocate, int, fd, int, mode,/* * The 32-bit clone ABI is CONFIG_CLONE_BACKWARDS */ -COMPAT_SYSCALL_DEFINE5(x86_clone, unsigned long, clone_flags, +COMPAT_SYSCALL_DEFINE5(ia32_clone, unsigned long, clone_flags, unsigned long, newsp, int __user *, parent_tidptr, unsigned long, tls_val, int __user *, child_tidptr) {
Signature · 1 line
2.24.1
Re: [PATCH v4 14/18] x86, syscalls: Rename 32-bit specific syscalls
Quoted 5 lines · Brian Gerst
Rename the syscalls that only exist for 32-bit from x86_* to ia32_* to make it clear they are for 32-bit only. Also rename the functions to match the syscall name.
Signed-off-by Brian Gerst <[email protected]>
Thanks,
Dominik
[tip: x86/entry] x86/entry/32: Rename 32-bit specific syscalls
In reply to Brian GerstThe following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 866128a996647097d599c6b91deb340d4da593a8 Gitweb: https://git.kernel.org/tip/866128a996647097d599c6b91deb340d4da593a8 Author: Brian Gerst <[email protected]> AuthorDate: Fri, 13 Mar 2020 15:51:40 -04:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:23 +01:00
x86/entry/32: Rename 32-bit specific syscalls
Rename the syscalls that only exist for 32-bit from x86_* to ia32_* to make it clear they are for 32-bit only. Also rename the functions to match the syscall name.
--- arch/x86/entry/syscalls/syscall_32.tbl | 30 ++++++++++++------------- arch/x86/ia32/sys_ia32.c | 30 ++++++++++++------------- 2 files changed, 30 insertions(+), 30 deletions(-)
arch/x86/entry/syscalls/syscall_32.tbl +15 -15
@@ -101,7 +101,7 @@ 87 i386 swapon sys_swapon 88 i386 reboot sys_reboot 89 i386 readdir sys_old_readdir compat_sys_old_readdir -90 i386 mmap sys_old_mmap compat_sys_x86_mmap +90 i386 mmap sys_old_mmap compat_sys_ia32_mmap 91 i386 munmap sys_munmap 92 i386 truncate sys_truncate compat_sys_truncate 93 i386 ftruncate sys_ftruncate compat_sys_ftruncate
@@ -131,7 +131,7 @@ 117 i386 ipc sys_ipc compat_sys_ipc 118 i386 fsync sys_fsync 119 i386 sigreturn sys_sigreturn compat_sys_sigreturn -120 i386 clone sys_clone compat_sys_x86_clone +120 i386 clone sys_clone compat_sys_ia32_clone 121 i386 setdomainname sys_setdomainname 122 i386 uname sys_newuname 123 i386 modify_ldt sys_modify_ldt
@@ -191,8 +191,8 @@ 177 i386 rt_sigtimedwait sys_rt_sigtimedwait_time32 compat_sys_rt_sigtimedwait_time32 178 i386 rt_sigqueueinfo sys_rt_sigqueueinfo compat_sys_rt_sigqueueinfo 179 i386 rt_sigsuspend sys_rt_sigsuspend compat_sys_rt_sigsuspend -180 i386 pread64 sys_pread64 compat_sys_x86_pread -181 i386 pwrite64 sys_pwrite64 compat_sys_x86_pwrite +180 i386 pread64 sys_pread64 compat_sys_ia32_pread64 +181 i386 pwrite64 sys_pwrite64 compat_sys_ia32_pwrite64 182 i386 chown sys_chown16 183 i386 getcwd sys_getcwd 184 i386 capget sys_capget
@@ -204,11 +204,11 @@ 190 i386 vfork sys_vfork 191 i386 ugetrlimit sys_getrlimit compat_sys_getrlimit 192 i386 mmap2 sys_mmap_pgoff -193 i386 truncate64 sys_truncate64 compat_sys_x86_truncate64 -194 i386 ftruncate64 sys_ftruncate64 compat_sys_x86_ftruncate64 -195 i386 stat64 sys_stat64 compat_sys_x86_stat64 -196 i386 lstat64 sys_lstat64 compat_sys_x86_lstat64 -197 i386 fstat64 sys_fstat64 compat_sys_x86_fstat64 +193 i386 truncate64 sys_truncate64 compat_sys_ia32_truncate64 +194 i386 ftruncate64 sys_ftruncate64 compat_sys_ia32_ftruncate64 +195 i386 stat64 sys_stat64 compat_sys_ia32_stat64 +196 i386 lstat64 sys_lstat64 compat_sys_ia32_lstat64 +197 i386 fstat64 sys_fstat64 compat_sys_ia32_fstat64 198 i386 lchown32 sys_lchown 199 i386 getuid32 sys_getuid 200 i386 getgid32 sys_getgid
@@ -236,7 +236,7 @@ # 222 is unused # 223 is unused 224 i386 gettid sys_gettid -225 i386 readahead sys_readahead compat_sys_x86_readahead +225 i386 readahead sys_readahead compat_sys_ia32_readahead 226 i386 setxattr sys_setxattr 227 i386 lsetxattr sys_lsetxattr 228 i386 fsetxattr sys_fsetxattr
@@ -261,7 +261,7 @@ 247 i386 io_getevents sys_io_getevents_time32 248 i386 io_submit sys_io_submit compat_sys_io_submit 249 i386 io_cancel sys_io_cancel -250 i386 fadvise64 sys_fadvise64 compat_sys_x86_fadvise64 +250 i386 fadvise64 sys_fadvise64 compat_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
@@ -283,7 +283,7 @@ 269 i386 fstatfs64 sys_fstatfs64 compat_sys_fstatfs64 270 i386 tgkill sys_tgkill 271 i386 utimes sys_utimes_time32 -272 i386 fadvise64_64 sys_fadvise64_64 compat_sys_x86_fadvise64_64 +272 i386 fadvise64_64 sys_fadvise64_64 compat_sys_ia32_fadvise64_64 273 i386 vserver 274 i386 mbind sys_mbind 275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy
@@ -311,7 +311,7 @@ 297 i386 mknodat sys_mknodat 298 i386 fchownat sys_fchownat 299 i386 futimesat sys_futimesat_time32 -300 i386 fstatat64 sys_fstatat64 compat_sys_x86_fstatat +300 i386 fstatat64 sys_fstatat64 compat_sys_ia32_fstatat64 301 i386 unlinkat sys_unlinkat 302 i386 renameat sys_renameat 303 i386 linkat sys_linkat
@@ -325,7 +325,7 @@ 311 i386 set_robust_list sys_set_robust_list compat_sys_set_robust_list 312 i386 get_robust_list sys_get_robust_list compat_sys_get_robust_list 313 i386 splice sys_splice -314 i386 sync_file_range sys_sync_file_range compat_sys_x86_sync_file_range +314 i386 sync_file_range sys_sync_file_range compat_sys_ia32_sync_file_range 315 i386 tee sys_tee 316 i386 vmsplice sys_vmsplice compat_sys_vmsplice 317 i386 move_pages sys_move_pages compat_sys_move_pages
@@ -335,7 +335,7 @@ 321 i386 signalfd sys_signalfd compat_sys_signalfd 322 i386 timerfd_create sys_timerfd_create 323 i386 eventfd sys_eventfd -324 i386 fallocate sys_fallocate compat_sys_x86_fallocate +324 i386 fallocate sys_fallocate compat_sys_ia32_fallocate 325 i386 timerfd_settime sys_timerfd_settime32 326 i386 timerfd_gettime sys_timerfd_gettime32 327 i386 signalfd4 sys_signalfd4 compat_sys_signalfd4
arch/x86/ia32/sys_ia32.c +15 -15
@@ -52,14 +52,14 @@#define AA (__x) ((unsigned long)(__x)) -COMPAT_SYSCALL_DEFINE3(x86_truncate64, const char __user *, filename, +COMPAT_SYSCALL_DEFINE3(ia32_truncate64, const char __user *, filename, unsigned long, offset_low, unsigned long, offset_high) {return ksys_truncate (filename, ((loff_t ) offset_high <<32 ) | offset_low); } -COMPAT_SYSCALL_DEFINE3(x86_ftruncate64, unsigned int, fd, +COMPAT_SYSCALL_DEFINE3(ia32_ftruncate64, unsigned int, fd, unsigned long, offset_low, unsigned long, offset_high) {return ksys_ftruncate (fd, ((loff_t ) offset_high <<32 ) | offset_low);
@@ -97,7 +97,7 @@ static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)return 0 ; } -COMPAT_SYSCALL_DEFINE2(x86_stat64, const char __user *, filename, +COMPAT_SYSCALL_DEFINE2(ia32_stat64, const char __user *, filename, struct stat64 __user *, statbuf) {struct kstat stat;
@@ -108,7 +108,7 @@ COMPAT_SYSCALL_DEFINE2(x86_stat64, const char __user *, filename,return ret; } -COMPAT_SYSCALL_DEFINE2(x86_lstat64, const char __user *, filename, +COMPAT_SYSCALL_DEFINE2(ia32_lstat64, const char __user *, filename, struct stat64 __user *, statbuf) {struct kstat stat;
@@ -118,7 +118,7 @@ COMPAT_SYSCALL_DEFINE2(x86_lstat64, const char __user *, filename,return ret; } -COMPAT_SYSCALL_DEFINE2(x86_fstat64, unsigned int, fd, +COMPAT_SYSCALL_DEFINE2(ia32_fstat64, unsigned int, fd, struct stat64 __user *, statbuf) {struct kstat stat;
@@ -128,7 +128,7 @@ COMPAT_SYSCALL_DEFINE2(x86_fstat64, unsigned int, fd,return ret; } -COMPAT_SYSCALL_DEFINE4(x86_fstatat, unsigned int, dfd, +COMPAT_SYSCALL_DEFINE4(ia32_fstatat64, unsigned int, dfd, const char __user *, filename, struct stat64 __user *, statbuf, int, flag) {
@@ -156,7 +156,7 @@ struct mmap_arg_struct32 {unsigned int offset; }; -COMPAT_SYSCALL_DEFINE1(x86_mmap, struct mmap_arg_struct32 __user *, arg) +COMPAT_SYSCALL_DEFINE1(ia32_mmap, struct mmap_arg_struct32 __user *, arg) {struct mmap_arg_struct32 a;
@@ -171,14 +171,14 @@ COMPAT_SYSCALL_DEFINE1(x86_mmap, struct mmap_arg_struct32 __user *, arg) }/* warning: next two assume little endian */ -COMPAT_SYSCALL_DEFINE5(x86_pread, unsigned int, fd, char __user *, ubuf, +COMPAT_SYSCALL_DEFINE5(ia32_pread64, unsigned int, fd, char __user *, ubuf, u32, count, u32, poslo, u32, poshi) {return ksys_pread64 (fd, ubuf, count, ((loff_t )AA (poshi) <<32 ) |AA (poslo)); } -COMPAT_SYSCALL_DEFINE5(x86_pwrite, unsigned int, fd, const char __user *, ubuf, +COMPAT_SYSCALL_DEFINE5(ia32_pwrite64, unsigned int, fd, const char __user *, ubuf, u32, count, u32, poslo, u32, poshi) { return ksys_pwrite64(fd, ubuf, count,
@@ -190,7 +190,7 @@ COMPAT_SYSCALL_DEFINE5(x86_pwrite, unsigned int, fd, const char __user *, ubuf,* Some system calls that need sign extended arguments. This could be * done by a generic wrapper. */ -COMPAT_SYSCALL_DEFINE6 (x86_fadvise64_64, int, fd, __u32, offset_low, +COMPAT_SYSCALL_DEFINE6 (ia32_fadvise64_64, int, fd, __u32, offset_low, __u32, offset_high, __u32, len_low, __u32, len_high, int, advice) {
@@ -200,13 +200,13 @@ COMPAT_SYSCALL_DEFINE6(x86_fadvise64_64, int, fd, __u32, offset_low, advice); } -COMPAT_SYSCALL_DEFINE4(x86_readahead, int, fd, unsigned int, off_lo, +COMPAT_SYSCALL_DEFINE4(ia32_readahead, int, fd, unsigned int, off_lo, unsigned int, off_hi, size_t, count) {return ksys_readahead (fd, ((u64 )off_hi <<32 ) | off_lo, count); } -COMPAT_SYSCALL_DEFINE6(x86_sync_file_range, int, fd, unsigned int, off_low, +COMPAT_SYSCALL_DEFINE6(ia32_sync_file_range, int, fd, unsigned int, off_low, unsigned int, off_hi, unsigned int, n_low, unsigned int, n_hi, int, flags) {
@@ -215,14 +215,14 @@ COMPAT_SYSCALL_DEFINE6(x86_sync_file_range, int, fd, unsigned int, off_low, ((u64)n_hi << 32) | n_low, flags); } -COMPAT_SYSCALL_DEFINE5(x86_fadvise64, int, fd, unsigned int, offset_lo, +COMPAT_SYSCALL_DEFINE5(ia32_fadvise64, int, fd, unsigned int, offset_lo, unsigned int, offset_hi, size_t, len, int, advice) {return ksys_fadvise64_64 (fd, ((u64 )offset_hi <<32 ) | offset_lo, len, advice); } -COMPAT_SYSCALL_DEFINE6 (x86_fallocate, int, fd, int, mode, +COMPAT_SYSCALL_DEFINE6 (ia32_fallocate, int, fd, int, mode, unsigned int, offset_lo, unsigned int, offset_hi, unsigned int, len_lo, unsigned int, len_hi) {
@@ -233,7 +233,7 @@ COMPAT_SYSCALL_DEFINE6(x86_fallocate, int, fd, int, mode,/* * The 32-bit clone ABI is CONFIG_CLONE_BACKWARDS */ -COMPAT_SYSCALL_DEFINE5(x86_clone, unsigned long, clone_flags, +COMPAT_SYSCALL_DEFINE5(ia32_clone, unsigned long, clone_flags, unsigned long, newsp, int __user *, parent_tidptr, unsigned long, tls_val, int __user *, child_tidptr) {
PATCH v4 15/18 x86: Use IA32-specific wrappers for syscalls taking 64-bit arguments
In reply to Brian GerstFor the 32-bit syscall interface, 64-bit arguments (loff_t) are passed via a pair of 32-bit registers. These register pairs end up in consecutive stack slots, which matches the C ABI for 64-bit arguments. But when accessing the registers directly from pt_regs, the wrapper needs to manually reassemble the 64-bit value. These wrappers already exist for 32-bit compat, so make them available to 32-bit native in preparation for enabling pt_regs-based syscalls.
---
arch/x86/entry/syscalls/syscall_32.tbl | 18 ++--
arch/x86/ia32/Makefile | 2 +-
arch/x86/kernel/Makefile | 2 +
arch/x86/{ia32 => kernel}/sys_ia32.c | 131 +++++++++++++------------
arch/x86/um/Makefile | 1 +
5 files changed, 79 insertions(+), 75 deletions(-)
rename arch/x86/{ia32 => kernel}/sys_ia32.c (83%)arch/x86/entry/syscalls/syscall_32.tbl +9 -9
@@ -191,8 +191,8 @@ 177 i386 rt_sigtimedwait sys_rt_sigtimedwait_time32 compat_sys_rt_sigtimedwait_time32 178 i386 rt_sigqueueinfo sys_rt_sigqueueinfo compat_sys_rt_sigqueueinfo 179 i386 rt_sigsuspend sys_rt_sigsuspend compat_sys_rt_sigsuspend -180 i386 pread64 sys_pread64 compat_sys_ia32_pread64 -181 i386 pwrite64 sys_pwrite64 compat_sys_ia32_pwrite64 +180 i386 pread64 sys_ia32_pread64 +181 i386 pwrite64 sys_ia32_pwrite64 182 i386 chown sys_chown16 183 i386 getcwd sys_getcwd 184 i386 capget sys_capget
@@ -204,8 +204,8 @@ 190 i386 vfork sys_vfork 191 i386 ugetrlimit sys_getrlimit compat_sys_getrlimit 192 i386 mmap2 sys_mmap_pgoff -193 i386 truncate64 sys_truncate64 compat_sys_ia32_truncate64 -194 i386 ftruncate64 sys_ftruncate64 compat_sys_ia32_ftruncate64 +193 i386 truncate64 sys_ia32_truncate64 +194 i386 ftruncate64 sys_ia32_ftruncate64 195 i386 stat64 sys_stat64 compat_sys_ia32_stat64 196 i386 lstat64 sys_lstat64 compat_sys_ia32_lstat64 197 i386 fstat64 sys_fstat64 compat_sys_ia32_fstat64
@@ -236,7 +236,7 @@ # 222 is unused # 223 is unused 224 i386 gettid sys_gettid -225 i386 readahead sys_readahead compat_sys_ia32_readahead +225 i386 readahead sys_ia32_readahead 226 i386 setxattr sys_setxattr 227 i386 lsetxattr sys_lsetxattr 228 i386 fsetxattr sys_fsetxattr
@@ -261,7 +261,7 @@ 247 i386 io_getevents sys_io_getevents_time32 248 i386 io_submit sys_io_submit compat_sys_io_submit 249 i386 io_cancel sys_io_cancel -250 i386 fadvise64 sys_fadvise64 compat_sys_ia32_fadvise64 +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
@@ -283,7 +283,7 @@ 269 i386 fstatfs64 sys_fstatfs64 compat_sys_fstatfs64 270 i386 tgkill sys_tgkill 271 i386 utimes sys_utimes_time32 -272 i386 fadvise64_64 sys_fadvise64_64 compat_sys_ia32_fadvise64_64 +272 i386 fadvise64_64 sys_ia32_fadvise64_64 273 i386 vserver 274 i386 mbind sys_mbind 275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy
@@ -325,7 +325,7 @@ 311 i386 set_robust_list sys_set_robust_list compat_sys_set_robust_list 312 i386 get_robust_list sys_get_robust_list compat_sys_get_robust_list 313 i386 splice sys_splice -314 i386 sync_file_range sys_sync_file_range compat_sys_ia32_sync_file_range +314 i386 sync_file_range sys_ia32_sync_file_range 315 i386 tee sys_tee 316 i386 vmsplice sys_vmsplice compat_sys_vmsplice 317 i386 move_pages sys_move_pages compat_sys_move_pages
@@ -335,7 +335,7 @@ 321 i386 signalfd sys_signalfd compat_sys_signalfd 322 i386 timerfd_create sys_timerfd_create 323 i386 eventfd sys_eventfd -324 i386 fallocate sys_fallocate compat_sys_ia32_fallocate +324 i386 fallocate sys_ia32_fallocate 325 i386 timerfd_settime sys_timerfd_settime32 326 i386 timerfd_gettime sys_timerfd_gettime32 327 i386 signalfd4 sys_signalfd4 compat_sys_signalfd4
arch/x86/ia32/Makefile +1 -1
@@ -3,7 +3,7 @@ # Makefile for the ia32 kernel emulation subsystem. # -obj-$(CONFIG_IA32_EMULATION) := sys_ia32.o ia32_signal.o +obj-$(CONFIG_IA32_EMULATION) := ia32_signal.o obj-$(CONFIG_IA32_AOUT) += ia32_aout.o
arch/x86/kernel/Makefile +2 -0
@@ -57,6 +57,8 @@ obj-y += setup.o x86_init.o i8259.o irqinit.o obj-$(CONFIG_JUMP_LABEL) += jump_label.o obj-$(CONFIG_IRQ_WORK) += irq_work.o obj-y += probe_roms.o +obj-$(CONFIG_X86_32) += sys_ia32.o +obj-$(CONFIG_IA32_EMULATION) += sys_ia32.o obj-$(CONFIG_X86_64) += sys_x86_64.o obj-$(CONFIG_X86_ESPFIX64) += espfix_64.o obj-$(CONFIG_SYSFS) += ksysfs.o
arch/x86/kernel/sys_ia32.c renamed from arch/x86/ia32/sys_ia32.c +66 -65
155 lines not on this page · raw message
arch/x86/um/Makefile +1 -0
@@ -21,6 +21,7 @@ obj-y += checksum_32.o syscalls_32.o obj-$(CONFIG_ELF_CORE) += elfcore.o subarch-y = ../lib/string_32.o ../lib/atomic64_32.o ../lib/atomic64_cx8_32.o +subarch-y += ../kernel/sys_ia32.o else
Signature · 1 line
2.24.1
[tip: x86/entry] x86/entry/32: Use IA32-specific wrappers for syscalls taking 64-bit arguments
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 121b32a58a3af89a780cf194ce3769fc4120e574 Gitweb: https://git.kernel.org/tip/121b32a58a3af89a780cf194ce3769fc4120e574 Author: Brian Gerst <[email protected]> AuthorDate: Fri, 13 Mar 2020 15:51:41 -04:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:24 +01:00
x86/entry/32: Use IA32-specific wrappers for syscalls taking 64-bit arguments
For the 32-bit syscall interface, 64-bit arguments (loff_t) are passed via a pair of 32-bit registers. These register pairs end up in consecutive stack slots, which matches the C ABI for 64-bit arguments. But when accessing the registers directly from pt_regs, the wrapper needs to manually reassemble the 64-bit value. These wrappers already exist for 32-bit compat, so make them available to 32-bit native in preparation for enabling pt_regs-based syscalls.
--- arch/x86/entry/syscalls/syscall_32.tbl | 18 +- arch/x86/ia32/Makefile | 2 +- arch/x86/ia32/sys_ia32.c | 254 +------------------------ arch/x86/kernel/Makefile | 2 +- arch/x86/kernel/sys_ia32.c | 255 ++++++++++++++++++++++++- arch/x86/um/Makefile | 1 +- 6 files changed, 268 insertions(+), 264 deletions(-) delete mode 100644 arch/x86/ia32/sys_ia32.c create mode 100644 arch/x86/kernel/sys_ia32.c
arch/x86/entry/syscalls/syscall_32.tbl +9 -9
@@ -191,8 +191,8 @@ 177 i386 rt_sigtimedwait sys_rt_sigtimedwait_time32 compat_sys_rt_sigtimedwait_time32 178 i386 rt_sigqueueinfo sys_rt_sigqueueinfo compat_sys_rt_sigqueueinfo 179 i386 rt_sigsuspend sys_rt_sigsuspend compat_sys_rt_sigsuspend -180 i386 pread64 sys_pread64 compat_sys_ia32_pread64 -181 i386 pwrite64 sys_pwrite64 compat_sys_ia32_pwrite64 +180 i386 pread64 sys_ia32_pread64 +181 i386 pwrite64 sys_ia32_pwrite64 182 i386 chown sys_chown16 183 i386 getcwd sys_getcwd 184 i386 capget sys_capget
@@ -204,8 +204,8 @@ 190 i386 vfork sys_vfork 191 i386 ugetrlimit sys_getrlimit compat_sys_getrlimit 192 i386 mmap2 sys_mmap_pgoff -193 i386 truncate64 sys_truncate64 compat_sys_ia32_truncate64 -194 i386 ftruncate64 sys_ftruncate64 compat_sys_ia32_ftruncate64 +193 i386 truncate64 sys_ia32_truncate64 +194 i386 ftruncate64 sys_ia32_ftruncate64 195 i386 stat64 sys_stat64 compat_sys_ia32_stat64 196 i386 lstat64 sys_lstat64 compat_sys_ia32_lstat64 197 i386 fstat64 sys_fstat64 compat_sys_ia32_fstat64
@@ -236,7 +236,7 @@ # 222 is unused # 223 is unused 224 i386 gettid sys_gettid -225 i386 readahead sys_readahead compat_sys_ia32_readahead +225 i386 readahead sys_ia32_readahead 226 i386 setxattr sys_setxattr 227 i386 lsetxattr sys_lsetxattr 228 i386 fsetxattr sys_fsetxattr
@@ -261,7 +261,7 @@ 247 i386 io_getevents sys_io_getevents_time32 248 i386 io_submit sys_io_submit compat_sys_io_submit 249 i386 io_cancel sys_io_cancel -250 i386 fadvise64 sys_fadvise64 compat_sys_ia32_fadvise64 +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
@@ -283,7 +283,7 @@ 269 i386 fstatfs64 sys_fstatfs64 compat_sys_fstatfs64 270 i386 tgkill sys_tgkill 271 i386 utimes sys_utimes_time32 -272 i386 fadvise64_64 sys_fadvise64_64 compat_sys_ia32_fadvise64_64 +272 i386 fadvise64_64 sys_ia32_fadvise64_64 273 i386 vserver 274 i386 mbind sys_mbind 275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy
@@ -325,7 +325,7 @@ 311 i386 set_robust_list sys_set_robust_list compat_sys_set_robust_list 312 i386 get_robust_list sys_get_robust_list compat_sys_get_robust_list 313 i386 splice sys_splice -314 i386 sync_file_range sys_sync_file_range compat_sys_ia32_sync_file_range +314 i386 sync_file_range sys_ia32_sync_file_range 315 i386 tee sys_tee 316 i386 vmsplice sys_vmsplice compat_sys_vmsplice 317 i386 move_pages sys_move_pages compat_sys_move_pages
@@ -335,7 +335,7 @@ 321 i386 signalfd sys_signalfd compat_sys_signalfd 322 i386 timerfd_create sys_timerfd_create 323 i386 eventfd sys_eventfd -324 i386 fallocate sys_fallocate compat_sys_ia32_fallocate +324 i386 fallocate sys_ia32_fallocate 325 i386 timerfd_settime sys_timerfd_settime32 326 i386 timerfd_gettime sys_timerfd_gettime32 327 i386 signalfd4 sys_signalfd4 compat_sys_signalfd4
arch/x86/ia32/Makefile +1 -1
@@ -3,7 +3,7 @@ # Makefile for the ia32 kernel emulation subsystem. # -obj-$(CONFIG_IA32_EMULATION) := sys_ia32.o ia32_signal.o +obj-$(CONFIG_IA32_EMULATION) := ia32_signal.o obj-$(CONFIG_IA32_AOUT) += ia32_aout.o
arch/x86/ia32/sys_ia32.c deleted +0 -254
254 lines not on this page · raw message
arch/x86/kernel/Makefile +2 -0
@@ -53,6 +53,8 @@ obj-y += setup.o x86_init.o i8259.o irqinit.o obj-$(CONFIG_JUMP_LABEL) += jump_label.o obj-$(CONFIG_IRQ_WORK) += irq_work.o obj-y += probe_roms.o +obj-$(CONFIG_X86_32) += sys_ia32.o +obj-$(CONFIG_IA32_EMULATION) += sys_ia32.o obj-$(CONFIG_X86_64) += sys_x86_64.o obj-$(CONFIG_X86_ESPFIX64) += espfix_64.o obj-$(CONFIG_SYSFS) += ksysfs.o
arch/x86/kernel/sys_ia32.c new file +255 -0
255 lines not on this page · raw message
arch/x86/um/Makefile +1 -0
@@ -21,6 +21,7 @@ obj-y += checksum_32.o syscalls_32.o obj-$(CONFIG_ELF_CORE) += elfcore.o subarch-y = ../lib/string_32.o ../lib/atomic64_32.o ../lib/atomic64_cx8_32.o +subarch-y += ../kernel/sys_ia32.o else
Re: [tip: x86/entry] x86/entry/32: Use IA32-specific wrappers for syscalls taking 64-bit arguments
Quoted 11 lines · On 21. 03. 20, 16:30, tip-bot2 for Brian Gerst wrote:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 121b32a58a3af89a780cf194ce3769fc4120e574 Gitweb: https://git.kernel.org/tip/121b32a58a3af89a780cf194ce3769fc4120e574 Author: Brian Gerst <[email protected]> AuthorDate: Fri, 13 Mar 2020 15:51:41 -04:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:24 +01:00x86/entry/32: Use IA32-specific wrappers for syscalls taking 64-bit arguments
Hi,
this breaks creation of sparse files (e.g. by tar) on i586 (in 5.7).
tar does this:
Quoted 11 lines
openat(4, "sparsefile", O_WRONLY|O_CREAT|O_EXCL|O_NOCTTY|O_NONBLOCK|O_LARGEFILE|O_CLOEXEC, 0600)= 5_llseek(5, 0, [0], SEEK_SET)= 0_llseek(5, 8589934592, [8589934592], SEEK_SET)= 0write(5, "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"..., 512)= 512_llseek(5, 8589935104, [8589935104], SEEK_SET)= 0_llseek(5, 0, [8589935104], SEEK_CUR)= 0ftruncate64(5, 8589935104)= 0
utimensat_time64(5, NULL, [UTIME_OMIT, {tv_sec=1591782127, tv_nsec=400000000} /* 2020-06-10T11:42:07.400000000+0200 */], 0) = 0fchown32(5, 0, 0) = 0 fchmod(5, 0644) = 0 close(5) = 0
It should result in a sparsefile of size 8589935104, but after this commit, it's only 512 bytes.
The archive is this:
XQAAgAD//////////wAXC8aHklo7p4/HJQ64D7SVnhAZOByg5PlRjaTJjmKhpQbF1loXWBYREoWY DagQFjCR/jUwLV7mWbgHwcINuoi1bu/eDQHOp5mXL9bq/twuolv5Y2krdqZEztWCBydhsNFwBxHi U47whwTByiH4Ot16JcEkr4BFWXHXMTRs1lfVmIOE13bldiM6MzQUC7212b81Rn13fw06uk+aoP74 OvatxDoW95Y7/xeMyDQ7uk8L1OfFGVRfU+PFycrb1gDZc6hLY2kDY15PGxCMSzHHGDE3nTr9Imdw UoUYqYNhi3tztLuue2rvzngAsMvHIEJaE6i2E5+X7lwlHZhg9Wp2T9ow9DyaJYLr/N+Jln7P1C97 2hT9YzrPNupujamDoBv0kIA3zgAw/xHvZX/I3tfa5Z8+TjrhfgJ8poGKK1S1e8LR+657FbBH3B46 HZFclvO0bUvL1xyRx0OPM1Dzzd+lH8VgF6RYHj1vDJCcR8nbtEfgN5W+cN44xdPO1VN/6Ffnj5Af 84sDSaBSn7HTnaaJRX0KPa3zfdUzTv/ykgihysjhxAV9CW02ZiVffVgrK5UHVuoWzqQ76+83fYsM rSWRtoL0a3eo/hbqPvHg1Q8dRvbjwLs610lu3QIkvQ0DOK7zUHx44ODHfLBS2LJcw5TCiU25xGCm NXS1oRaVdqnCV6Rl5KZHPiHF7ZRxQFQxLgreu8z0INZ41T74pGbfGvNRqyLy9wxiO4/uCICO0om/ oHlgowb9RWX9/0Z2
Feed it through (on i586):
mkdir directory; base64 -d | tar JxvC directory/
and check the size of directory/sparsefile.
Reverting the commit on the top of 5.7 doesn't help. I suppose it doesn't take the original path in the code there...
Any ideas?
Quoted 11 lines
For the 32-bit syscall interface, 64-bit arguments (
loff_t) are passed via a pair of 32-bit registers. These register pairs end up in consecutive stack slots, which matches the C ABI for 64-bit arguments. But when accessing the registers directly frompt_regs, the wrapper needs to manually reassemble the 64-bit value. These wrappers already exist for 32-bit compat, so make them available to 32-bit native in preparation for enabling pt_regs-based syscalls.Signed-off-by Brian Gerst <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>Reviewed-by Dominik Brodowski <[email protected]>
thanks,
Signature · 2 lines
js suse labs
Re: [tip: x86/entry] x86/entry/32: Use IA32-specific wrappers for syscalls taking 64-bit arguments
Quoted 49 lines · Jiri Slaby
Quoted 11 lines · On 21. 03. 20, 16:30, tip-bot2 for Brian Gerst wrote:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 121b32a58a3af89a780cf194ce3769fc4120e574 Gitweb: https://git.kernel.org/tip/121b32a58a3af89a780cf194ce3769fc4120e574 Author: Brian Gerst <[email protected]> AuthorDate: Fri, 13 Mar 2020 15:51:41 -04:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:24 +01:00x86/entry/32: Use IA32-specific wrappers for syscalls taking 64-bit arguments
Hi,
this breaks creation of sparse files (e.g. by tar) on i586 (in 5.7).
tar does this:
Quoted 11 lines
openat(4, "sparsefile", O_WRONLY|O_CREAT|O_EXCL|O_NOCTTY|O_NONBLOCK|O_LARGEFILE|O_CLOEXEC, 0600)= 5_llseek(5, 0, [0], SEEK_SET)= 0_llseek(5, 8589934592, [8589934592], SEEK_SET)= 0write(5, "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"..., 512)= 512_llseek(5, 8589935104, [8589935104], SEEK_SET)= 0_llseek(5, 0, [8589935104], SEEK_CUR)= 0ftruncate64(5, 8589935104)= 0
utimensat_time64(5, NULL, [UTIME_OMIT, {tv_sec=1591782127, tv_nsec=400000000} /* 2020-06-10T11:42:07.400000000+0200 */], 0) = 0fchown32(5, 0, 0) = 0 fchmod(5, 0644) = 0 close(5) = 0It should result in a sparsefile of size 8589935104, but after this commit, it's only 512 bytes.
The archive is this:
XQAAgAD//////////wAXC8aHklo7p4/HJQ64D7SVnhAZOByg5PlRjaTJjmKhpQbF1loXWBYREoWY DagQFjCR/jUwLV7mWbgHwcINuoi1bu/eDQHOp5mXL9bq/twuolv5Y2krdqZEztWCBydhsNFwBxHi U47whwTByiH4Ot16JcEkr4BFWXHXMTRs1lfVmIOE13bldiM6MzQUC7212b81Rn13fw06uk+aoP74 OvatxDoW95Y7/xeMyDQ7uk8L1OfFGVRfU+PFycrb1gDZc6hLY2kDY15PGxCMSzHHGDE3nTr9Imdw UoUYqYNhi3tztLuue2rvzngAsMvHIEJaE6i2E5+X7lwlHZhg9Wp2T9ow9DyaJYLr/N+Jln7P1C97 2hT9YzrPNupujamDoBv0kIA3zgAw/xHvZX/I3tfa5Z8+TjrhfgJ8poGKK1S1e8LR+657FbBH3B46 HZFclvO0bUvL1xyRx0OPM1Dzzd+lH8VgF6RYHj1vDJCcR8nbtEfgN5W+cN44xdPO1VN/6Ffnj5Af 84sDSaBSn7HTnaaJRX0KPa3zfdUzTv/ykgihysjhxAV9CW02ZiVffVgrK5UHVuoWzqQ76+83fYsM rSWRtoL0a3eo/hbqPvHg1Q8dRvbjwLs610lu3QIkvQ0DOK7zUHx44ODHfLBS2LJcw5TCiU25xGCm NXS1oRaVdqnCV6Rl5KZHPiHF7ZRxQFQxLgreu8z0INZ41T74pGbfGvNRqyLy9wxiO4/uCICO0om/ oHlgowb9RWX9/0Z2Feed it through (on i586):
mkdir directory; base64 -d | tar JxvC directory/
Quoted 6 lines
and check the size of directory/sparsefile.
Reverting the commit on the top of 5.7 doesn't help. I suppose it doesn't take the original path in the code there...
Any ideas?
Got it:
include/linux/syscalls.h +0 -0
@@ -1358,7 +1358,7 @@ static inline long ksys_lchown(const char __user
*filename, uid_t user,
extern long do_sys_ftruncate(unsigned int fd, loff_t length, int small);
-static inline long ksys_ftruncate(unsigned int fd, unsigned long length) +static inline long ksys_ftruncate(unsigned int fd, loff_t length)
{
return do_sys_ftruncate(fd, length, 1);}
Will send a patch in few minutes.
thanks,
Signature · 2 lines
js suse labs
PATCH v4 16/18 x86-32: Enable pt_regs based syscalls
In reply to Brian GerstEnable pt_regs based syscalls for 32-bit. This makes the 32-bit native kernel consistent with the 64-bit kernel, and improves the syscall interface by not needing to push all 6 potential arguments onto the stack.
--- arch/x86/Kconfig | 2 +- arch/x86/entry/common.c | 15 ---- arch/x86/entry/syscall_32.c | 15 +--- arch/x86/include/asm/syscall.h | 6 -- arch/x86/include/asm/syscall_wrapper.h | 111 ++++++++++++++----------- arch/x86/include/asm/syscalls.h | 29 ------- 6 files changed, 64 insertions(+), 114 deletions(-)
arch/x86/Kconfig +1 -1
@@ -30,7 +30,6 @@ config X86_64 select MODULES_USE_ELF_RELA select NEED_DMA_MAP_STATE select SWIOTLB - select ARCH_HAS_SYSCALL_WRAPPER config FORCE_DYNAMIC_FTRACE def_bool y
@@ -79,6 +78,7 @@ config X86 select ARCH_HAS_STRICT_KERNEL_RWX select ARCH_HAS_STRICT_MODULE_RWX select ARCH_HAS_SYNC_CORE_BEFORE_USERMODE + select ARCH_HAS_SYSCALL_WRAPPER select ARCH_HAS_UBSAN_SANITIZE_ALL select ARCH_HAVE_NMI_SAFE_CMPXCHG select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
arch/x86/entry/common.c +0 -15
@@ -334,20 +334,7 @@ static __always_inline void do_syscall_32_irqs_on(struct pt_regs *regs)if (likely (nr < IA32_NR_syscalls)) { nr =array_index_nospec (nr, IA32_NR_syscalls); -#ifdef CONFIG_IA32_EMULATION regs->ax = ia32_sys_call_table[nr](regs); -#else -/* -* It's possible that a 32-bit syscall implementation -* takes a 64-bit parameter but nonetheless assumes that -* the high bits are zero. Make sure we zero-extend all -* of the args. -*/ - regs->ax = ia32_sys_call_table[nr]( - (unsigned int )regs->bx, (unsigned int )regs->cx, - (unsigned int )regs->dx, (unsigned int )regs->si, - (unsigned int )regs->di, (unsigned int )regs->bp); -#endif /* CONFIG_IA32_EMULATION */ }syscall_return_slowpath (regs);
@@ -440,9 +427,7 @@ __visible long do_fast_syscall_32(struct pt_regs *regs) }#endif -#ifdef CONFIG_X86_64 SYSCALL_DEFINE0 (ni_syscall) {return -ENOSYS ; } -#endif
arch/x86/entry/syscall_32.c +2 -13
@@ -4,33 +4,22 @@#include <linux/linkage.h> #include <linux/sys.h> #include <linux/cache.h> +#include <linux/syscalls.h> #include <asm/unistd.h> #include <asm/syscall.h> -#ifdef CONFIG_IA32_EMULATION -/* On X86_64, we use struct pt_regs * to pass parameters to syscalls */ #define __SYSCALL_I386 (nr, sym) extern asmlinkage long __ia32_##sym(const struct pt_regs *); -#define __sys_ni_syscall __ia32_sys_ni_syscall -#else /* CONFIG_IA32_EMULATION */ -#define __SYSCALL_I386 (nr, sym) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long); -extern asmlinkage long sys_ni_syscall (unsigned long ,unsigned long ,unsigned long ,unsigned long ,unsigned long ,unsigned long ); -#define __sys_ni_syscall sys_ni_syscall -#endif /* CONFIG_IA32_EMULATION */ #include <asm/syscalls_32.h> #undef __SYSCALL_I386 -#ifdef CONFIG_IA32_EMULATION #define __SYSCALL_I386 (nr, sym) [nr] = __ia32_##sym, -#else /* CONFIG_IA32_EMULATION */ -#define __SYSCALL_I386 (nr, sym) [nr] = sym, -#endif /* CONFIG_IA32_EMULATION */ __visible const sys_call_ptr_t ia32_sys_call_table[__NR_ia32_syscall_max+1] = {/* * Smells like a compiler bug -- it doesn't work * when the & below is removed. */ - [0 ... __NR_ia32_syscall_max] = &__sys_ni_syscall, + [0 ... __NR_ia32_syscall_max] = &__ia32_sys_ni_syscall, #include <asm/syscalls_32.h> };
arch/x86/include/asm/syscall.h +0 -6
@@ -16,13 +16,7 @@#include <asm/thread_info.h> /* for TS_COMPAT */ #include <asm/unistd.h> -#ifdef CONFIG_X86_64 typedef asmlinkage long (*sys_call_ptr_t )(const struct pt_regs *); -#else -typedef asmlinkage long (*sys_call_ptr_t )(unsigned long ,unsigned long , -unsigned long ,unsigned long , -unsigned long ,unsigned long ); -#endif /* CONFIG_X86_64 */ extern const sys_call_ptr_t sys_call_table[];#if defined(CONFIG_X86_32 )
arch/x86/include/asm/syscall_wrapper.h +61 -50
140 lines not on this page · raw message
arch/x86/include/asm/syscalls.h +0 -29
@@ -17,33 +17,4 @@/* kernel/ioport.c */ long ksys_ioperm (unsigned long from,unsigned long num,int turn_on); -#ifdef CONFIG_X86_32 -/* -* These definitions are only valid on pure 32-bit systems; x86-64 uses a -* different syscall calling convention -*/ -asmlinkage long sys_ioperm (unsigned long ,unsigned long ,int ); -asmlinkage long sys_iopl (unsigned int ); - -/* kernel/ldt.c */ -asmlinkage long sys_modify_ldt (int ,void __user *,unsigned long ); - -/* kernel/signal.c */ -asmlinkage long sys_rt_sigreturn (void ); - -/* kernel/tls.c */ -asmlinkage long sys_set_thread_area (struct user_desc __user *); -asmlinkage long sys_get_thread_area (struct user_desc __user *); - -/* X86_32 only */ - -/* kernel/signal.c */ -asmlinkage long sys_sigreturn (void ); - -/* kernel/vm86_32.c */ -struct vm86_struct ; -asmlinkage long sys_vm86old (struct vm86_struct __user *); -asmlinkage long sys_vm86 (unsigned long ,unsigned long ); - -#endif /* CONFIG_X86_32 */ #endif /* _ASM_X86_SYSCALLS_H */
Signature · 1 line
2.24.1
[tip: x86/entry] x86/entry/32: Enable pt_regs based syscalls
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 25c619e59b395a8c970d339f9c714302738e350e Gitweb: https://git.kernel.org/tip/25c619e59b395a8c970d339f9c714302738e350e Author: Brian Gerst <[email protected]> AuthorDate: Fri, 13 Mar 2020 15:51:42 -04:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:24 +01:00
x86/entry/32: Enable pt_regs based syscalls
Enable pt_regs based syscalls for 32-bit. This makes the 32-bit native kernel consistent with the 64-bit kernel, and improves the syscall interface by not needing to push all 6 potential arguments onto the stack.
--- arch/x86/Kconfig | 2 +- arch/x86/entry/common.c | 15 +--- arch/x86/entry/syscall_32.c | 15 +--- arch/x86/include/asm/syscall.h | 6 +- arch/x86/include/asm/syscall_wrapper.h | 111 +++++++++++++----------- arch/x86/include/asm/syscalls.h | 29 +------ 6 files changed, 64 insertions(+), 114 deletions(-)
arch/x86/Kconfig +1 -1
@@ -30,7 +30,6 @@ config X86_64 select MODULES_USE_ELF_RELA select NEED_DMA_MAP_STATE select SWIOTLB - select ARCH_HAS_SYSCALL_WRAPPER config FORCE_DYNAMIC_FTRACE def_bool y
@@ -80,6 +79,7 @@ config X86 select ARCH_HAS_STRICT_KERNEL_RWX select ARCH_HAS_STRICT_MODULE_RWX select ARCH_HAS_SYNC_CORE_BEFORE_USERMODE + select ARCH_HAS_SYSCALL_WRAPPER select ARCH_HAS_UBSAN_SANITIZE_ALL select ARCH_HAVE_NMI_SAFE_CMPXCHG select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
arch/x86/entry/common.c +0 -15
@@ -333,20 +333,7 @@ static __always_inline void do_syscall_32_irqs_on(struct pt_regs *regs)if (likely (nr < IA32_NR_syscalls)) { nr =array_index_nospec (nr, IA32_NR_syscalls); -#ifdef CONFIG_IA32_EMULATION regs->ax = ia32_sys_call_table[nr](regs); -#else -/* -* It's possible that a 32-bit syscall implementation -* takes a 64-bit parameter but nonetheless assumes that -* the high bits are zero. Make sure we zero-extend all -* of the args. -*/ - regs->ax = ia32_sys_call_table[nr]( - (unsigned int )regs->bx, (unsigned int )regs->cx, - (unsigned int )regs->dx, (unsigned int )regs->si, - (unsigned int )regs->di, (unsigned int )regs->bp); -#endif /* CONFIG_IA32_EMULATION */ }syscall_return_slowpath (regs);
@@ -439,9 +426,7 @@ __visible long do_fast_syscall_32(struct pt_regs *regs) }#endif -#ifdef CONFIG_X86_64 SYSCALL_DEFINE0 (ni_syscall) {return -ENOSYS ; } -#endif
arch/x86/entry/syscall_32.c +2 -13
@@ -4,33 +4,22 @@#include <linux/linkage.h> #include <linux/sys.h> #include <linux/cache.h> +#include <linux/syscalls.h> #include <asm/unistd.h> #include <asm/syscall.h> -#ifdef CONFIG_IA32_EMULATION -/* On X86_64, we use struct pt_regs * to pass parameters to syscalls */ #define __SYSCALL_I386 (nr, sym) extern asmlinkage long __ia32_##sym(const struct pt_regs *); -#define __sys_ni_syscall __ia32_sys_ni_syscall -#else /* CONFIG_IA32_EMULATION */ -#define __SYSCALL_I386 (nr, sym) extern asmlinkage long sym(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long); -extern asmlinkage long sys_ni_syscall (unsigned long ,unsigned long ,unsigned long ,unsigned long ,unsigned long ,unsigned long ); -#define __sys_ni_syscall sys_ni_syscall -#endif /* CONFIG_IA32_EMULATION */ #include <asm/syscalls_32.h> #undef __SYSCALL_I386 -#ifdef CONFIG_IA32_EMULATION #define __SYSCALL_I386 (nr, sym) [nr] = __ia32_##sym, -#else /* CONFIG_IA32_EMULATION */ -#define __SYSCALL_I386 (nr, sym) [nr] = sym, -#endif /* CONFIG_IA32_EMULATION */ __visible const sys_call_ptr_t ia32_sys_call_table[__NR_ia32_syscall_max+1] = {/* * Smells like a compiler bug -- it doesn't work * when the & below is removed. */ - [0 ... __NR_ia32_syscall_max] = &__sys_ni_syscall, + [0 ... __NR_ia32_syscall_max] = &__ia32_sys_ni_syscall, #include <asm/syscalls_32.h> };
arch/x86/include/asm/syscall.h +0 -6
@@ -16,13 +16,7 @@#include <asm/thread_info.h> /* for TS_COMPAT */ #include <asm/unistd.h> -#ifdef CONFIG_X86_64 typedef asmlinkage long (*sys_call_ptr_t )(const struct pt_regs *); -#else -typedef asmlinkage long (*sys_call_ptr_t )(unsigned long ,unsigned long , -unsigned long ,unsigned long , -unsigned long ,unsigned long ); -#endif /* CONFIG_X86_64 */ extern const sys_call_ptr_t sys_call_table[];#if defined(CONFIG_X86_32 )
arch/x86/include/asm/syscall_wrapper.h +61 -50
140 lines not on this page · raw message
arch/x86/include/asm/syscalls.h +0 -29
@@ -17,33 +17,4 @@/* kernel/ioport.c */ long ksys_ioperm (unsigned long from,unsigned long num,int turn_on); -#ifdef CONFIG_X86_32 -/* -* These definitions are only valid on pure 32-bit systems; x86-64 uses a -* different syscall calling convention -*/ -asmlinkage long sys_ioperm (unsigned long ,unsigned long ,int ); -asmlinkage long sys_iopl (unsigned int ); - -/* kernel/ldt.c */ -asmlinkage long sys_modify_ldt (int ,void __user *,unsigned long ); - -/* kernel/signal.c */ -asmlinkage long sys_rt_sigreturn (void ); - -/* kernel/tls.c */ -asmlinkage long sys_set_thread_area (struct user_desc __user *); -asmlinkage long sys_get_thread_area (struct user_desc __user *); - -/* X86_32 only */ - -/* kernel/signal.c */ -asmlinkage long sys_sigreturn (void ); - -/* kernel/vm86_32.c */ -struct vm86_struct ; -asmlinkage long sys_vm86old (struct vm86_struct __user *); -asmlinkage long sys_vm86 (unsigned long ,unsigned long ); - -#endif /* CONFIG_X86_32 */ #endif /* _ASM_X86_SYSCALLS_H */
PATCH v4 17/18 x86: Drop asmlinkage from syscalls
In reply to Brian Gerstasmlinkage is no longer required since the syscall ABI is now fully under x86 architecture control. This makes the 32-bit native syscalls a bit more effecient by passing in regs via EAX instead of on the stack.
--- arch/x86/entry/syscall_32.c | 2 +- arch/x86/entry/syscall_64.c | 2 +- arch/x86/entry/syscall_x32.c | 4 ++-- arch/x86/include/asm/syscall.h | 2 +- arch/x86/include/asm/syscall_wrapper.h | 31 ++++++++++++-------------- 5 files changed, 19 insertions(+), 22 deletions(-)
arch/x86/entry/syscall_32.c +1 -1
@@ -8,7 +8,7 @@#include <asm/unistd.h> #include <asm/syscall.h> -#define __SYSCALL_I386 (nr, sym) extern asmlinkage long __ia32_##sym(const struct pt_regs *); +#define __SYSCALL_I386 (nr, sym) extern long __ia32_##sym(const struct pt_regs *);#include <asm/syscalls_32.h> #undef __SYSCALL_I386
arch/x86/entry/syscall_64.c +1 -1
@@ -11,7 +11,7 @@#define __SYSCALL_X32 (nr, sym)#define __SYSCALL_COMMON (nr, sym) __SYSCALL_64(nr, sym) -#define __SYSCALL_64 (nr, sym) extern asmlinkage long __x64_##sym(const struct pt_regs *); +#define __SYSCALL_64 (nr, sym) extern long __x64_##sym(const struct pt_regs *);#include <asm/syscalls_64.h> #undef __SYSCALL_64
arch/x86/entry/syscall_x32.c +2 -2
@@ -10,8 +10,8 @@#define __SYSCALL_64 (nr, sym) -#define __SYSCALL_X32 (nr, sym) extern asmlinkage long __x32_##sym(const struct pt_regs *); -#define __SYSCALL_COMMON (nr, sym) extern asmlinkage long __x64_##sym(const struct pt_regs *); +#define __SYSCALL_X32 (nr, sym) extern long __x32_##sym(const struct pt_regs *); +#define __SYSCALL_COMMON (nr, sym) extern long __x64_##sym(const struct pt_regs *);#include <asm/syscalls_64.h> #undef __SYSCALL_X32#undef __SYSCALL_COMMON
arch/x86/include/asm/syscall.h +1 -1
@@ -16,7 +16,7 @@#include <asm/thread_info.h> /* for TS_COMPAT */ #include <asm/unistd.h> -typedef asmlinkage long (*sys_call_ptr_t )(const struct pt_regs *); +typedef long (*sys_call_ptr_t )(const struct pt_regs *);extern const sys_call_ptr_t sys_call_table[];#if defined(CONFIG_X86_32 )
arch/x86/include/asm/syscall_wrapper.h +14 -17
@@ -8,8 +8,8 @@struct pt_regs ; -extern asmlinkage long __x64_sys_ni_syscall (const struct pt_regs *regs); -extern asmlinkage long __ia32_sys_ni_syscall (const struct pt_regs *regs); +extern long __x64_sys_ni_syscall (const struct pt_regs *regs); +extern long __ia32_sys_ni_syscall (const struct pt_regs *regs);/* * Instead of the generic __SYSCALL_DEFINEx() definition, the x86 version takes
@@ -66,22 +66,21 @@ extern asmlinkage long __ia32_sys_ni_syscall(const struct pt_regs *regs); ,,(unsigned int)regs->di,,(unsigned int)regs->bp)#define __SYS_STUB0 (abi, name) \ - asmlinkage long __##abi##_##name(const struct pt_regs *regs); \ + long __##abi##_##name(const struct pt_regs *regs); \ ALLOW_ERROR_INJECTION(__##abi##_##name, ERRNO); \ - asmlinkage long __##abi##_##name(const struct pt_regs *regs) \ + long __##abi##_##name(const struct pt_regs *regs) \ __alias(__do_##name);#define __SYS_STUBx (abi, name, ...) \ - asmlinkage long __##abi##_##name(const struct pt_regs *regs); \ + long __##abi##_##name(const struct pt_regs *regs); \ ALLOW_ERROR_INJECTION(__##abi##_##name, ERRNO); \ - asmlinkage long __##abi##_##name(const struct pt_regs *regs) \ + long __##abi##_##name(const struct pt_regs *regs) \ { \ return __se_##name(__VA_ARGS__); \ }#define __COND_SYSCALL (abi, name) \ - asmlinkage __weak long \ - __##abi##_##name(const struct pt_regs *__unused) \ + __weak long __##abi##_##name(const struct pt_regs *__unused) \ { \ return sys_ni_syscall(); \ }
@@ -192,11 +191,11 @@ extern asmlinkage long __ia32_sys_ni_syscall(const struct pt_regs *regs);* of them. */ #define COMPAT_SYSCALL_DEFINE0 (name) \ - static asmlinkage long \ + static long \ __do_compat_sys_##name(const struct pt_regs *__unused); \ __IA32_COMPAT_SYS_STUB0(name) \ __X32_COMPAT_SYS_STUB0(name) \ - static asmlinkage long \ + static long \ __do_compat_sys_##name(const struct pt_regs *__unused)#define COMPAT_SYSCALL_DEFINEx (x, name, ...) \
@@ -248,12 +247,10 @@ extern asmlinkage long __ia32_sys_ni_syscall(const struct pt_regs *regs);*/ #define SYSCALL_DEFINE0 (sname) \ SYSCALL_METADATA(_##sname, 0); \ - static asmlinkage long \ - __do_sys_##sname(const struct pt_regs *__unused); \ + static long __do_sys_##sname(const struct pt_regs *__unused); \ __X64_SYS_STUB0(sname) \ __IA32_SYS_STUB0(sname) \ - static asmlinkage long \ - __do_sys_##sname(const struct pt_regs *__unused) + static long __do_sys_##sname(const struct pt_regs *__unused)#define COND_SYSCALL (name) \ __X64_COND_SYSCALL(name) \
@@ -268,8 +265,8 @@ extern asmlinkage long __ia32_sys_ni_syscall(const struct pt_regs *regs);* For VSYSCALLS, we need to declare these three syscalls with the new * pt_regs-based calling convention for in-kernel use. */ -asmlinkage long __x64_sys_getcpu (const struct pt_regs *regs); -asmlinkage long __x64_sys_gettimeofday (const struct pt_regs *regs); -asmlinkage long __x64_sys_time (const struct pt_regs *regs); +long __x64_sys_getcpu (const struct pt_regs *regs); +long __x64_sys_gettimeofday (const struct pt_regs *regs); +long __x64_sys_time (const struct pt_regs *regs);#endif /* _ASM_X86_SYSCALL_WRAPPER_H */
Signature · 1 line
2.24.1
[tip: x86/entry] x86/entry: Drop asmlinkage from syscalls
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 0f78ff17112d8b3469b805ff4ea9780cc1e5c93b Gitweb: https://git.kernel.org/tip/0f78ff17112d8b3469b805ff4ea9780cc1e5c93b Author: Brian Gerst <[email protected]> AuthorDate: Fri, 13 Mar 2020 15:51:43 -04:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:25 +01:00
x86/entry: Drop asmlinkage from syscalls
asmlinkage is no longer required since the syscall ABI is now fully under x86 architecture control. This makes the 32-bit native syscalls a bit more effecient by passing in regs via EAX instead of on the stack.
--- arch/x86/entry/syscall_32.c | 2 +- arch/x86/entry/syscall_64.c | 2 +- arch/x86/entry/syscall_x32.c | 4 +-- arch/x86/include/asm/syscall.h | 2 +- arch/x86/include/asm/syscall_wrapper.h | 31 +++++++++++-------------- 5 files changed, 19 insertions(+), 22 deletions(-)
arch/x86/entry/syscall_32.c +1 -1
@@ -8,7 +8,7 @@#include <asm/unistd.h> #include <asm/syscall.h> -#define __SYSCALL_I386 (nr, sym) extern asmlinkage long __ia32_##sym(const struct pt_regs *); +#define __SYSCALL_I386 (nr, sym) extern long __ia32_##sym(const struct pt_regs *);#include <asm/syscalls_32.h> #undef __SYSCALL_I386
arch/x86/entry/syscall_64.c +1 -1
@@ -11,7 +11,7 @@#define __SYSCALL_X32 (nr, sym)#define __SYSCALL_COMMON (nr, sym) __SYSCALL_64(nr, sym) -#define __SYSCALL_64 (nr, sym) extern asmlinkage long __x64_##sym(const struct pt_regs *); +#define __SYSCALL_64 (nr, sym) extern long __x64_##sym(const struct pt_regs *);#include <asm/syscalls_64.h> #undef __SYSCALL_64
arch/x86/entry/syscall_x32.c +2 -2
@@ -10,8 +10,8 @@#define __SYSCALL_64 (nr, sym) -#define __SYSCALL_X32 (nr, sym) extern asmlinkage long __x32_##sym(const struct pt_regs *); -#define __SYSCALL_COMMON (nr, sym) extern asmlinkage long __x64_##sym(const struct pt_regs *); +#define __SYSCALL_X32 (nr, sym) extern long __x32_##sym(const struct pt_regs *); +#define __SYSCALL_COMMON (nr, sym) extern long __x64_##sym(const struct pt_regs *);#include <asm/syscalls_64.h> #undef __SYSCALL_X32#undef __SYSCALL_COMMON
arch/x86/include/asm/syscall.h +1 -1
@@ -16,7 +16,7 @@#include <asm/thread_info.h> /* for TS_COMPAT */ #include <asm/unistd.h> -typedef asmlinkage long (*sys_call_ptr_t )(const struct pt_regs *); +typedef long (*sys_call_ptr_t )(const struct pt_regs *);extern const sys_call_ptr_t sys_call_table[];#if defined(CONFIG_X86_32 )
arch/x86/include/asm/syscall_wrapper.h +14 -17
@@ -8,8 +8,8 @@struct pt_regs ; -extern asmlinkage long __x64_sys_ni_syscall (const struct pt_regs *regs); -extern asmlinkage long __ia32_sys_ni_syscall (const struct pt_regs *regs); +extern long __x64_sys_ni_syscall (const struct pt_regs *regs); +extern long __ia32_sys_ni_syscall (const struct pt_regs *regs);/* * Instead of the generic __SYSCALL_DEFINEx() definition, the x86 version takes
@@ -66,22 +66,21 @@ extern asmlinkage long __ia32_sys_ni_syscall(const struct pt_regs *regs); ,,(unsigned int)regs->di,,(unsigned int)regs->bp)#define __SYS_STUB0 (abi, name) \ - asmlinkage long __##abi##_##name(const struct pt_regs *regs); \ + long __##abi##_##name(const struct pt_regs *regs); \ ALLOW_ERROR_INJECTION(__##abi##_##name, ERRNO); \ - asmlinkage long __##abi##_##name(const struct pt_regs *regs) \ + long __##abi##_##name(const struct pt_regs *regs) \ __alias(__do_##name);#define __SYS_STUBx (abi, name, ...) \ - asmlinkage long __##abi##_##name(const struct pt_regs *regs); \ + long __##abi##_##name(const struct pt_regs *regs); \ ALLOW_ERROR_INJECTION(__##abi##_##name, ERRNO); \ - asmlinkage long __##abi##_##name(const struct pt_regs *regs) \ + long __##abi##_##name(const struct pt_regs *regs) \ { \ return __se_##name(__VA_ARGS__); \ }#define __COND_SYSCALL (abi, name) \ - asmlinkage __weak long \ - __##abi##_##name(const struct pt_regs *__unused) \ + __weak long __##abi##_##name(const struct pt_regs *__unused) \ { \ return sys_ni_syscall(); \ }
@@ -192,11 +191,11 @@ extern asmlinkage long __ia32_sys_ni_syscall(const struct pt_regs *regs);* of them. */ #define COMPAT_SYSCALL_DEFINE0 (name) \ - static asmlinkage long \ + static long \ __do_compat_sys_##name(const struct pt_regs *__unused); \ __IA32_COMPAT_SYS_STUB0(name) \ __X32_COMPAT_SYS_STUB0(name) \ - static asmlinkage long \ + static long \ __do_compat_sys_##name(const struct pt_regs *__unused)#define COMPAT_SYSCALL_DEFINEx (x, name, ...) \
@@ -248,12 +247,10 @@ extern asmlinkage long __ia32_sys_ni_syscall(const struct pt_regs *regs);*/ #define SYSCALL_DEFINE0 (sname) \ SYSCALL_METADATA(_##sname, 0); \ - static asmlinkage long \ - __do_sys_##sname(const struct pt_regs *__unused); \ + static long __do_sys_##sname(const struct pt_regs *__unused); \ __X64_SYS_STUB0(sname) \ __IA32_SYS_STUB0(sname) \ - static asmlinkage long \ - __do_sys_##sname(const struct pt_regs *__unused) + static long __do_sys_##sname(const struct pt_regs *__unused)#define COND_SYSCALL (name) \ __X64_COND_SYSCALL(name) \
@@ -268,8 +265,8 @@ extern asmlinkage long __ia32_sys_ni_syscall(const struct pt_regs *regs);* For VSYSCALLS, we need to declare these three syscalls with the new * pt_regs-based calling convention for in-kernel use. */ -asmlinkage long __x64_sys_getcpu (const struct pt_regs *regs); -asmlinkage long __x64_sys_gettimeofday (const struct pt_regs *regs); -asmlinkage long __x64_sys_time (const struct pt_regs *regs); +long __x64_sys_getcpu (const struct pt_regs *regs); +long __x64_sys_gettimeofday (const struct pt_regs *regs); +long __x64_sys_time (const struct pt_regs *regs);#endif /* _ASM_X86_SYSCALL_WRAPPER_H */
PATCH v4 18/18 x86: Remove unneeded includes
In reply to Brian GerstClean up includes of and in <asm/syscalls.h>
--- arch/x86/include/asm/syscalls.h | 5 ----- arch/x86/kernel/ldt.c | 1 - arch/x86/kernel/process.c | 1 - arch/x86/kernel/process_32.c | 1 - arch/x86/kernel/process_64.c | 1 - arch/x86/kernel/signal.c | 2 -- arch/x86/kernel/sys_x86_64.c | 1 - 7 files changed, 12 deletions(-)
arch/x86/include/asm/syscalls.h +0 -5
@@ -8,11 +8,6 @@#ifndef _ASM_X86_SYSCALLS_H#define _ASM_X86_SYSCALLS_H -#include <linux/compiler.h> -#include <linux/linkage.h> -#include <linux/signal.h> -#include <linux/types.h> -/* Common in X86_32 and X86_64 */ /* kernel/ioport.c */ long ksys_ioperm (unsigned long from,unsigned long num,int turn_on);
arch/x86/kernel/ldt.c +0 -1
@@ -27,7 +27,6 @@#include <asm/tlb.h> #include <asm/desc.h> #include <asm/mmu_context.h> -#include <asm/syscalls.h> #include <asm/pgtable_areas.h> /* This is a multiple of PAGE_SIZE. */
arch/x86/kernel/process.c +0 -1
@@ -28,7 +28,6 @@#include <linux/hw_breakpoint.h> #include <asm/cpu.h> #include <asm/apic.h> -#include <asm/syscalls.h> #include <linux/uaccess.h> #include <asm/mwait.h> #include <asm/fpu/internal.h>
arch/x86/kernel/process_32.c +0 -1
@@ -49,7 +49,6 @@#include <asm/tlbflush.h> #include <asm/cpu.h> -#include <asm/syscalls.h> #include <asm/debugreg.h> #include <asm/switch_to.h> #include <asm/vm86.h>
arch/x86/kernel/process_64.c +0 -1
@@ -48,7 +48,6 @@#include <asm/desc.h> #include <asm/proto.h> #include <asm/ia32.h> -#include <asm/syscalls.h> #include <asm/debugreg.h> #include <asm/switch_to.h> #include <asm/xen/hypervisor.h>
arch/x86/kernel/signal.c +0 -2
@@ -42,8 +42,6 @@#endif /* CONFIG_X86_64 */ #include <asm/syscall.h> -#include <asm/syscalls.h> -#include <asm/sigframe.h> #include <asm/signal.h>
arch/x86/kernel/sys_x86_64.c +0 -1
@@ -21,7 +21,6 @@#include <asm/elf.h> #include <asm/ia32.h> -#include <asm/syscalls.h> /* * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
Signature · 1 line
2.24.1
[tip: x86/entry] x86: Remove unneeded includes
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: ffd75b373f3656cbb593c5221cc36ce232b7bbc1 Gitweb: https://git.kernel.org/tip/ffd75b373f3656cbb593c5221cc36ce232b7bbc1 Author: Brian Gerst <[email protected]> AuthorDate: Fri, 13 Mar 2020 15:51:44 -04:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:25 +01:00
x86: Remove unneeded includes
Clean up includes of and in <asm/syscalls.h>
--- arch/x86/include/asm/syscalls.h | 5 ----- arch/x86/kernel/ldt.c | 1 - arch/x86/kernel/process.c | 1 - arch/x86/kernel/process_32.c | 1 - arch/x86/kernel/process_64.c | 1 - arch/x86/kernel/signal.c | 2 -- arch/x86/kernel/sys_x86_64.c | 1 - 7 files changed, 12 deletions(-)
arch/x86/include/asm/syscalls.h +0 -5
@@ -8,11 +8,6 @@#ifndef _ASM_X86_SYSCALLS_H#define _ASM_X86_SYSCALLS_H -#include <linux/compiler.h> -#include <linux/linkage.h> -#include <linux/signal.h> -#include <linux/types.h> -/* Common in X86_32 and X86_64 */ /* kernel/ioport.c */ long ksys_ioperm (unsigned long from,unsigned long num,int turn_on);
arch/x86/kernel/ldt.c +0 -1
@@ -27,7 +27,6 @@#include <asm/tlb.h> #include <asm/desc.h> #include <asm/mmu_context.h> -#include <asm/syscalls.h> #include <asm/pgtable_areas.h> /* This is a multiple of PAGE_SIZE. */
arch/x86/kernel/process.c +0 -1
@@ -28,7 +28,6 @@#include <linux/hw_breakpoint.h> #include <asm/cpu.h> #include <asm/apic.h> -#include <asm/syscalls.h> #include <linux/uaccess.h> #include <asm/mwait.h> #include <asm/fpu/internal.h>
arch/x86/kernel/process_32.c +0 -1
@@ -49,7 +49,6 @@#include <asm/tlbflush.h> #include <asm/cpu.h> -#include <asm/syscalls.h> #include <asm/debugreg.h> #include <asm/switch_to.h> #include <asm/vm86.h>
arch/x86/kernel/process_64.c +0 -1
@@ -48,7 +48,6 @@#include <asm/desc.h> #include <asm/proto.h> #include <asm/ia32.h> -#include <asm/syscalls.h> #include <asm/debugreg.h> #include <asm/switch_to.h> #include <asm/xen/hypervisor.h>
arch/x86/kernel/signal.c +0 -2
@@ -42,8 +42,6 @@#endif /* CONFIG_X86_64 */ #include <asm/syscall.h> -#include <asm/syscalls.h> -#include <asm/sigframe.h> #include <asm/signal.h>
arch/x86/kernel/sys_x86_64.c +0 -1
@@ -21,7 +21,6 @@#include <asm/elf.h> #include <asm/ia32.h> -#include <asm/syscalls.h> /* * Align a virtual address to avoid aliasing in the I$ on AMD F15h.