Skip to content

x86: syscall wrapper cleanups

Brian Gerst lkml 4 versions – Applied

Status from this message: The following commit has been merged into the x86/entry branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest18 patches 6 repliesApplied
  2. v38 patches 11 repliesSuperseded
  3. v28 patches 5 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v15 patches11 repliesSuperseded

Changes in v4 from the cover letter

- 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

Patches in v4 Applied

#Subject and filesSizeRepliesApplied
1/18x86, syscalls: Refactor SYSCALL_DEFINEx macrosarch/x86/include/asm/syscall_wrapper.h+24 -250 replies
2/18x86, syscalls: Refactor SYSCALL_DEFINE0 macrosarch/x86/include/asm/syscall_wrapper.h+32 -410 replies
3/18x86, syscalls: Refactor COND_SYSCALL macrosarch/x86/include/asm/syscall_wrapper.h+26 -180 replies
4/18x86, syscalls: Refactor SYS_NI macrosarch/x86/include/asm/syscall_wrapper.h+23 -92 replies
5/18x86-64: Use syscall wrappers for x32_rt_sigreturnarch/x86/entry/syscalls/syscall_64.tbl arch/x86/include/asm/sighandling.h arch/x86/kernel/signal.c+2 -70 replies
6/18x86-64: Move sys_ni_syscall stub to common.carch/x86/entry/common.c arch/x86/entry/syscall_64.c arch/x86/include/asm/syscall_wrapper.h+10 -70 replies
7/18x86-64: Split X32 syscall table into its own filearch/x86/entry/Makefile arch/x86/entry/syscall_64.c arch/x86/entry/syscall_x32.c+29 -251 reply
8/18x86: Move max syscall number calculation to syscallhdr.sharch/x86/entry/syscall_32.c arch/x86/entry/syscall_64.c arch/x86/entry/syscall_x32.c +9 more+24 -720 replies
9/18x86-64: Remove ptregs qualifier from syscall tablearch/x86/entry/syscalls/syscall_64.tbl+10 -101 reply
10/18x86: Remove syscall qualifier supportarch/x86/entry/syscall_32.c arch/x86/entry/syscall_64.c arch/x86/entry/syscall_x32.c +3 more+14 -221 reply
11/18x86-64: Add __SYSCALL_COMMON()arch/x86/entry/syscall_64.c arch/x86/entry/syscall_x32.c arch/x86/entry/syscalls/syscalltbl.sh +1 more+9 -200 replies
12/18x86: Remove ABI prefixes from functions in syscall tablesarch/x86/entry/syscall_32.c arch/x86/entry/syscall_64.c arch/x86/entry/syscall_x32.c +3 more+791 -7990 replies
13/18x86: Clean up syscall_32.tblarch/x86/entry/syscalls/syscall_32.tbl+289 -2890 replies
14/18x86, syscalls: Rename 32-bit specific syscallsarch/x86/entry/syscalls/syscall_32.tbl arch/x86/ia32/sys_ia32.c+30 -301 reply
15/18x86: Use IA32-specific wrappers for syscalls taking 64-bit argumentsarch/x86/entry/syscalls/syscall_32.tbl arch/x86/ia32/Makefile arch/x86/kernel/Makefile +2 more+79 -752 replies
16/18x86-32: Enable pt_regs based syscallsarch/x86/Kconfig arch/x86/entry/common.c arch/x86/entry/syscall_32.c +3 more+64 -1140 replies
17/18x86: Drop asmlinkage from syscallsarch/x86/entry/syscall_32.c arch/x86/entry/syscall_64.c arch/x86/entry/syscall_x32.c +2 more+19 -220 replies
18/18x86: Remove unneeded includesarch/x86/include/asm/syscalls.h arch/x86/kernel/ldt.c arch/x86/kernel/process.c +4 more+0 -120 replies

Reviews trailers per patch

12 of 18 patches have a Reviewed-by or Acked-by.

PatchDominik BrodowskiAndy Lutomirski
1/18R-b R-b
2/18R-b R-b
3/18R-b R-b
4/18R-b R-b
5/18R-b R-b
6/18
7/18R-b
8/18
9/18R-b
10/18R-b
11/18
12/18
13/18
14/18R-b
15/18R-b
16/18R-b
17/18R-b R-b
18/18

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v4 thread

Cover letter [PATCH v4 00/18] 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