Commit 303395ac authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

x86: Generate system call tables and unistd_*.h from tables 



Generate system call tables and unistd_*.h automatically from the
tables in arch/x86/syscalls.  All other information, like NR_syscalls,
is auto-generated, some of which is in asm-offsets_*.c.

This allows us to keep all the system call information in one place,
and allows for kernel space and user space to see different
information; this is currently used for the ia32 system call numbers
when building the 64-bit kernel, but will be used by the x32 ABI in
the near future.

This also removes some gratuitious differences between i386, x86-64
and ia32; in particular, now all system call tables are generated with
the same mechanism.

Cc: H. J. Lu <hjl.tools@gmail.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 29dc54c6

arch/x86/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -117,6 +117,12 @@ KBUILD_CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,) 
KBUILD_CFLAGS += $(mflags-y)

KBUILD_AFLAGS += $(mflags-y)



###

# Syscall table generation



archheaders:

	$(Q)$(MAKE) $(build)=arch/x86/syscalls all



###

# Kernel objects

arch/x86/ia32/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o

obj-$(CONFIG_IA32_EMULATION) += nosyscall.o

obj-$(CONFIG_IA32_EMULATION) += nosyscall.o syscall_ia32.o



sysv-$(CONFIG_SYSVIPC) := ipc32.o

obj-$(CONFIG_IA32_EMULATION) += $(sysv-y)

arch/x86/ia32/ia32entry.S

+0 −356
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 


	.section .entry.text, "ax"



#define IA32_NR_syscalls ((ia32_syscall_end - ia32_sys_call_table)/8)



	.macro IA32_ARG_FIXUP noebp=0

	movl	%edi,%r8d

	.if \noebp
@@ -496,357 +494,3 @@ ENTRY(ia32_ptregs_common) 
	jmp  ia32_sysret	/* misbalances the return cache */

	CFI_ENDPROC

END(ia32_ptregs_common)
 


	.section .rodata,"a"

	.align 8

ia32_sys_call_table:

	.quad sys_restart_syscall

	.quad sys_exit

	.quad stub32_fork

	.quad sys_read

	.quad sys_write

	.quad compat_sys_open		/* 5 */

	.quad sys_close

	.quad sys32_waitpid

	.quad sys_creat

	.quad sys_link

	.quad sys_unlink		/* 10 */

	.quad stub32_execve

	.quad sys_chdir

	.quad compat_sys_time

	.quad sys_mknod

	.quad sys_chmod		/* 15 */

	.quad sys_lchown16

	.quad quiet_ni_syscall			/* old break syscall holder */

	.quad sys_stat

	.quad sys32_lseek

	.quad sys_getpid		/* 20 */

	.quad compat_sys_mount	/* mount  */

	.quad sys_oldumount	/* old_umount  */

	.quad sys_setuid16

	.quad sys_getuid16

	.quad compat_sys_stime	/* stime */		/* 25 */

	.quad compat_sys_ptrace	/* ptrace */

	.quad sys_alarm

	.quad sys_fstat	/* (old)fstat */

	.quad sys_pause

	.quad compat_sys_utime	/* 30 */

	.quad quiet_ni_syscall	/* old stty syscall holder */

	.quad quiet_ni_syscall	/* old gtty syscall holder */

	.quad sys_access

	.quad sys_nice	

	.quad quiet_ni_syscall	/* 35 */	/* old ftime syscall holder */

	.quad sys_sync

	.quad sys32_kill

	.quad sys_rename

	.quad sys_mkdir

	.quad sys_rmdir		/* 40 */

	.quad sys_dup

	.quad sys_pipe

	.quad compat_sys_times

	.quad quiet_ni_syscall			/* old prof syscall holder */

	.quad sys_brk		/* 45 */

	.quad sys_setgid16

	.quad sys_getgid16

	.quad sys_signal

	.quad sys_geteuid16

	.quad sys_getegid16	/* 50 */

	.quad sys_acct

	.quad sys_umount			/* new_umount */

	.quad quiet_ni_syscall			/* old lock syscall holder */

	.quad compat_sys_ioctl

	.quad compat_sys_fcntl64		/* 55 */

	.quad quiet_ni_syscall			/* old mpx syscall holder */

	.quad sys_setpgid

	.quad quiet_ni_syscall			/* old ulimit syscall holder */

	.quad sys_olduname

	.quad sys_umask		/* 60 */

	.quad sys_chroot

	.quad compat_sys_ustat

	.quad sys_dup2

	.quad sys_getppid

	.quad sys_getpgrp		/* 65 */

	.quad sys_setsid

	.quad sys32_sigaction

	.quad sys_sgetmask

	.quad sys_ssetmask

	.quad sys_setreuid16	/* 70 */

	.quad sys_setregid16

	.quad sys32_sigsuspend

	.quad compat_sys_sigpending

	.quad sys_sethostname

	.quad compat_sys_setrlimit	/* 75 */

	.quad compat_sys_old_getrlimit	/* old_getrlimit */

	.quad compat_sys_getrusage

	.quad compat_sys_gettimeofday

	.quad compat_sys_settimeofday

	.quad sys_getgroups16	/* 80 */

	.quad sys_setgroups16

	.quad compat_sys_old_select

	.quad sys_symlink

	.quad sys_lstat

	.quad sys_readlink		/* 85 */

	.quad sys_uselib

	.quad sys_swapon

	.quad sys_reboot

	.quad compat_sys_old_readdir

	.quad sys32_mmap		/* 90 */

	.quad sys_munmap

	.quad sys_truncate

	.quad sys_ftruncate

	.quad sys_fchmod

	.quad sys_fchown16		/* 95 */

	.quad sys_getpriority

	.quad sys_setpriority

	.quad quiet_ni_syscall			/* old profil syscall holder */

	.quad compat_sys_statfs

	.quad compat_sys_fstatfs		/* 100 */

	.quad sys_ioperm

	.quad compat_sys_socketcall

	.quad sys_syslog

	.quad compat_sys_setitimer

	.quad compat_sys_getitimer	/* 105 */

	.quad compat_sys_newstat

	.quad compat_sys_newlstat

	.quad compat_sys_newfstat

	.quad sys_uname

	.quad stub32_iopl		/* 110 */

	.quad sys_vhangup

	.quad quiet_ni_syscall	/* old "idle" system call */

	.quad sys32_vm86_warning	/* vm86old */ 

	.quad compat_sys_wait4

	.quad sys_swapoff		/* 115 */

	.quad compat_sys_sysinfo

	.quad sys32_ipc

	.quad sys_fsync

	.quad stub32_sigreturn

	.quad stub32_clone		/* 120 */

	.quad sys_setdomainname

	.quad sys_newuname

	.quad sys_modify_ldt

	.quad compat_sys_adjtimex

	.quad sys32_mprotect		/* 125 */

	.quad compat_sys_sigprocmask

	.quad quiet_ni_syscall		/* create_module */

	.quad sys_init_module

	.quad sys_delete_module

	.quad quiet_ni_syscall		/* 130  get_kernel_syms */

	.quad sys32_quotactl

	.quad sys_getpgid

	.quad sys_fchdir

	.quad quiet_ni_syscall	/* bdflush */

	.quad sys_sysfs		/* 135 */

	.quad sys_personality

	.quad quiet_ni_syscall	/* for afs_syscall */

	.quad sys_setfsuid16

	.quad sys_setfsgid16

	.quad sys_llseek		/* 140 */

	.quad compat_sys_getdents

	.quad compat_sys_select

	.quad sys_flock

	.quad sys_msync

	.quad compat_sys_readv		/* 145 */

	.quad compat_sys_writev

	.quad sys_getsid

	.quad sys_fdatasync

	.quad compat_sys_sysctl	/* sysctl */

	.quad sys_mlock		/* 150 */

	.quad sys_munlock

	.quad sys_mlockall

	.quad sys_munlockall

	.quad sys_sched_setparam

	.quad sys_sched_getparam   /* 155 */

	.quad sys_sched_setscheduler

	.quad sys_sched_getscheduler

	.quad sys_sched_yield

	.quad sys_sched_get_priority_max

	.quad sys_sched_get_priority_min  /* 160 */

	.quad sys32_sched_rr_get_interval

	.quad compat_sys_nanosleep

	.quad sys_mremap

	.quad sys_setresuid16

	.quad sys_getresuid16	/* 165 */

	.quad sys32_vm86_warning	/* vm86 */ 

	.quad quiet_ni_syscall	/* query_module */

	.quad sys_poll

	.quad quiet_ni_syscall /* old nfsservctl */

	.quad sys_setresgid16	/* 170 */

	.quad sys_getresgid16

	.quad sys_prctl

	.quad stub32_rt_sigreturn

	.quad sys32_rt_sigaction

	.quad sys32_rt_sigprocmask	/* 175 */

	.quad sys32_rt_sigpending

	.quad compat_sys_rt_sigtimedwait

	.quad sys32_rt_sigqueueinfo

	.quad sys_rt_sigsuspend

	.quad sys32_pread		/* 180 */

	.quad sys32_pwrite

	.quad sys_chown16

	.quad sys_getcwd

	.quad sys_capget

	.quad sys_capset

	.quad stub32_sigaltstack

	.quad sys32_sendfile

	.quad quiet_ni_syscall		/* streams1 */

	.quad quiet_ni_syscall		/* streams2 */

	.quad stub32_vfork            /* 190 */

	.quad compat_sys_getrlimit

	.quad sys_mmap_pgoff

	.quad sys32_truncate64

	.quad sys32_ftruncate64

	.quad sys32_stat64		/* 195 */

	.quad sys32_lstat64

	.quad sys32_fstat64

	.quad sys_lchown

	.quad sys_getuid

	.quad sys_getgid		/* 200 */

	.quad sys_geteuid

	.quad sys_getegid

	.quad sys_setreuid

	.quad sys_setregid

	.quad sys_getgroups	/* 205 */

	.quad sys_setgroups

	.quad sys_fchown

	.quad sys_setresuid

	.quad sys_getresuid

	.quad sys_setresgid	/* 210 */

	.quad sys_getresgid

	.quad sys_chown

	.quad sys_setuid

	.quad sys_setgid

	.quad sys_setfsuid		/* 215 */

	.quad sys_setfsgid

	.quad sys_pivot_root

	.quad sys_mincore

	.quad sys_madvise

	.quad compat_sys_getdents64	/* 220 getdents64 */

	.quad compat_sys_fcntl64	

	.quad quiet_ni_syscall		/* tux */

	.quad quiet_ni_syscall    	/* security */

	.quad sys_gettid	

	.quad sys32_readahead	/* 225 */

	.quad sys_setxattr

	.quad sys_lsetxattr

	.quad sys_fsetxattr

	.quad sys_getxattr

	.quad sys_lgetxattr	/* 230 */

	.quad sys_fgetxattr

	.quad sys_listxattr

	.quad sys_llistxattr

	.quad sys_flistxattr

	.quad sys_removexattr	/* 235 */

	.quad sys_lremovexattr

	.quad sys_fremovexattr

	.quad sys_tkill

	.quad sys_sendfile64 

	.quad compat_sys_futex		/* 240 */

	.quad compat_sys_sched_setaffinity

	.quad compat_sys_sched_getaffinity

	.quad sys_set_thread_area

	.quad sys_get_thread_area

	.quad compat_sys_io_setup	/* 245 */

	.quad sys_io_destroy

	.quad compat_sys_io_getevents

	.quad compat_sys_io_submit

	.quad sys_io_cancel

	.quad sys32_fadvise64		/* 250 */

	.quad quiet_ni_syscall 	/* free_huge_pages */

	.quad sys_exit_group

	.quad sys32_lookup_dcookie

	.quad sys_epoll_create

	.quad sys_epoll_ctl		/* 255 */

	.quad sys_epoll_wait

	.quad sys_remap_file_pages

	.quad sys_set_tid_address

	.quad compat_sys_timer_create

	.quad compat_sys_timer_settime	/* 260 */

	.quad compat_sys_timer_gettime

	.quad sys_timer_getoverrun

	.quad sys_timer_delete

	.quad compat_sys_clock_settime

	.quad compat_sys_clock_gettime	/* 265 */

	.quad compat_sys_clock_getres

	.quad compat_sys_clock_nanosleep

	.quad compat_sys_statfs64

	.quad compat_sys_fstatfs64

	.quad sys_tgkill		/* 270 */

	.quad compat_sys_utimes

	.quad sys32_fadvise64_64

	.quad quiet_ni_syscall	/* sys_vserver */

	.quad sys_mbind

	.quad compat_sys_get_mempolicy	/* 275 */

	.quad sys_set_mempolicy

	.quad compat_sys_mq_open

	.quad sys_mq_unlink

	.quad compat_sys_mq_timedsend

	.quad compat_sys_mq_timedreceive	/* 280 */

	.quad compat_sys_mq_notify

	.quad compat_sys_mq_getsetattr

	.quad compat_sys_kexec_load	/* reserved for kexec */

	.quad compat_sys_waitid

	.quad quiet_ni_syscall		/* 285: sys_altroot */

	.quad sys_add_key

	.quad sys_request_key

	.quad sys_keyctl

	.quad sys_ioprio_set

	.quad sys_ioprio_get		/* 290 */

	.quad sys_inotify_init

	.quad sys_inotify_add_watch

	.quad sys_inotify_rm_watch

	.quad sys_migrate_pages

	.quad compat_sys_openat		/* 295 */

	.quad sys_mkdirat

	.quad sys_mknodat

	.quad sys_fchownat

	.quad compat_sys_futimesat

	.quad sys32_fstatat		/* 300 */

	.quad sys_unlinkat

	.quad sys_renameat

	.quad sys_linkat

	.quad sys_symlinkat

	.quad sys_readlinkat		/* 305 */

	.quad sys_fchmodat

	.quad sys_faccessat

	.quad compat_sys_pselect6

	.quad compat_sys_ppoll

	.quad sys_unshare		/* 310 */

	.quad compat_sys_set_robust_list

	.quad compat_sys_get_robust_list

	.quad sys_splice

	.quad sys32_sync_file_range

	.quad sys_tee			/* 315 */

	.quad compat_sys_vmsplice

	.quad compat_sys_move_pages

	.quad sys_getcpu

	.quad sys_epoll_pwait

	.quad compat_sys_utimensat	/* 320 */

	.quad compat_sys_signalfd

	.quad sys_timerfd_create

	.quad sys_eventfd

	.quad sys32_fallocate

	.quad compat_sys_timerfd_settime	/* 325 */

	.quad compat_sys_timerfd_gettime

	.quad compat_sys_signalfd4

	.quad sys_eventfd2

	.quad sys_epoll_create1

	.quad sys_dup3				/* 330 */

	.quad sys_pipe2

	.quad sys_inotify_init1

	.quad compat_sys_preadv

	.quad compat_sys_pwritev

	.quad compat_sys_rt_tgsigqueueinfo	/* 335 */

	.quad sys_perf_event_open

	.quad compat_sys_recvmmsg

	.quad sys_fanotify_init

	.quad sys32_fanotify_mark

	.quad sys_prlimit64		/* 340 */

	.quad sys_name_to_handle_at

	.quad compat_sys_open_by_handle_at

	.quad compat_sys_clock_adjtime

	.quad sys_syncfs

	.quad compat_sys_sendmmsg	/* 345 */

	.quad sys_setns

	.quad compat_sys_process_vm_readv

	.quad compat_sys_process_vm_writev

ia32_syscall_end:

arch/x86/ia32/syscall_ia32.c

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/* System call table for ia32 emulation. */



#include <linux/linkage.h>

#include <linux/sys.h>

#include <linux/cache.h>

#include <asm/asm-offsets.h>



#define __SYSCALL_I386(nr, sym, compat) extern asmlinkage void compat(void) ;

#include <asm/syscalls_32.h>

#undef __SYSCALL_I386



#define __SYSCALL_I386(nr, sym, compat) [nr] = compat,



typedef void (*sys_call_ptr_t)(void);



extern void compat_ni_syscall(void);



const sys_call_ptr_t ia32_sys_call_table[__NR_ia32_syscall_max+1] = {

	/*

	 * Smells like a like a compiler bug -- it doesn't work

	 * when the & below is removed.

	 */

	[0 ... __NR_ia32_syscall_max] = &compat_ni_syscall,

#include <asm/syscalls_32.h>

};

arch/x86/include/asm/Kbuild

+3 −2
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ header-y += processor-flags.h 
header-y += ptrace-abi.h

header-y += sigcontext32.h

header-y += ucontext.h

header-y += unistd_32.h

header-y += unistd_64.h

header-y += vm86.h

header-y += vsyscall.h



genhdr-y += unistd_32.h

genhdr-y += unistd_64.h

CRA Git | Maintained and supported by SUSTech CRA and CCSE