aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/x86/entry/syscalls/syscall_32.tbl46
-rw-r--r--arch/x86/entry/syscalls/syscall_64.tbl638
-rw-r--r--arch/x86/entry/syscalls/syscalltbl.sh14
-rw-r--r--arch/x86/entry/vsyscall/vsyscall_64.c6
-rw-r--r--arch/x86/include/asm/syscall_wrapper.h63
5 files changed, 405 insertions, 362 deletions
diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl
index 0e6cb1335db2..d6b27dab1b30 100644
--- a/arch/x86/entry/syscalls/syscall_32.tbl
+++ b/arch/x86/entry/syscalls/syscall_32.tbl
@@ -11,9 +11,9 @@
11# 11#
12# The abi is always "i386" for this file. 12# The abi is always "i386" for this file.
13# 13#
140 i386 restart_syscall sys_restart_syscall 140 i386 restart_syscall sys_restart_syscall __ia32_sys_restart_syscall
151 i386 exit sys_exit __ia32_sys_exit 151 i386 exit sys_exit __ia32_sys_exit
162 i386 fork sys_fork 162 i386 fork sys_fork __ia32_sys_fork
173 i386 read sys_read __ia32_sys_read 173 i386 read sys_read __ia32_sys_read
184 i386 write sys_write __ia32_sys_write 184 i386 write sys_write __ia32_sys_write
195 i386 open sys_open __ia32_compat_sys_open 195 i386 open sys_open __ia32_compat_sys_open
@@ -31,23 +31,23 @@
3117 i386 break 3117 i386 break
3218 i386 oldstat sys_stat __ia32_sys_stat 3218 i386 oldstat sys_stat __ia32_sys_stat
3319 i386 lseek sys_lseek __ia32_compat_sys_lseek 3319 i386 lseek sys_lseek __ia32_compat_sys_lseek
3420 i386 getpid sys_getpid 3420 i386 getpid sys_getpid __ia32_sys_getpid
3521 i386 mount sys_mount __ia32_compat_sys_mount 3521 i386 mount sys_mount __ia32_compat_sys_mount
3622 i386 umount sys_oldumount __ia32_sys_oldumount 3622 i386 umount sys_oldumount __ia32_sys_oldumount
3723 i386 setuid sys_setuid16 __ia32_sys_setuid16 3723 i386 setuid sys_setuid16 __ia32_sys_setuid16
3824 i386 getuid sys_getuid16 3824 i386 getuid sys_getuid16 __ia32_sys_getuid16
3925 i386 stime sys_stime __ia32_compat_sys_stime 3925 i386 stime sys_stime __ia32_compat_sys_stime
4026 i386 ptrace sys_ptrace __ia32_compat_sys_ptrace 4026 i386 ptrace sys_ptrace __ia32_compat_sys_ptrace
4127 i386 alarm sys_alarm __ia32_sys_alarm 4127 i386 alarm sys_alarm __ia32_sys_alarm
4228 i386 oldfstat sys_fstat __ia32_sys_fstat 4228 i386 oldfstat sys_fstat __ia32_sys_fstat
4329 i386 pause sys_pause 4329 i386 pause sys_pause __ia32_sys_pause
4430 i386 utime sys_utime __ia32_compat_sys_utime 4430 i386 utime sys_utime __ia32_compat_sys_utime
4531 i386 stty 4531 i386 stty
4632 i386 gtty 4632 i386 gtty
4733 i386 access sys_access __ia32_sys_access 4733 i386 access sys_access __ia32_sys_access
4834 i386 nice sys_nice __ia32_sys_nice 4834 i386 nice sys_nice __ia32_sys_nice
4935 i386 ftime 4935 i386 ftime
5036 i386 sync sys_sync 5036 i386 sync sys_sync __ia32_sys_sync
5137 i386 kill sys_kill __ia32_sys_kill 5137 i386 kill sys_kill __ia32_sys_kill
5238 i386 rename sys_rename __ia32_sys_rename 5238 i386 rename sys_rename __ia32_sys_rename
5339 i386 mkdir sys_mkdir __ia32_sys_mkdir 5339 i386 mkdir sys_mkdir __ia32_sys_mkdir
@@ -58,10 +58,10 @@
5844 i386 prof 5844 i386 prof
5945 i386 brk sys_brk __ia32_sys_brk 5945 i386 brk sys_brk __ia32_sys_brk
6046 i386 setgid sys_setgid16 __ia32_sys_setgid16 6046 i386 setgid sys_setgid16 __ia32_sys_setgid16
6147 i386 getgid sys_getgid16 6147 i386 getgid sys_getgid16 __ia32_sys_getgid16
6248 i386 signal sys_signal __ia32_sys_signal 6248 i386 signal sys_signal __ia32_sys_signal
6349 i386 geteuid sys_geteuid16 6349 i386 geteuid sys_geteuid16 __ia32_sys_geteuid16
6450 i386 getegid sys_getegid16 6450 i386 getegid sys_getegid16 __ia32_sys_getegid16
6551 i386 acct sys_acct __ia32_sys_acct 6551 i386 acct sys_acct __ia32_sys_acct
6652 i386 umount2 sys_umount __ia32_sys_umount 6652 i386 umount2 sys_umount __ia32_sys_umount
6753 i386 lock 6753 i386 lock
@@ -75,11 +75,11 @@
7561 i386 chroot sys_chroot __ia32_sys_chroot 7561 i386 chroot sys_chroot __ia32_sys_chroot
7662 i386 ustat sys_ustat __ia32_compat_sys_ustat 7662 i386 ustat sys_ustat __ia32_compat_sys_ustat
7763 i386 dup2 sys_dup2 __ia32_sys_dup2 7763 i386 dup2 sys_dup2 __ia32_sys_dup2
7864 i386 getppid sys_getppid 7864 i386 getppid sys_getppid __ia32_sys_getppid
7965 i386 getpgrp sys_getpgrp 7965 i386 getpgrp sys_getpgrp __ia32_sys_getpgrp
8066 i386 setsid sys_setsid 8066 i386 setsid sys_setsid __ia32_sys_setsid
8167 i386 sigaction sys_sigaction __ia32_compat_sys_sigaction 8167 i386 sigaction sys_sigaction __ia32_compat_sys_sigaction
8268 i386 sgetmask sys_sgetmask 8268 i386 sgetmask sys_sgetmask __ia32_sys_sgetmask
8369 i386 ssetmask sys_ssetmask __ia32_sys_ssetmask 8369 i386 ssetmask sys_ssetmask __ia32_sys_ssetmask
8470 i386 setreuid sys_setreuid16 __ia32_sys_setreuid16 8470 i386 setreuid sys_setreuid16 __ia32_sys_setreuid16
8571 i386 setregid sys_setregid16 __ia32_sys_setregid16 8571 i386 setregid sys_setregid16 __ia32_sys_setregid16
@@ -122,7 +122,7 @@
122108 i386 fstat sys_newfstat __ia32_compat_sys_newfstat 122108 i386 fstat sys_newfstat __ia32_compat_sys_newfstat
123109 i386 olduname sys_uname __ia32_sys_uname 123109 i386 olduname sys_uname __ia32_sys_uname
124110 i386 iopl sys_iopl __ia32_sys_iopl 124110 i386 iopl sys_iopl __ia32_sys_iopl
125111 i386 vhangup sys_vhangup 125111 i386 vhangup sys_vhangup __ia32_sys_vhangup
126112 i386 idle 126112 i386 idle
127113 i386 vm86old sys_vm86old sys_ni_syscall 127113 i386 vm86old sys_vm86old sys_ni_syscall
128114 i386 wait4 sys_wait4 __ia32_compat_sys_wait4 128114 i386 wait4 sys_wait4 __ia32_compat_sys_wait4
@@ -164,12 +164,12 @@
164150 i386 mlock sys_mlock __ia32_sys_mlock 164150 i386 mlock sys_mlock __ia32_sys_mlock
165151 i386 munlock sys_munlock __ia32_sys_munlock 165151 i386 munlock sys_munlock __ia32_sys_munlock
166152 i386 mlockall sys_mlockall __ia32_sys_mlockall 166152 i386 mlockall sys_mlockall __ia32_sys_mlockall
167153 i386 munlockall sys_munlockall 167153 i386 munlockall sys_munlockall __ia32_sys_munlockall
168154 i386 sched_setparam sys_sched_setparam __ia32_sys_sched_setparam 168154 i386 sched_setparam sys_sched_setparam __ia32_sys_sched_setparam
169155 i386 sched_getparam sys_sched_getparam __ia32_sys_sched_getparam 169155 i386 sched_getparam sys_sched_getparam __ia32_sys_sched_getparam
170156 i386 sched_setscheduler sys_sched_setscheduler __ia32_sys_sched_setscheduler 170156 i386 sched_setscheduler sys_sched_setscheduler __ia32_sys_sched_setscheduler
171157 i386 sched_getscheduler sys_sched_getscheduler __ia32_sys_sched_getscheduler 171157 i386 sched_getscheduler sys_sched_getscheduler __ia32_sys_sched_getscheduler
172158 i386 sched_yield sys_sched_yield 172158 i386 sched_yield sys_sched_yield __ia32_sys_sched_yield
173159 i386 sched_get_priority_max sys_sched_get_priority_max __ia32_sys_sched_get_priority_max 173159 i386 sched_get_priority_max sys_sched_get_priority_max __ia32_sys_sched_get_priority_max
174160 i386 sched_get_priority_min sys_sched_get_priority_min __ia32_sys_sched_get_priority_min 174160 i386 sched_get_priority_min sys_sched_get_priority_min __ia32_sys_sched_get_priority_min
175161 i386 sched_rr_get_interval sys_sched_rr_get_interval __ia32_compat_sys_sched_rr_get_interval 175161 i386 sched_rr_get_interval sys_sched_rr_get_interval __ia32_compat_sys_sched_rr_get_interval
@@ -201,7 +201,7 @@
201187 i386 sendfile sys_sendfile __ia32_compat_sys_sendfile 201187 i386 sendfile sys_sendfile __ia32_compat_sys_sendfile
202188 i386 getpmsg 202188 i386 getpmsg
203189 i386 putpmsg 203189 i386 putpmsg
204190 i386 vfork sys_vfork 204190 i386 vfork sys_vfork __ia32_sys_vfork
205191 i386 ugetrlimit sys_getrlimit __ia32_compat_sys_getrlimit 205191 i386 ugetrlimit sys_getrlimit __ia32_compat_sys_getrlimit
206192 i386 mmap2 sys_mmap_pgoff __ia32_sys_mmap_pgoff 206192 i386 mmap2 sys_mmap_pgoff __ia32_sys_mmap_pgoff
207193 i386 truncate64 sys_truncate64 __ia32_compat_sys_x86_truncate64 207193 i386 truncate64 sys_truncate64 __ia32_compat_sys_x86_truncate64
@@ -210,10 +210,10 @@
210196 i386 lstat64 sys_lstat64 __ia32_compat_sys_x86_lstat64 210196 i386 lstat64 sys_lstat64 __ia32_compat_sys_x86_lstat64
211197 i386 fstat64 sys_fstat64 __ia32_compat_sys_x86_fstat64 211197 i386 fstat64 sys_fstat64 __ia32_compat_sys_x86_fstat64
212198 i386 lchown32 sys_lchown __ia32_sys_lchown 212198 i386 lchown32 sys_lchown __ia32_sys_lchown
213199 i386 getuid32 sys_getuid 213199 i386 getuid32 sys_getuid __ia32_sys_getuid
214200 i386 getgid32 sys_getgid 214200 i386 getgid32 sys_getgid __ia32_sys_getgid
215201 i386 geteuid32 sys_geteuid 215201 i386 geteuid32 sys_geteuid __ia32_sys_geteuid
216202 i386 getegid32 sys_getegid 216202 i386 getegid32 sys_getegid __ia32_sys_getegid
217203 i386 setreuid32 sys_setreuid __ia32_sys_setreuid 217203 i386 setreuid32 sys_setreuid __ia32_sys_setreuid
218204 i386 setregid32 sys_setregid __ia32_sys_setregid 218204 i386 setregid32 sys_setregid __ia32_sys_setregid
219205 i386 getgroups32 sys_getgroups __ia32_sys_getgroups 219205 i386 getgroups32 sys_getgroups __ia32_sys_getgroups
@@ -235,7 +235,7 @@
235221 i386 fcntl64 sys_fcntl64 __ia32_compat_sys_fcntl64 235221 i386 fcntl64 sys_fcntl64 __ia32_compat_sys_fcntl64
236# 222 is unused 236# 222 is unused
237# 223 is unused 237# 223 is unused
238224 i386 gettid sys_gettid 238224 i386 gettid sys_gettid __ia32_sys_gettid
239225 i386 readahead sys_readahead __ia32_compat_sys_x86_readahead 239225 i386 readahead sys_readahead __ia32_compat_sys_x86_readahead
240226 i386 setxattr sys_setxattr __ia32_sys_setxattr 240226 i386 setxattr sys_setxattr __ia32_sys_setxattr
241227 i386 lsetxattr sys_lsetxattr __ia32_sys_lsetxattr 241227 i386 lsetxattr sys_lsetxattr __ia32_sys_lsetxattr
@@ -302,7 +302,7 @@
302288 i386 keyctl sys_keyctl __ia32_compat_sys_keyctl 302288 i386 keyctl sys_keyctl __ia32_compat_sys_keyctl
303289 i386 ioprio_set sys_ioprio_set __ia32_sys_ioprio_set 303289 i386 ioprio_set sys_ioprio_set __ia32_sys_ioprio_set
304290 i386 ioprio_get sys_ioprio_get __ia32_sys_ioprio_get 304290 i386 ioprio_get sys_ioprio_get __ia32_sys_ioprio_get
305291 i386 inotify_init sys_inotify_init 305291 i386 inotify_init sys_inotify_init __ia32_sys_inotify_init
306292 i386 inotify_add_watch sys_inotify_add_watch __ia32_sys_inotify_add_watch 306292 i386 inotify_add_watch sys_inotify_add_watch __ia32_sys_inotify_add_watch
307293 i386 inotify_rm_watch sys_inotify_rm_watch __ia32_sys_inotify_rm_watch 307293 i386 inotify_rm_watch sys_inotify_rm_watch __ia32_sys_inotify_rm_watch
308294 i386 migrate_pages sys_migrate_pages __ia32_sys_migrate_pages 308294 i386 migrate_pages sys_migrate_pages __ia32_sys_migrate_pages
diff --git a/arch/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscalls/syscall_64.tbl
index 73f4951fc2fa..4dfe42666d0c 100644
--- a/arch/x86/entry/syscalls/syscall_64.tbl
+++ b/arch/x86/entry/syscalls/syscall_64.tbl
@@ -4,341 +4,343 @@
4# The format is: 4# The format is:
5# <number> <abi> <name> <entry point> 5# <number> <abi> <name> <entry point>
6# 6#
7# The __x64_sys_*() stubs are created on-the-fly for sys_*() system calls
8#
7# The abi is "common", "64" or "x32" for this file. 9# The abi is "common", "64" or "x32" for this file.
8# 10#
90 common read sys_read 110 common read __x64_sys_read
101 common write sys_write 121 common write __x64_sys_write
112 common open sys_open 132 common open __x64_sys_open
123 common close sys_close 143 common close __x64_sys_close
134 common stat sys_newstat 154 common stat __x64_sys_newstat
145 common fstat sys_newfstat 165 common fstat __x64_sys_newfstat
156 common lstat sys_newlstat 176 common lstat __x64_sys_newlstat
167 common poll sys_poll 187 common poll __x64_sys_poll
178 common lseek sys_lseek 198 common lseek __x64_sys_lseek
189 common mmap sys_mmap 209 common mmap __x64_sys_mmap
1910 common mprotect sys_mprotect 2110 common mprotect __x64_sys_mprotect
2011 common munmap sys_munmap 2211 common munmap __x64_sys_munmap
2112 common brk sys_brk 2312 common brk __x64_sys_brk
2213 64 rt_sigaction sys_rt_sigaction 2413 64 rt_sigaction __x64_sys_rt_sigaction
2314 common rt_sigprocmask sys_rt_sigprocmask 2514 common rt_sigprocmask __x64_sys_rt_sigprocmask
2415 64 rt_sigreturn sys_rt_sigreturn/ptregs 2615 64 rt_sigreturn __x64_sys_rt_sigreturn/ptregs
2516 64 ioctl sys_ioctl 2716 64 ioctl __x64_sys_ioctl
2617 common pread64 sys_pread64 2817 common pread64 __x64_sys_pread64
2718 common pwrite64 sys_pwrite64 2918 common pwrite64 __x64_sys_pwrite64
2819 64 readv sys_readv 3019 64 readv __x64_sys_readv
2920 64 writev sys_writev 3120 64 writev __x64_sys_writev
3021 common access sys_access 3221 common access __x64_sys_access
3122 common pipe sys_pipe 3322 common pipe __x64_sys_pipe
3223 common select sys_select 3423 common select __x64_sys_select
3324 common sched_yield sys_sched_yield 3524 common sched_yield __x64_sys_sched_yield
3425 common mremap sys_mremap 3625 common mremap __x64_sys_mremap
3526 common msync sys_msync 3726 common msync __x64_sys_msync
3627 common mincore sys_mincore 3827 common mincore __x64_sys_mincore
3728 common madvise sys_madvise 3928 common madvise __x64_sys_madvise
3829 common shmget sys_shmget 4029 common shmget __x64_sys_shmget
3930 common shmat sys_shmat 4130 common shmat __x64_sys_shmat
4031 common shmctl sys_shmctl 4231 common shmctl __x64_sys_shmctl
4132 common dup sys_dup 4332 common dup __x64_sys_dup
4233 common dup2 sys_dup2 4433 common dup2 __x64_sys_dup2
4334 common pause sys_pause 4534 common pause __x64_sys_pause
4435 common nanosleep sys_nanosleep 4635 common nanosleep __x64_sys_nanosleep
4536 common getitimer sys_getitimer 4736 common getitimer __x64_sys_getitimer
4637 common alarm sys_alarm 4837 common alarm __x64_sys_alarm
4738 common setitimer sys_setitimer 4938 common setitimer __x64_sys_setitimer
4839 common getpid sys_getpid 5039 common getpid __x64_sys_getpid
4940 common sendfile sys_sendfile64 5140 common sendfile __x64_sys_sendfile64
5041 common socket sys_socket 5241 common socket __x64_sys_socket
5142 common connect sys_connect 5342 common connect __x64_sys_connect
5243 common accept sys_accept 5443 common accept __x64_sys_accept
5344 common sendto sys_sendto 5544 common sendto __x64_sys_sendto
5445 64 recvfrom sys_recvfrom 5645 64 recvfrom __x64_sys_recvfrom
5546 64 sendmsg sys_sendmsg 5746 64 sendmsg __x64_sys_sendmsg
5647 64 recvmsg sys_recvmsg 5847 64 recvmsg __x64_sys_recvmsg
5748 common shutdown sys_shutdown 5948 common shutdown __x64_sys_shutdown
5849 common bind sys_bind 6049 common bind __x64_sys_bind
5950 common listen sys_listen 6150 common listen __x64_sys_listen
6051 common getsockname sys_getsockname 6251 common getsockname __x64_sys_getsockname
6152 common getpeername sys_getpeername 6352 common getpeername __x64_sys_getpeername
6253 common socketpair sys_socketpair 6453 common socketpair __x64_sys_socketpair
6354 64 setsockopt sys_setsockopt 6554 64 setsockopt __x64_sys_setsockopt
6455 64 getsockopt sys_getsockopt 6655 64 getsockopt __x64_sys_getsockopt
6556 common clone sys_clone/ptregs 6756 common clone __x64_sys_clone/ptregs
6657 common fork sys_fork/ptregs 6857 common fork __x64_sys_fork/ptregs
6758 common vfork sys_vfork/ptregs 6958 common vfork __x64_sys_vfork/ptregs
6859 64 execve sys_execve/ptregs 7059 64 execve __x64_sys_execve/ptregs
6960 common exit sys_exit 7160 common exit __x64_sys_exit
7061 common wait4 sys_wait4 7261 common wait4 __x64_sys_wait4
7162 common kill sys_kill 7362 common kill __x64_sys_kill
7263 common uname sys_newuname 7463 common uname __x64_sys_newuname
7364 common semget sys_semget 7564 common semget __x64_sys_semget
7465 common semop sys_semop 7665 common semop __x64_sys_semop
7566 common semctl sys_semctl 7766 common semctl __x64_sys_semctl
7667 common shmdt sys_shmdt 7867 common shmdt __x64_sys_shmdt
7768 common msgget sys_msgget 7968 common msgget __x64_sys_msgget
7869 common msgsnd sys_msgsnd 8069 common msgsnd __x64_sys_msgsnd
7970 common msgrcv sys_msgrcv 8170 common msgrcv __x64_sys_msgrcv
8071 common msgctl sys_msgctl 8271 common msgctl __x64_sys_msgctl
8172 common fcntl sys_fcntl 8372 common fcntl __x64_sys_fcntl
8273 common flock sys_flock 8473 common flock __x64_sys_flock
8374 common fsync sys_fsync 8574 common fsync __x64_sys_fsync
8475 common fdatasync sys_fdatasync 8675 common fdatasync __x64_sys_fdatasync
8576 common truncate sys_truncate 8776 common truncate __x64_sys_truncate
8677 common ftruncate sys_ftruncate 8877 common ftruncate __x64_sys_ftruncate
8778 common getdents sys_getdents 8978 common getdents __x64_sys_getdents
8879 common getcwd sys_getcwd 9079 common getcwd __x64_sys_getcwd
8980 common chdir sys_chdir 9180 common chdir __x64_sys_chdir
9081 common fchdir sys_fchdir 9281 common fchdir __x64_sys_fchdir
9182 common rename sys_rename 9382 common rename __x64_sys_rename
9283 common mkdir sys_mkdir 9483 common mkdir __x64_sys_mkdir
9384 common rmdir sys_rmdir 9584 common rmdir __x64_sys_rmdir
9485 common creat sys_creat 9685 common creat __x64_sys_creat
9586 common link sys_link 9786 common link __x64_sys_link
9687 common unlink sys_unlink 9887 common unlink __x64_sys_unlink
9788 common symlink sys_symlink 9988 common symlink __x64_sys_symlink
9889 common readlink sys_readlink 10089 common readlink __x64_sys_readlink
9990 common chmod sys_chmod 10190 common chmod __x64_sys_chmod
10091 common fchmod sys_fchmod 10291 common fchmod __x64_sys_fchmod
10192 common chown sys_chown 10392 common chown __x64_sys_chown
10293 common fchown sys_fchown 10493 common fchown __x64_sys_fchown
10394 common lchown sys_lchown 10594 common lchown __x64_sys_lchown
10495 common umask sys_umask 10695 common umask __x64_sys_umask
10596 common gettimeofday sys_gettimeofday 10796 common gettimeofday __x64_sys_gettimeofday
10697 common getrlimit sys_getrlimit 10897 common getrlimit __x64_sys_getrlimit
10798 common getrusage sys_getrusage 10998 common getrusage __x64_sys_getrusage
10899 common sysinfo sys_sysinfo 11099 common sysinfo __x64_sys_sysinfo
109100 common times sys_times 111100 common times __x64_sys_times
110101 64 ptrace sys_ptrace 112101 64 ptrace __x64_sys_ptrace
111102 common getuid sys_getuid 113102 common getuid __x64_sys_getuid
112103 common syslog sys_syslog 114103 common syslog __x64_sys_syslog
113104 common getgid sys_getgid 115104 common getgid __x64_sys_getgid
114105 common setuid sys_setuid 116105 common setuid __x64_sys_setuid
115106 common setgid sys_setgid 117106 common setgid __x64_sys_setgid
116107 common geteuid sys_geteuid 118107 common geteuid __x64_sys_geteuid
117108 common getegid sys_getegid 119108 common getegid __x64_sys_getegid
118109 common setpgid sys_setpgid 120109 common setpgid __x64_sys_setpgid
119110 common getppid sys_getppid 121110 common getppid __x64_sys_getppid
120111 common getpgrp sys_getpgrp 122111 common getpgrp __x64_sys_getpgrp
121112 common setsid sys_setsid 123112 common setsid __x64_sys_setsid
122113 common setreuid sys_setreuid 124113 common setreuid __x64_sys_setreuid
123114 common setregid sys_setregid 125114 common setregid __x64_sys_setregid
124115 common getgroups sys_getgroups 126115 common getgroups __x64_sys_getgroups
125116 common setgroups sys_setgroups 127116 common setgroups __x64_sys_setgroups
126117 common setresuid sys_setresuid 128117 common setresuid __x64_sys_setresuid
127118 common getresuid sys_getresuid 129118 common getresuid __x64_sys_getresuid
128119 common setresgid sys_setresgid 130119 common setresgid __x64_sys_setresgid
129120 common getresgid sys_getresgid 131120 common getresgid __x64_sys_getresgid
130121 common getpgid sys_getpgid 132121 common getpgid __x64_sys_getpgid
131122 common setfsuid sys_setfsuid 133122 common setfsuid __x64_sys_setfsuid
132123 common setfsgid sys_setfsgid 134123 common setfsgid __x64_sys_setfsgid
133124 common getsid sys_getsid 135124 common getsid __x64_sys_getsid
134125 common capget sys_capget 136125 common capget __x64_sys_capget
135126 common capset sys_capset 137126 common capset __x64_sys_capset
136127 64 rt_sigpending sys_rt_sigpending 138127 64 rt_sigpending __x64_sys_rt_sigpending
137128 64 rt_sigtimedwait sys_rt_sigtimedwait 139128 64 rt_sigtimedwait __x64_sys_rt_sigtimedwait
138129 64 rt_sigqueueinfo sys_rt_sigqueueinfo 140129 64 rt_sigqueueinfo __x64_sys_rt_sigqueueinfo
139130 common rt_sigsuspend sys_rt_sigsuspend 141130 common rt_sigsuspend __x64_sys_rt_sigsuspend
140131 64 sigaltstack sys_sigaltstack 142131 64 sigaltstack __x64_sys_sigaltstack
141132 common utime sys_utime 143132 common utime __x64_sys_utime
142133 common mknod sys_mknod 144133 common mknod __x64_sys_mknod
143134 64 uselib 145134 64 uselib
144135 common personality sys_personality 146135 common personality __x64_sys_personality
145136 common ustat sys_ustat 147136 common ustat __x64_sys_ustat
146137 common statfs sys_statfs 148137 common statfs __x64_sys_statfs
147138 common fstatfs sys_fstatfs 149138 common fstatfs __x64_sys_fstatfs
148139 common sysfs sys_sysfs 150139 common sysfs __x64_sys_sysfs
149140 common getpriority sys_getpriority 151140 common getpriority __x64_sys_getpriority
150141 common setpriority sys_setpriority 152141 common setpriority __x64_sys_setpriority
151142 common sched_setparam sys_sched_setparam 153142 common sched_setparam __x64_sys_sched_setparam
152143 common sched_getparam sys_sched_getparam 154143 common sched_getparam __x64_sys_sched_getparam
153144 common sched_setscheduler sys_sched_setscheduler 155144 common sched_setscheduler __x64_sys_sched_setscheduler
154145 common sched_getscheduler sys_sched_getscheduler 156145 common sched_getscheduler __x64_sys_sched_getscheduler
155146 common sched_get_priority_max sys_sched_get_priority_max 157146 common sched_get_priority_max __x64_sys_sched_get_priority_max
156147 common sched_get_priority_min sys_sched_get_priority_min 158147 common sched_get_priority_min __x64_sys_sched_get_priority_min
157148 common sched_rr_get_interval sys_sched_rr_get_interval 159148 common sched_rr_get_interval __x64_sys_sched_rr_get_interval
158149 common mlock sys_mlock 160149 common mlock __x64_sys_mlock
159150 common munlock sys_munlock 161150 common munlock __x64_sys_munlock
160151 common mlockall sys_mlockall 162151 common mlockall __x64_sys_mlockall
161152 common munlockall sys_munlockall 163152 common munlockall __x64_sys_munlockall
162153 common vhangup sys_vhangup 164153 common vhangup __x64_sys_vhangup
163154 common modify_ldt sys_modify_ldt 165154 common modify_ldt __x64_sys_modify_ldt
164155 common pivot_root sys_pivot_root 166155 common pivot_root __x64_sys_pivot_root
165156 64 _sysctl sys_sysctl 167156 64 _sysctl __x64_sys_sysctl
166157 common prctl sys_prctl 168157 common prctl __x64_sys_prctl
167158 common arch_prctl sys_arch_prctl 169158 common arch_prctl __x64_sys_arch_prctl
168159 common adjtimex sys_adjtimex 170159 common adjtimex __x64_sys_adjtimex
169160 common setrlimit sys_setrlimit 171160 common setrlimit __x64_sys_setrlimit
170161 common chroot sys_chroot 172161 common chroot __x64_sys_chroot
171162 common sync sys_sync 173162 common sync __x64_sys_sync
172163 common acct sys_acct 174163 common acct __x64_sys_acct
173164 common settimeofday sys_settimeofday 175164 common settimeofday __x64_sys_settimeofday
174165 common mount sys_mount 176165 common mount __x64_sys_mount
175166 common umount2 sys_umount 177166 common umount2 __x64_sys_umount
176167 common swapon sys_swapon 178167 common swapon __x64_sys_swapon
177168 common swapoff sys_swapoff 179168 common swapoff __x64_sys_swapoff
178169 common reboot sys_reboot 180169 common reboot __x64_sys_reboot
179170 common sethostname sys_sethostname 181170 common sethostname __x64_sys_sethostname
180171 common setdomainname sys_setdomainname 182171 common setdomainname __x64_sys_setdomainname
181172 common iopl sys_iopl/ptregs 183172 common iopl __x64_sys_iopl/ptregs
182173 common ioperm sys_ioperm 184173 common ioperm __x64_sys_ioperm
183174 64 create_module 185174 64 create_module
184175 common init_module sys_init_module 186175 common init_module __x64_sys_init_module
185176 common delete_module sys_delete_module 187176 common delete_module __x64_sys_delete_module
186177 64 get_kernel_syms 188177 64 get_kernel_syms
187178 64 query_module 189178 64 query_module
188179 common quotactl sys_quotactl 190179 common quotactl __x64_sys_quotactl
189180 64 nfsservctl 191180 64 nfsservctl
190181 common getpmsg 192181 common getpmsg
191182 common putpmsg 193182 common putpmsg
192183 common afs_syscall 194183 common afs_syscall
193184 common tuxcall 195184 common tuxcall
194185 common security 196185 common security
195186 common gettid sys_gettid 197186 common gettid __x64_sys_gettid
196187 common readahead sys_readahead 198187 common readahead __x64_sys_readahead
197188 common setxattr sys_setxattr 199188 common setxattr __x64_sys_setxattr
198189 common lsetxattr sys_lsetxattr 200189 common lsetxattr __x64_sys_lsetxattr
199190 common fsetxattr sys_fsetxattr 201190 common fsetxattr __x64_sys_fsetxattr
200191 common getxattr sys_getxattr 202191 common getxattr __x64_sys_getxattr
201192 common lgetxattr sys_lgetxattr 203192 common lgetxattr __x64_sys_lgetxattr
202193 common fgetxattr sys_fgetxattr 204193 common fgetxattr __x64_sys_fgetxattr
203194 common listxattr sys_listxattr 205194 common listxattr __x64_sys_listxattr
204195 common llistxattr sys_llistxattr 206195 common llistxattr __x64_sys_llistxattr
205196 common flistxattr sys_flistxattr 207196 common flistxattr __x64_sys_flistxattr
206197 common removexattr sys_removexattr 208197 common removexattr __x64_sys_removexattr
207198 common lremovexattr sys_lremovexattr 209198 common lremovexattr __x64_sys_lremovexattr
208199 common fremovexattr sys_fremovexattr 210199 common fremovexattr __x64_sys_fremovexattr
209200 common tkill sys_tkill 211200 common tkill __x64_sys_tkill
210201 common time sys_time 212201 common time __x64_sys_time
211202 common futex sys_futex 213202 common futex __x64_sys_futex
212203 common sched_setaffinity sys_sched_setaffinity 214203 common sched_setaffinity __x64_sys_sched_setaffinity
213204 common sched_getaffinity sys_sched_getaffinity 215204 common sched_getaffinity __x64_sys_sched_getaffinity
214205 64 set_thread_area 216205 64 set_thread_area
215206 64 io_setup sys_io_setup 217206 64 io_setup __x64_sys_io_setup
216207 common io_destroy sys_io_destroy 218207 common io_destroy __x64_sys_io_destroy
217208 common io_getevents sys_io_getevents 219208 common io_getevents __x64_sys_io_getevents
218209 64 io_submit sys_io_submit 220209 64 io_submit __x64_sys_io_submit
219210 common io_cancel sys_io_cancel 221210 common io_cancel __x64_sys_io_cancel
220211 64 get_thread_area 222211 64 get_thread_area
221212 common lookup_dcookie sys_lookup_dcookie 223212 common lookup_dcookie __x64_sys_lookup_dcookie
222213 common epoll_create sys_epoll_create 224213 common epoll_create __x64_sys_epoll_create
223214 64 epoll_ctl_old 225214 64 epoll_ctl_old
224215 64 epoll_wait_old 226215 64 epoll_wait_old
225216 common remap_file_pages sys_remap_file_pages 227216 common remap_file_pages __x64_sys_remap_file_pages
226217 common getdents64 sys_getdents64 228217 common getdents64 __x64_sys_getdents64
227218 common set_tid_address sys_set_tid_address 229218 common set_tid_address __x64_sys_set_tid_address
228219 common restart_syscall sys_restart_syscall 230219 common restart_syscall __x64_sys_restart_syscall
229220 common semtimedop sys_semtimedop 231220 common semtimedop __x64_sys_semtimedop
230221 common fadvise64 sys_fadvise64 232221 common fadvise64 __x64_sys_fadvise64
231222 64 timer_create sys_timer_create 233222 64 timer_create __x64_sys_timer_create
232223 common timer_settime sys_timer_settime 234223 common timer_settime __x64_sys_timer_settime
233224 common timer_gettime sys_timer_gettime 235224 common timer_gettime __x64_sys_timer_gettime
234225 common timer_getoverrun sys_timer_getoverrun 236225 common timer_getoverrun __x64_sys_timer_getoverrun
235226 common timer_delete sys_timer_delete 237226 common timer_delete __x64_sys_timer_delete
236227 common clock_settime sys_clock_settime 238227 common clock_settime __x64_sys_clock_settime
237228 common clock_gettime sys_clock_gettime 239228 common clock_gettime __x64_sys_clock_gettime
238229 common clock_getres sys_clock_getres 240229 common clock_getres __x64_sys_clock_getres
239230 common clock_nanosleep sys_clock_nanosleep 241230 common clock_nanosleep __x64_sys_clock_nanosleep
240231 common exit_group sys_exit_group 242231 common exit_group __x64_sys_exit_group
241232 common epoll_wait sys_epoll_wait 243232 common epoll_wait __x64_sys_epoll_wait
242233 common epoll_ctl sys_epoll_ctl 244233 common epoll_ctl __x64_sys_epoll_ctl
243234 common tgkill sys_tgkill 245234 common tgkill __x64_sys_tgkill
244235 common utimes sys_utimes 246235 common utimes __x64_sys_utimes
245236 64 vserver 247236 64 vserver
246237 common mbind sys_mbind 248237 common mbind __x64_sys_mbind
247238 common set_mempolicy sys_set_mempolicy 249238 common set_mempolicy __x64_sys_set_mempolicy
248239 common get_mempolicy sys_get_mempolicy 250239 common get_mempolicy __x64_sys_get_mempolicy
249240 common mq_open sys_mq_open 251240 common mq_open __x64_sys_mq_open
250241 common mq_unlink sys_mq_unlink 252241 common mq_unlink __x64_sys_mq_unlink
251242 common mq_timedsend sys_mq_timedsend 253242 common mq_timedsend __x64_sys_mq_timedsend
252243 common mq_timedreceive sys_mq_timedreceive 254243 common mq_timedreceive __x64_sys_mq_timedreceive
253244 64 mq_notify sys_mq_notify 255244 64 mq_notify __x64_sys_mq_notify
254245 common mq_getsetattr sys_mq_getsetattr 256245 common mq_getsetattr __x64_sys_mq_getsetattr
255246 64 kexec_load sys_kexec_load 257246 64 kexec_load __x64_sys_kexec_load
256247 64 waitid sys_waitid 258247 64 waitid __x64_sys_waitid
257248 common add_key sys_add_key 259248 common add_key __x64_sys_add_key
258249 common request_key sys_request_key 260249 common request_key __x64_sys_request_key
259250 common keyctl sys_keyctl 261250 common keyctl __x64_sys_keyctl
260251 common ioprio_set sys_ioprio_set 262251 common ioprio_set __x64_sys_ioprio_set
261252 common ioprio_get sys_ioprio_get 263252 common ioprio_get __x64_sys_ioprio_get
262253 common inotify_init sys_inotify_init 264253 common inotify_init __x64_sys_inotify_init
263254 common inotify_add_watch sys_inotify_add_watch 265254 common inotify_add_watch __x64_sys_inotify_add_watch
264255 common inotify_rm_watch sys_inotify_rm_watch 266255 common inotify_rm_watch __x64_sys_inotify_rm_watch
265256 common migrate_pages sys_migrate_pages 267256 common migrate_pages __x64_sys_migrate_pages
266257 common openat sys_openat 268257 common openat __x64_sys_openat
267258 common mkdirat sys_mkdirat 269258 common mkdirat __x64_sys_mkdirat
268259 common mknodat sys_mknodat 270259 common mknodat __x64_sys_mknodat
269260 common fchownat sys_fchownat 271260 common fchownat __x64_sys_fchownat
270261 common futimesat sys_futimesat 272261 common futimesat __x64_sys_futimesat
271262 common newfstatat sys_newfstatat 273262 common newfstatat __x64_sys_newfstatat
272263 common unlinkat sys_unlinkat 274263 common unlinkat __x64_sys_unlinkat
273264 common renameat sys_renameat 275264 common renameat __x64_sys_renameat
274265 common linkat sys_linkat 276265 common linkat __x64_sys_linkat
275266 common symlinkat sys_symlinkat 277266 common symlinkat __x64_sys_symlinkat
276267 common readlinkat sys_readlinkat 278267 common readlinkat __x64_sys_readlinkat
277268 common fchmodat sys_fchmodat 279268 common fchmodat __x64_sys_fchmodat
278269 common faccessat sys_faccessat 280269 common faccessat __x64_sys_faccessat
279270 common pselect6 sys_pselect6 281270 common pselect6 __x64_sys_pselect6
280271 common ppoll sys_ppoll 282271 common ppoll __x64_sys_ppoll
281272 common unshare sys_unshare 283272 common unshare __x64_sys_unshare
282273 64 set_robust_list sys_set_robust_list 284273 64 set_robust_list __x64_sys_set_robust_list
283274 64 get_robust_list sys_get_robust_list 285274 64 get_robust_list __x64_sys_get_robust_list
284275 common splice sys_splice 286275 common splice __x64_sys_splice
285276 common tee sys_tee 287276 common tee __x64_sys_tee
286277 common sync_file_range sys_sync_file_range 288277 common sync_file_range __x64_sys_sync_file_range
287278 64 vmsplice sys_vmsplice 289278 64 vmsplice __x64_sys_vmsplice
288279 64 move_pages sys_move_pages 290279 64 move_pages __x64_sys_move_pages
289280 common utimensat sys_utimensat 291280 common utimensat __x64_sys_utimensat
290281 common epoll_pwait sys_epoll_pwait 292281 common epoll_pwait __x64_sys_epoll_pwait
291282 common signalfd sys_signalfd 293282 common signalfd __x64_sys_signalfd
292283 common timerfd_create sys_timerfd_create 294283 common timerfd_create __x64_sys_timerfd_create
293284 common eventfd sys_eventfd 295284 common eventfd __x64_sys_eventfd
294285 common fallocate sys_fallocate 296285 common fallocate __x64_sys_fallocate
295286 common timerfd_settime sys_timerfd_settime 297286 common timerfd_settime __x64_sys_timerfd_settime
296287 common timerfd_gettime sys_timerfd_gettime 298287 common timerfd_gettime __x64_sys_timerfd_gettime
297288 common accept4 sys_accept4 299288 common accept4 __x64_sys_accept4
298289 common signalfd4 sys_signalfd4 300289 common signalfd4 __x64_sys_signalfd4
299290 common eventfd2 sys_eventfd2 301290 common eventfd2 __x64_sys_eventfd2
300291 common epoll_create1 sys_epoll_create1 302291 common epoll_create1 __x64_sys_epoll_create1
301292 common dup3 sys_dup3 303292 common dup3 __x64_sys_dup3
302293 common pipe2 sys_pipe2 304293 common pipe2 __x64_sys_pipe2
303294 common inotify_init1 sys_inotify_init1 305294 common inotify_init1 __x64_sys_inotify_init1
304295 64 preadv sys_preadv 306295 64 preadv __x64_sys_preadv
305296 64 pwritev sys_pwritev 307296 64 pwritev __x64_sys_pwritev
306297 64 rt_tgsigqueueinfo sys_rt_tgsigqueueinfo 308297 64 rt_tgsigqueueinfo __x64_sys_rt_tgsigqueueinfo
307298 common perf_event_open sys_perf_event_open 309298 common perf_event_open __x64_sys_perf_event_open
308299 64 recvmmsg sys_recvmmsg 310299 64 recvmmsg __x64_sys_recvmmsg
309300 common fanotify_init sys_fanotify_init 311300 common fanotify_init __x64_sys_fanotify_init
310301 common fanotify_mark sys_fanotify_mark 312301 common fanotify_mark __x64_sys_fanotify_mark
311302 common prlimit64 sys_prlimit64 313302 common prlimit64 __x64_sys_prlimit64
312303 common name_to_handle_at sys_name_to_handle_at 314303 common name_to_handle_at __x64_sys_name_to_handle_at
313304 common open_by_handle_at sys_open_by_handle_at 315304 common open_by_handle_at __x64_sys_open_by_handle_at
314305 common clock_adjtime sys_clock_adjtime 316305 common clock_adjtime __x64_sys_clock_adjtime
315306 common syncfs sys_syncfs 317306 common syncfs __x64_sys_syncfs
316307 64 sendmmsg sys_sendmmsg 318307 64 sendmmsg __x64_sys_sendmmsg
317308 common setns sys_setns 319308 common setns __x64_sys_setns
318309 common getcpu sys_getcpu 320309 common getcpu __x64_sys_getcpu
319310 64 process_vm_readv sys_process_vm_readv 321310 64 process_vm_readv __x64_sys_process_vm_readv
320311 64 process_vm_writev sys_process_vm_writev 322311 64 process_vm_writev __x64_sys_process_vm_writev
321312 common kcmp sys_kcmp 323312 common kcmp __x64_sys_kcmp
322313 common finit_module sys_finit_module 324313 common finit_module __x64_sys_finit_module
323314 common sched_setattr sys_sched_setattr 325314 common sched_setattr __x64_sys_sched_setattr
324315 common sched_getattr sys_sched_getattr 326315 common sched_getattr __x64_sys_sched_getattr
325316 common renameat2 sys_renameat2 327316 common renameat2 __x64_sys_renameat2
326317 common seccomp sys_seccomp 328317 common seccomp __x64_sys_seccomp
327318 common getrandom sys_getrandom 329318 common getrandom __x64_sys_getrandom
328319 common memfd_create sys_memfd_create 330319 common memfd_create __x64_sys_memfd_create
329320 common kexec_file_load sys_kexec_file_load 331320 common kexec_file_load __x64_sys_kexec_file_load
330321 common bpf sys_bpf 332321 common bpf __x64_sys_bpf
331322 64 execveat sys_execveat/ptregs 333322 64 execveat __x64_sys_execveat/ptregs
332323 common userfaultfd sys_userfaultfd 334323 common userfaultfd __x64_sys_userfaultfd
333324 common membarrier sys_membarrier 335324 common membarrier __x64_sys_membarrier
334325 common mlock2 sys_mlock2 336325 common mlock2 __x64_sys_mlock2
335326 common copy_file_range sys_copy_file_range 337326 common copy_file_range __x64_sys_copy_file_range
336327 64 preadv2 sys_preadv2 338327 64 preadv2 __x64_sys_preadv2
337328 64 pwritev2 sys_pwritev2 339328 64 pwritev2 __x64_sys_pwritev2
338329 common pkey_mprotect sys_pkey_mprotect 340329 common pkey_mprotect __x64_sys_pkey_mprotect
339330 common pkey_alloc sys_pkey_alloc 341330 common pkey_alloc __x64_sys_pkey_alloc
340331 common pkey_free sys_pkey_free 342331 common pkey_free __x64_sys_pkey_free
341332 common statx sys_statx 343332 common statx __x64_sys_statx
342 344
343# 345#
344# x32-specific system call numbers start at 512 to avoid cache impact 346# x32-specific system call numbers start at 512 to avoid cache impact
diff --git a/arch/x86/entry/syscalls/syscalltbl.sh b/arch/x86/entry/syscalls/syscalltbl.sh
index d71ef4bd3615..94fcd1951aca 100644
--- a/arch/x86/entry/syscalls/syscalltbl.sh
+++ b/arch/x86/entry/syscalls/syscalltbl.sh
@@ -25,15 +25,27 @@ emit() {
25 nr="$2" 25 nr="$2"
26 entry="$3" 26 entry="$3"
27 compat="$4" 27 compat="$4"
28 umlentry=""
28 29
29 if [ "$abi" = "64" -a -n "$compat" ]; then 30 if [ "$abi" = "64" -a -n "$compat" ]; then
30 echo "a compat entry for a 64-bit syscall makes no sense" >&2 31 echo "a compat entry for a 64-bit syscall makes no sense" >&2
31 exit 1 32 exit 1
32 fi 33 fi
33 34
35 # For CONFIG_UML, we need to strip the __x64_sys prefix
36 if [ "$abi" = "64" -a "${entry}" != "${entry#__x64_sys}" ]; then
37 umlentry="sys${entry#__x64_sys}"
38 fi
39
34 if [ -z "$compat" ]; then 40 if [ -z "$compat" ]; then
35 if [ -n "$entry" ]; then 41 if [ -n "$entry" -a -z "$umlentry" ]; then
36 syscall_macro "$abi" "$nr" "$entry" 42 syscall_macro "$abi" "$nr" "$entry"
43 elif [ -n "$umlentry" ]; then # implies -n "$entry"
44 echo "#ifdef CONFIG_X86"
45 syscall_macro "$abi" "$nr" "$entry"
46 echo "#else /* CONFIG_UML */"
47 syscall_macro "$abi" "$nr" "$umlentry"
48 echo "#endif"
37 fi 49 fi
38 else 50 else
39 echo "#ifdef CONFIG_X86_32" 51 echo "#ifdef CONFIG_X86_32"
diff --git a/arch/x86/entry/vsyscall/vsyscall_64.c b/arch/x86/entry/vsyscall/vsyscall_64.c
index 20b3d4a88ee4..70b7845434cb 100644
--- a/arch/x86/entry/vsyscall/vsyscall_64.c
+++ b/arch/x86/entry/vsyscall/vsyscall_64.c
@@ -229,12 +229,12 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
229 switch (vsyscall_nr) { 229 switch (vsyscall_nr) {
230 case 0: 230 case 0:
231 /* this decodes regs->di and regs->si on its own */ 231 /* this decodes regs->di and regs->si on its own */
232 ret = sys_gettimeofday(regs); 232 ret = __x64_sys_gettimeofday(regs);
233 break; 233 break;
234 234
235 case 1: 235 case 1:
236 /* this decodes regs->di on its own */ 236 /* this decodes regs->di on its own */
237 ret = sys_time(regs); 237 ret = __x64_sys_time(regs);
238 break; 238 break;
239 239
240 case 2: 240 case 2:
@@ -242,7 +242,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
242 orig_dx = regs->dx; 242 orig_dx = regs->dx;
243 regs->dx = 0; 243 regs->dx = 0;
244 /* this decodes regs->di, regs->si and regs->dx on its own */ 244 /* this decodes regs->di, regs->si and regs->dx on its own */
245 ret = sys_getcpu(regs); 245 ret = __x64_sys_getcpu(regs);
246 regs->dx = orig_dx; 246 regs->dx = orig_dx;
247 break; 247 break;
248 } 248 }
diff --git a/arch/x86/include/asm/syscall_wrapper.h b/arch/x86/include/asm/syscall_wrapper.h
index 8d0951cfc2d4..a598013e08e9 100644
--- a/arch/x86/include/asm/syscall_wrapper.h
+++ b/arch/x86/include/asm/syscall_wrapper.h
@@ -44,12 +44,23 @@
44 return __se_sys##name(SC_IA32_REGS_TO_ARGS(x,__VA_ARGS__));\ 44 return __se_sys##name(SC_IA32_REGS_TO_ARGS(x,__VA_ARGS__));\
45 } 45 }
46 46
47/*
48 * To keep the naming coherent, re-define SYSCALL_DEFINE0 to create an alias
49 * named __ia32_sys_*()
50 */
51#define SYSCALL_DEFINE0(sname) \
52 SYSCALL_METADATA(_##sname, 0); \
53 asmlinkage long __x64_sys_##sname(void); \
54 ALLOW_ERROR_INJECTION(__x64_sys_##sname, ERRNO); \
55 SYSCALL_ALIAS(__ia32_sys_##sname, __x64_sys_##sname); \
56 asmlinkage long __x64_sys_##sname(void)
57
47#define COND_SYSCALL(name) \ 58#define COND_SYSCALL(name) \
48 cond_syscall(sys_##name); \ 59 cond_syscall(__x64_sys_##name); \
49 cond_syscall(__ia32_sys_##name) 60 cond_syscall(__ia32_sys_##name)
50 61
51#define SYS_NI(name) \ 62#define SYS_NI(name) \
52 SYSCALL_ALIAS(sys_##name, sys_ni_posix_timers); \ 63 SYSCALL_ALIAS(__x64_sys_##name, sys_ni_posix_timers); \
53 SYSCALL_ALIAS(__ia32_sys_##name, sys_ni_posix_timers) 64 SYSCALL_ALIAS(__ia32_sys_##name, sys_ni_posix_timers)
54 65
55#else /* CONFIG_IA32_EMULATION */ 66#else /* CONFIG_IA32_EMULATION */
@@ -81,8 +92,7 @@
81/* 92/*
82 * Compat means IA32_EMULATION and/or X86_X32. As they use a different 93 * Compat means IA32_EMULATION and/or X86_X32. As they use a different
83 * mapping of registers to parameters, we need to generate stubs for each 94 * mapping of registers to parameters, we need to generate stubs for each
84 * of them. There is no need to implement COMPAT_SYSCALL_DEFINE0, as it is 95 * of them.
85 * unused on x86.
86 */ 96 */
87#define COMPAT_SYSCALL_DEFINEx(x, name, ...) \ 97#define COMPAT_SYSCALL_DEFINEx(x, name, ...) \
88 static long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \ 98 static long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \
@@ -114,13 +124,13 @@
114/* 124/*
115 * Instead of the generic __SYSCALL_DEFINEx() definition, this macro takes 125 * Instead of the generic __SYSCALL_DEFINEx() definition, this macro takes
116 * struct pt_regs *regs as the only argument of the syscall stub named 126 * struct pt_regs *regs as the only argument of the syscall stub named
117 * sys_*(). It decodes just the registers it needs and passes them on to 127 * __x64_sys_*(). It decodes just the registers it needs and passes them on to
118 * the __se_sys_*() wrapper performing sign extension and then to the 128 * the __se_sys_*() wrapper performing sign extension and then to the
119 * __do_sys_*() function doing the actual job. These wrappers and functions 129 * __do_sys_*() function doing the actual job. These wrappers and functions
120 * are inlined (at least in very most cases), meaning that the assembly looks 130 * are inlined (at least in very most cases), meaning that the assembly looks
121 * as follows (slightly re-ordered for better readability): 131 * as follows (slightly re-ordered for better readability):
122 * 132 *
123 * <sys_recv>: <-- syscall with 4 parameters 133 * <__x64_sys_recv>: <-- syscall with 4 parameters
124 * callq <__fentry__> 134 * callq <__fentry__>
125 * 135 *
126 * mov 0x70(%rdi),%rdi <-- decode regs->di 136 * mov 0x70(%rdi),%rdi <-- decode regs->di
@@ -143,18 +153,13 @@
143 * If IA32_EMULATION is enabled, this macro generates an additional wrapper 153 * If IA32_EMULATION is enabled, this macro generates an additional wrapper
144 * named __ia32_sys_*() which decodes the struct pt_regs *regs according 154 * named __ia32_sys_*() which decodes the struct pt_regs *regs according
145 * to the i386 calling convention (bx, cx, dx, si, di, bp). 155 * to the i386 calling convention (bx, cx, dx, si, di, bp).
146 *
147 * As the generic SYSCALL_DEFINE0() macro does not decode any parameters for
148 * obvious reasons, and passing struct pt_regs *regs to it in %rdi does not
149 * hurt, there is no need to override it, or to define it differently for
150 * IA32_EMULATION.
151 */ 156 */
152#define __SYSCALL_DEFINEx(x, name, ...) \ 157#define __SYSCALL_DEFINEx(x, name, ...) \
153 asmlinkage long sys##name(const struct pt_regs *regs); \ 158 asmlinkage long __x64_sys##name(const struct pt_regs *regs); \
154 ALLOW_ERROR_INJECTION(sys##name, ERRNO); \ 159 ALLOW_ERROR_INJECTION(__x64_sys##name, ERRNO); \
155 static long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \ 160 static long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \
156 static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\ 161 static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
157 asmlinkage long sys##name(const struct pt_regs *regs) \ 162 asmlinkage long __x64_sys##name(const struct pt_regs *regs) \
158 { \ 163 { \
159 return __se_sys##name(SC_X86_64_REGS_TO_ARGS(x,__VA_ARGS__));\ 164 return __se_sys##name(SC_X86_64_REGS_TO_ARGS(x,__VA_ARGS__));\
160 } \ 165 } \
@@ -169,12 +174,36 @@
169 static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) 174 static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))
170 175
171/* 176/*
177 * As the generic SYSCALL_DEFINE0() macro does not decode any parameters for
178 * obvious reasons, and passing struct pt_regs *regs to it in %rdi does not
179 * hurt, we only need to re-define it here to keep the naming congruent to
180 * SYSCALL_DEFINEx() -- which is essential for the COND_SYSCALL() and SYS_NI()
181 * macros to work correctly.
182 */
183#ifndef SYSCALL_DEFINE0
184#define SYSCALL_DEFINE0(sname) \
185 SYSCALL_METADATA(_##sname, 0); \
186 asmlinkage long __x64_sys_##sname(void); \
187 ALLOW_ERROR_INJECTION(__x64_sys_##sname, ERRNO); \
188 asmlinkage long __x64_sys_##sname(void)
189#endif
190
191#ifndef COND_SYSCALL
192#define COND_SYSCALL(name) cond_syscall(__x64_sys_##name)
193#endif
194
195#ifndef SYS_NI
196#define SYS_NI(name) SYSCALL_ALIAS(__x64_sys_##name, sys_ni_posix_timers);
197#endif
198
199
200/*
172 * For VSYSCALLS, we need to declare these three syscalls with the new 201 * For VSYSCALLS, we need to declare these three syscalls with the new
173 * pt_regs-based calling convention for in-kernel use. 202 * pt_regs-based calling convention for in-kernel use.
174 */ 203 */
175struct pt_regs; 204struct pt_regs;
176asmlinkage long sys_getcpu(const struct pt_regs *regs); /* di,si,dx */ 205asmlinkage long __x64_sys_getcpu(const struct pt_regs *regs);
177asmlinkage long sys_gettimeofday(const struct pt_regs *regs); /* di,si */ 206asmlinkage long __x64_sys_gettimeofday(const struct pt_regs *regs);
178asmlinkage long sys_time(const struct pt_regs *regs); /* di */ 207asmlinkage long __x64_sys_time(const struct pt_regs *regs);
179 208
180#endif /* _ASM_X86_SYSCALL_WRAPPER_H */ 209#endif /* _ASM_X86_SYSCALL_WRAPPER_H */
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-22 17:32:26 -0400