Skip to content

Commit

Permalink
arch: update s390/s390x system call tables
Browse files Browse the repository at this point in the history 
s390 and s390x gained quite a few new system calls:
- numa related system calls
- the separated socket system calls
- two more s390 specific pci mmio system calls

All architectures got the new membarrier and userfaultfd system calls.

This patch updates the s390 specific system call tables and updates other
architectures where needed.

Also remove some extra whitespace from the s390 specific system call tables.

Both 'make check' and './regression -T live' still work for s390 and s390x
after this update.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Paul Moore <pmoore@redhat.com>
  • Loading branch information
@heicarst @pcmoore
heicarst authored and pcmoore committed Nov 11, 2015
1 parent 32a0fa6 commit d2ca11b
Show file tree
Hide file tree
Showing 13 changed files with 131 additions and 63 deletions.
20 changes: 20 additions & 0 deletions include/seccomp.h.in
View file
Expand Up @@ -1557,6 +1557,26 @@ int seccomp_export_bpf(const scmp_filter_ctx ctx, int fd);
#define __NR_s390_runtime_instr __PNR_s390_runtime_instr
#endif /* __NR_s390_runtime_instr */

#define __PNR_s390_pci_mmio_read -10197
#ifndef __NR_s390_pci_mmio_read
#define __NR_s390_pci_mmio_read __PNR_s390_pci_mmio_read
#endif /* __NR_s390_pci_mmio_read */

#define __PNR_s390_pci_mmio_write -10198
#ifndef __NR_s390_pci_mmio_write
#define __NR_s390_pci_mmio_write __PNR_s390_pci_mmio_write
#endif /* __NR_s390_pci_mmio_write */

#define __PNR_membarrier -10199
#ifndef __NR_membarrier
#define __NR_membarrier __PNR_membarrier
#endif /* __NR_membarrier */

#define __PNR_userfaultfd -10200
#ifndef __NR_userfaultfd
#define __NR_userfaultfd __PNR_userfaultfd
#endif /* __NR_userfaultfd */

#ifdef __cplusplus
}
#endif
Expand Down
4 changes: 4 additions & 0 deletions src/arch-aarch64-syscalls.c
View file
Expand Up @@ -196,6 +196,7 @@ const struct arch_syscall_def aarch64_syscall_table[] = { \
{ "lstat64", __PNR_lstat64 },
{ "madvise", 233 },
{ "mbind", 235 },
{ "membarrier", 283 },
{ "memfd_create", 279 },
{ "migrate_pages", 238 },
{ "mincore", 232 },
Expand Down Expand Up @@ -296,6 +297,8 @@ const struct arch_syscall_def aarch64_syscall_table[] = { \
{ "rt_sigtimedwait", 137 },
{ "rt_tgsigqueueinfo", 240 },
{ "rtas", __PNR_rtas },
{ "s390_pci_mmio_read", __PNR_s390_pci_mmio_read },
{ "s390_pci_mmio_write", __PNR_s390_pci_mmio_write },
{ "s390_runtime_instr", __PNR_s390_runtime_instr },
{ "sched_get_priority_max", 125 },
{ "sched_get_priority_min", 126 },
Expand Down Expand Up @@ -430,6 +433,7 @@ const struct arch_syscall_def aarch64_syscall_table[] = { \
{ "uselib", __PNR_uselib },
{ "usr26", __PNR_usr26 },
{ "usr32", __PNR_usr32 },
{ "userfaultfd", 282 },
{ "ustat", __PNR_ustat },
{ "utime", __PNR_utime },
{ "utimensat", 88 },
Expand Down
4 changes: 4 additions & 0 deletions src/arch-arm-syscalls.c
View file
Expand Up @@ -208,6 +208,7 @@ const struct arch_syscall_def arm_syscall_table[] = { \
{ "lstat64", (__SCMP_NR_BASE + 196) },
{ "madvise", (__SCMP_NR_BASE + 220) },
{ "mbind", (__SCMP_NR_BASE + 319) },
{ "membarrier", (__SCMP_NR_BASE + 389) },
{ "memfd_create", (__SCMP_NR_BASE + 385) },
{ "migrate_pages", __PNR_migrate_pages },
{ "mincore", (__SCMP_NR_BASE + 219) },
Expand Down Expand Up @@ -308,6 +309,8 @@ const struct arch_syscall_def arm_syscall_table[] = { \
{ "rt_sigtimedwait", (__SCMP_NR_BASE + 177) },
{ "rt_tgsigqueueinfo", (__SCMP_NR_BASE + 363) },
{ "rtas", __PNR_rtas },
{ "s390_pci_mmio_read", __PNR_s390_pci_mmio_read },
{ "s390_pci_mmio_write", __PNR_s390_pci_mmio_write },
{ "s390_runtime_instr", __PNR_s390_runtime_instr },
{ "sched_get_priority_max", (__SCMP_NR_BASE + 159) },
{ "sched_get_priority_min", (__SCMP_NR_BASE + 160) },
Expand Down Expand Up @@ -442,6 +445,7 @@ const struct arch_syscall_def arm_syscall_table[] = { \
{ "uselib", (__SCMP_NR_BASE + 86) },
{ "usr26", (__SCMP_NR_BASE + (__SCMP_ARM_NR_BASE + 3)) },
{ "usr32", (__SCMP_NR_BASE + (__SCMP_ARM_NR_BASE + 4)) },
{ "userfaultfd", (__SCMP_NR_BASE + 388) },
{ "ustat", (__SCMP_NR_BASE + 62) },
{ "utime", __PNR_utime },
{ "utimensat", (__SCMP_NR_BASE + 348) },
Expand Down
4 changes: 4 additions & 0 deletions src/arch-mips-syscalls.c
View file
Expand Up @@ -200,6 +200,7 @@ const struct arch_syscall_def mips_syscall_table[] = { \
{ "lstat64", (__SCMP_NR_BASE + 214) },
{ "madvise", (__SCMP_NR_BASE + 218) },
{ "mbind", (__SCMP_NR_BASE + 268) },
{ "membarrier", (__SCMP_NR_BASE + 358) },
{ "memfd_create", (__SCMP_NR_BASE + 354) },
{ "migrate_pages", (__SCMP_NR_BASE + 287) },
{ "mincore", (__SCMP_NR_BASE + 217) },
Expand Down Expand Up @@ -300,6 +301,8 @@ const struct arch_syscall_def mips_syscall_table[] = { \
{ "rt_sigtimedwait", (__SCMP_NR_BASE + 197) },
{ "rt_tgsigqueueinfo", (__SCMP_NR_BASE + 332) },
{ "rtas", __PNR_rtas },
{ "s390_pci_mmio_read", __PNR_s390_pci_mmio_read },
{ "s390_pci_mmio_write", __PNR_s390_pci_mmio_write },
{ "s390_runtime_instr", __PNR_s390_runtime_instr },
{ "sched_get_priority_max", (__SCMP_NR_BASE + 163) },
{ "sched_get_priority_min", (__SCMP_NR_BASE + 164) },
Expand Down Expand Up @@ -434,6 +437,7 @@ const struct arch_syscall_def mips_syscall_table[] = { \
{ "uselib", (__SCMP_NR_BASE + 86) },
{ "usr26", __PNR_usr26 },
{ "usr32", __PNR_usr32 },
{ "userfaultfd", (__SCMP_NR_BASE + 357) },
{ "ustat", (__SCMP_NR_BASE + 62) },
{ "utime", (__SCMP_NR_BASE + 30) },
{ "utimensat", (__SCMP_NR_BASE + 316) },
Expand Down
4 changes: 4 additions & 0 deletions src/arch-mips64-syscalls.c
View file
Expand Up @@ -200,6 +200,7 @@ const struct arch_syscall_def mips64_syscall_table[] = { \
{ "lstat64", __PNR_lstat64 },
{ "madvise", (__SCMP_NR_BASE + 27) },
{ "mbind", (__SCMP_NR_BASE + 227) },
{ "membarrier", (__SCMP_NR_BASE + 318) },
{ "memfd_create", (__SCMP_NR_BASE + 314) },
{ "migrate_pages", (__SCMP_NR_BASE + 246) },
{ "mincore", (__SCMP_NR_BASE + 26) },
Expand Down Expand Up @@ -300,6 +301,8 @@ const struct arch_syscall_def mips64_syscall_table[] = { \
{ "rt_sigtimedwait", (__SCMP_NR_BASE + 126) },
{ "rt_tgsigqueueinfo", (__SCMP_NR_BASE + 291) },
{ "rtas", __PNR_rtas },
{ "s390_pci_mmio_read", __PNR_s390_pci_mmio_read },
{ "s390_pci_mmio_write", __PNR_s390_pci_mmio_write },
{ "s390_runtime_instr", __PNR_s390_runtime_instr },
{ "sched_get_priority_max", (__SCMP_NR_BASE + 143) },
{ "sched_get_priority_min", (__SCMP_NR_BASE + 144) },
Expand Down Expand Up @@ -434,6 +437,7 @@ const struct arch_syscall_def mips64_syscall_table[] = { \
{ "uselib", __PNR_uselib },
{ "usr26", __PNR_usr26 },
{ "usr32", __PNR_usr32 },
{ "userfaultfd", (__SCMP_NR_BASE + 317) },
{ "ustat", (__SCMP_NR_BASE + 133) },
{ "utime", (__SCMP_NR_BASE + 130) },
{ "utimensat", (__SCMP_NR_BASE + 275) },
Expand Down
4 changes: 4 additions & 0 deletions src/arch-mips64n32-syscalls.c
View file
Expand Up @@ -200,6 +200,7 @@ const struct arch_syscall_def mips64n32_syscall_table[] = { \
{ "lstat64", __PNR_lstat64 },
{ "madvise", (__SCMP_NR_BASE + 27) },
{ "mbind", (__SCMP_NR_BASE + 231) },
{ "membarrier", (__SCMP_NR_BASE + 322) },
{ "memfd_create", (__SCMP_NR_BASE + 318) },
{ "migrate_pages", (__SCMP_NR_BASE + 250) },
{ "mincore", (__SCMP_NR_BASE + 26) },
Expand Down Expand Up @@ -300,6 +301,8 @@ const struct arch_syscall_def mips64n32_syscall_table[] = { \
{ "rt_sigtimedwait", (__SCMP_NR_BASE + 126) },
{ "rt_tgsigqueueinfo", (__SCMP_NR_BASE + 295) },
{ "rtas", __PNR_rtas },
{ "s390_pci_mmio_read", __PNR_s390_pci_mmio_read },
{ "s390_pci_mmio_write", __PNR_s390_pci_mmio_write },
{ "s390_runtime_instr", __PNR_s390_runtime_instr },
{ "sched_get_priority_max", (__SCMP_NR_BASE + 143) },
{ "sched_get_priority_min", (__SCMP_NR_BASE + 144) },
Expand Down Expand Up @@ -434,6 +437,7 @@ const struct arch_syscall_def mips64n32_syscall_table[] = { \
{ "uselib", __PNR_uselib },
{ "usr26", __PNR_usr26 },
{ "usr32", __PNR_usr32 },
{ "userfaultfd", (__SCMP_NR_BASE + 321) },
{ "ustat", (__SCMP_NR_BASE + 133) },
{ "utime", (__SCMP_NR_BASE + 130) },
{ "utimensat", (__SCMP_NR_BASE + 279) },
Expand Down
4 changes: 4 additions & 0 deletions src/arch-ppc-syscalls.c
View file
Expand Up @@ -197,6 +197,7 @@ const struct arch_syscall_def ppc_syscall_table[] = { \
{ "lstat64", 196 },
{ "madvise", 205 },
{ "mbind", 259 },
{ "membarrier", 365 },
{ "memfd_create", 360 },
{ "migrate_pages", 258 },
{ "mincore", 206 },
Expand Down Expand Up @@ -297,6 +298,8 @@ const struct arch_syscall_def ppc_syscall_table[] = { \
{ "rt_sigtimedwait", 176 },
{ "rt_tgsigqueueinfo", 322 },
{ "rtas", 255 },
{ "s390_pci_mmio_read", __PNR_s390_pci_mmio_read },
{ "s390_pci_mmio_write", __PNR_s390_pci_mmio_write },
{ "s390_runtime_instr", __PNR_s390_runtime_instr },
{ "sched_get_priority_max", 159 },
{ "sched_get_priority_min", 160 },
Expand Down Expand Up @@ -431,6 +434,7 @@ const struct arch_syscall_def ppc_syscall_table[] = { \
{ "uselib", 86 },
{ "usr26", __PNR_usr26 },
{ "usr32", __PNR_usr32 },
{ "userfaultfd", 364 },
{ "ustat", 62 },
{ "utime", 30 },
{ "utimensat", 304 },
Expand Down
4 changes: 4 additions & 0 deletions src/arch-ppc64-syscalls.c
View file
Expand Up @@ -197,6 +197,7 @@ const struct arch_syscall_def ppc64_syscall_table[] = { \
{ "lstat64", __PNR_lstat64 },
{ "madvise", 205 },
{ "mbind", 259 },
{ "membarrier", 365 },
{ "memfd_create", 360 },
{ "migrate_pages", 258 },
{ "mincore", 206 },
Expand Down Expand Up @@ -297,6 +298,8 @@ const struct arch_syscall_def ppc64_syscall_table[] = { \
{ "rt_sigtimedwait", 176 },
{ "rt_tgsigqueueinfo", 322 },
{ "rtas", 255 },
{ "s390_pci_mmio_read", __PNR_s390_pci_mmio_read },
{ "s390_pci_mmio_write", __PNR_s390_pci_mmio_write },
{ "s390_runtime_instr", __PNR_s390_runtime_instr },
{ "sched_get_priority_max", 159 },
{ "sched_get_priority_min", 160 },
Expand Down Expand Up @@ -431,6 +434,7 @@ const struct arch_syscall_def ppc64_syscall_table[] = { \
{ "uselib", 86 },
{ "usr26", __PNR_usr26 },
{ "usr32", __PNR_usr32 },
{ "userfaultfd", 364 },
{ "ustat", 62 },
{ "utime", 30 },
{ "utimensat", 304 },
Expand Down

0 comments on commit d2ca11b

Please sign in to comment.