Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.0…
Browse files Browse the repository at this point in the history 
…-pull-request' into staging

Update syscall numbers to kernel 5.5 level

# gpg: Signature made Mon 17 Feb 2020 09:30:12 GMT
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/linux-user-for-5.0-pull-request:
  linux-user: xtensa: Remove unused constant TARGET_NR_syscall_count
  linux-user: xtensa: Update syscall numbers to kernel 5.5 level
  linux-user: x86_64: Update syscall numbers to kernel 5.5 level
  linux-user: sh4: Update syscall numbers to kernel 5.5 level
  linux-user: mips: Update syscall numbers to kernel 5.5 level
  linux-user: microblaze: Update syscall numbers to kernel 5.5 level
  linux-user: m68k: Update syscall numbers to kernel 5.5 level
  linux-user: arm: Update syscall numbers to kernel 5.5 level
  linux-user: alpha: Update syscall numbers to kernel 5.5 level

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
  • Loading branch information
@pm215
pm215 committed Feb 17, 2020
2 parents 9ced5c7 + 0a80aa5 commit 652c5bb
Show file tree
Hide file tree
Showing 10 changed files with 454 additions and 6 deletions.
35 changes: 35 additions & 0 deletions linux-user/alpha/syscall_nr.h
View file
Expand Up @@ -453,5 +453,40 @@
#define TARGET_NR_getrandom 511
#define TARGET_NR_memfd_create 512
#define TARGET_NR_execveat 513
#define TARGET_NR_seccomp 514
#define TARGET_NR_bpf 515
#define TARGET_NR_userfaultfd 516
#define TARGET_NR_membarrier 517
#define TARGET_NR_mlock2 518
#define TARGET_NR_copy_file_range 519
#define TARGET_NR_preadv2 520
#define TARGET_NR_pwritev2 521
#define TARGET_NR_statx 522
#define TARGET_NR_io_pgetevents 523
#define TARGET_NR_pkey_mprotect 524
#define TARGET_NR_pkey_alloc 525
#define TARGET_NR_pkey_free 526
#define TARGET_NR_rseq 527
#define TARGET_NR_statfs64 528
#define TARGET_NR_fstatfs64 529
#define TARGET_NR_getegid 530
#define TARGET_NR_geteuid 531
#define TARGET_NR_getppid 532
/*
* all other architectures have common numbers for new syscall, alpha
* is the exception.
*/
#define TARGET_NR_pidfd_send_signal 534
#define TARGET_NR_io_uring_setup 535
#define TARGET_NR_io_uring_enter 536
#define TARGET_NR_io_uring_register 537
#define TARGET_NR_open_tree 538
#define TARGET_NR_move_mount 539
#define TARGET_NR_fsopen 540
#define TARGET_NR_fsconfig 541
#define TARGET_NR_fsmount 542
#define TARGET_NR_fspick 543
#define TARGET_NR_pidfd_open 544
/* 545 reserved for clone3 */

#endif
44 changes: 44 additions & 0 deletions linux-user/arm/syscall_nr.h
View file
Expand Up @@ -399,5 +399,49 @@
#define TARGET_NR_userfaultfd (388)
#define TARGET_NR_membarrier (389)
#define TARGET_NR_mlock2 (390)
#define TARGET_NR_copy_file_range (391)
#define TARGET_NR_preadv2 (392)
#define TARGET_NR_pwritev2 (393)
#define TARGET_NR_pkey_mprotect (394)
#define TARGET_NR_pkey_alloc (395)
#define TARGET_NR_pkey_free (396)
#define TARGET_NR_statx (397)
#define TARGET_NR_rseq (398)
#define TARGET_NR_io_pgetevents (399)
#define TARGET_NR_migrate_pages (400)
#define TARGET_NR_kexec_file_load (401)
/* 402 is unused */
#define TARGET_NR_clock_gettime64 (403)
#define TARGET_NR_clock_settime64 (404)
#define TARGET_NR_clock_adjtime64 (405)
#define TARGET_NR_clock_getres_time64 (406)
#define TARGET_NR_clock_nanosleep_time64 (407)
#define TARGET_NR_timer_gettime64 (408)
#define TARGET_NR_timer_settime64 (409)
#define TARGET_NR_timerfd_gettime64 (410)
#define TARGET_NR_timerfd_settime64 (411)
#define TARGET_NR_utimensat_time64 (412)
#define TARGET_NR_pselect6_time64 (413)
#define TARGET_NR_ppoll_time64 (414)
#define TARGET_NR_io_pgetevents_time64 (416)
#define TARGET_NR_recvmmsg_time64 (417)
#define TARGET_NR_mq_timedsend_time64 (418)
#define TARGET_NR_mq_timedreceive_time64 (419)
#define TARGET_NR_semtimedop_time64 (420)
#define TARGET_NR_rt_sigtimedwait_time64 (421)
#define TARGET_NR_futex_time64 (422)
#define TARGET_NR_sched_rr_get_interval_time64 (423)
#define TARGET_NR_pidfd_send_signal (424)
#define TARGET_NR_io_uring_setup (425)
#define TARGET_NR_io_uring_enter (426)
#define TARGET_NR_io_uring_register (427)
#define TARGET_NR_open_tree (428)
#define TARGET_NR_move_mount (429)
#define TARGET_NR_fsopen (430)
#define TARGET_NR_fsconfig (431)
#define TARGET_NR_fsmount (432)
#define TARGET_NR_fspick (433)
#define TARGET_NR_pidfd_open (434)
#define TARGET_NR_clone3 (435)

#endif
50 changes: 49 additions & 1 deletion linux-user/m68k/syscall_nr.h
View file
Expand Up @@ -382,5 +382,53 @@
#define TARGET_NR_copy_file_range 376
#define TARGET_NR_preadv2 377
#define TARGET_NR_pwritev2 378

#define TARGET_NR_statx 379
#define TARGET_NR_seccomp 380
#define TARGET_NR_pkey_mprotect 381
#define TARGET_NR_pkey_alloc 382
#define TARGET_NR_pkey_free 383
#define TARGET_NR_rseq 384
/* room for arch specific calls */
#define TARGET_NR_semget 393
#define TARGET_NR_semctl 394
#define TARGET_NR_shmget 395
#define TARGET_NR_shmctl 396
#define TARGET_NR_shmat 397
#define TARGET_NR_shmdt 398
#define TARGET_NR_msgget 399
#define TARGET_NR_msgsnd 400
#define TARGET_NR_msgrcv 401
#define TARGET_NR_msgctl 402
#define TARGET_NR_clock_gettime64 403
#define TARGET_NR_clock_settime64 404
#define TARGET_NR_clock_adjtime64 405
#define TARGET_NR_clock_getres_time64 406
#define TARGET_NR_clock_nanosleep_time64 407
#define TARGET_NR_timer_gettime64 408
#define TARGET_NR_timer_settime64 409
#define TARGET_NR_timerfd_gettime64 410
#define TARGET_NR_timerfd_settime64 411
#define TARGET_NR_utimensat_time64 412
#define TARGET_NR_pselect6_time64 413
#define TARGET_NR_ppoll_time64 414
#define TARGET_NR_io_pgetevents_time64 416
#define TARGET_NR_recvmmsg_time64 417
#define TARGET_NR_mq_timedsend_time64 418
#define TARGET_NR_mq_timedreceive_time64 419
#define TARGET_NR_semtimedop_time64 420
#define TARGET_NR_rt_sigtimedwait_time64 421
#define TARGET_NR_futex_time64 422
#define TARGET_NR_sched_rr_get_interval_time64 423
#define TARGET_NR_pidfd_send_signal 424
#define TARGET_NR_io_uring_setup 425
#define TARGET_NR_io_uring_enter 426
#define TARGET_NR_io_uring_register 427
#define TARGET_NR_open_tree 428
#define TARGET_NR_move_mount 429
#define TARGET_NR_fsopen 430
#define TARGET_NR_fsconfig 431
#define TARGET_NR_fsmount 432
#define TARGET_NR_fspick 433
#define TARGET_NR_pidfd_open 434
/* 435 reserved for clone3 */
#endif
45 changes: 45 additions & 0 deletions linux-user/microblaze/syscall_nr.h
View file
Expand Up @@ -393,5 +393,50 @@
#define TARGET_NR_memfd_create 386
#define TARGET_NR_bpf 387
#define TARGET_NR_execveat 388
#define TARGET_NR_userfaultfd 389
#define TARGET_NR_membarrier 390
#define TARGET_NR_mlock2 391
#define TARGET_NR_copy_file_range 392
#define TARGET_NR_preadv2 393
#define TARGET_NR_pwritev2 394
#define TARGET_NR_pkey_mprotect 395
#define TARGET_NR_pkey_alloc 396
#define TARGET_NR_pkey_free 397
#define TARGET_NR_statx 398
#define TARGET_NR_io_pgetevents 399
#define TARGET_NR_rseq 400
/* 401 and 402 are unused */
#define TARGET_NR_clock_gettime64 403
#define TARGET_NR_clock_settime64 404
#define TARGET_NR_clock_adjtime64 405
#define TARGET_NR_clock_getres_time64 406
#define TARGET_NR_clock_nanosleep_time64 407
#define TARGET_NR_timer_gettime64 408
#define TARGET_NR_timer_settime64 409
#define TARGET_NR_timerfd_gettime64 410
#define TARGET_NR_timerfd_settime64 411
#define TARGET_NR_utimensat_time64 412
#define TARGET_NR_pselect6_time64 413
#define TARGET_NR_ppoll_time64 414
#define TARGET_NR_io_pgetevents_time64 416
#define TARGET_NR_recvmmsg_time64 417
#define TARGET_NR_mq_timedsend_time64 418
#define TARGET_NR_mq_timedreceive_time64 419
#define TARGET_NR_semtimedop_time64 420
#define TARGET_NR_rt_sigtimedwait_time64 421
#define TARGET_NR_futex_time64 422
#define TARGET_NR_sched_rr_get_interval_time64 423
#define TARGET_NR_pidfd_send_signal 424
#define TARGET_NR_io_uring_setup 425
#define TARGET_NR_io_uring_enter 426
#define TARGET_NR_io_uring_register 427
#define TARGET_NR_open_tree 428
#define TARGET_NR_move_mount 429
#define TARGET_NR_fsopen 430
#define TARGET_NR_fsconfig 431
#define TARGET_NR_fsmount 432
#define TARGET_NR_fspick 433
#define TARGET_NR_pidfd_open 434
#define TARGET_NR_clone3 435

#endif
83 changes: 82 additions & 1 deletion linux-user/mips/cpu_loop.c
View file
Expand Up @@ -25,8 +25,9 @@
#include "internal.h"

# ifdef TARGET_ABI_MIPSO32
# define MIPS_SYSCALL_NUMBER_UNUSED -1
# define MIPS_SYS(name, args) args,
static const uint8_t mips_syscall_args[] = {
static const int8_t mips_syscall_args[] = {
MIPS_SYS(sys_syscall , 8) /* 4000 */
MIPS_SYS(sys_exit , 1)
MIPS_SYS(sys_fork , 0)
Expand Down Expand Up @@ -390,6 +391,80 @@ static const uint8_t mips_syscall_args[] = {
MIPS_SYS(sys_copy_file_range, 6) /* 360 */
MIPS_SYS(sys_preadv2, 6)
MIPS_SYS(sys_pwritev2, 6)
MIPS_SYS(sys_pkey_mprotect, 4)
MIPS_SYS(sys_pkey_alloc, 2)
MIPS_SYS(sys_pkey_free, 1) /* 365 */
MIPS_SYS(sys_statx, 5)
MIPS_SYS(sys_rseq, 4)
MIPS_SYS(sys_io_pgetevents, 6)
MIPS_SYSCALL_NUMBER_UNUSED,
MIPS_SYSCALL_NUMBER_UNUSED, /* 370 */
MIPS_SYSCALL_NUMBER_UNUSED,
MIPS_SYSCALL_NUMBER_UNUSED,
MIPS_SYSCALL_NUMBER_UNUSED,
MIPS_SYSCALL_NUMBER_UNUSED,
MIPS_SYSCALL_NUMBER_UNUSED, /* 375 */
MIPS_SYSCALL_NUMBER_UNUSED,
MIPS_SYSCALL_NUMBER_UNUSED,
MIPS_SYSCALL_NUMBER_UNUSED,
MIPS_SYSCALL_NUMBER_UNUSED,
MIPS_SYSCALL_NUMBER_UNUSED, /* 380 */
MIPS_SYSCALL_NUMBER_UNUSED,
MIPS_SYSCALL_NUMBER_UNUSED,
MIPS_SYSCALL_NUMBER_UNUSED,
MIPS_SYSCALL_NUMBER_UNUSED,
MIPS_SYSCALL_NUMBER_UNUSED, /* 385 */
MIPS_SYSCALL_NUMBER_UNUSED,
MIPS_SYSCALL_NUMBER_UNUSED,
MIPS_SYSCALL_NUMBER_UNUSED,
MIPS_SYSCALL_NUMBER_UNUSED,
MIPS_SYSCALL_NUMBER_UNUSED, /* 390 */
MIPS_SYSCALL_NUMBER_UNUSED,
MIPS_SYSCALL_NUMBER_UNUSED,
MIPS_SYS(sys_semget, 3)
MIPS_SYS(sys_semctl, 4)
MIPS_SYS(sys_shmget, 3) /* 395 */
MIPS_SYS(sys_shmctl, 3)
MIPS_SYS(sys_shmat, 3)
MIPS_SYS(sys_shmdt, 1)
MIPS_SYS(sys_msgget, 2)
MIPS_SYS(sys_msgsnd, 4) /* 400 */
MIPS_SYS(sys_msgrcv, 5)
MIPS_SYS(sys_msgctl, 3)
MIPS_SYS(sys_clock_gettime64, 2)
MIPS_SYS(sys_clock_settime64, 2)
MIPS_SYS(sys_clock_adjtime64, 2) /* 405 */
MIPS_SYS(sys_clock_getres_time64, 2)
MIPS_SYS(sys_clock_nanosleep_time64, 4)
MIPS_SYS(sys_timer_gettime64, 2)
MIPS_SYS(sys_timer_settime64, 4)
MIPS_SYS(sys_timerfd_gettime64, 2) /* 410 */
MIPS_SYS(sys_timerfd_settime64, 4)
MIPS_SYS(sys_utimensat_time64, 4)
MIPS_SYS(sys_pselect6_time64, 6)
MIPS_SYS(sys_ppoll_time64, 5)
MIPS_SYSCALL_NUMBER_UNUSED, /* 415 */
MIPS_SYS(sys_io_pgetevents_time64, 6)
MIPS_SYS(sys_recvmmsg_time64, 5)
MIPS_SYS(sys_mq_timedsend_time64, 5)
MIPS_SYS(sys_mq_timedreceive_time64, 5)
MIPS_SYS(sys_semtimedop_time64, 4) /* 420 */
MIPS_SYS(sys_rt_sigtimedwait_time64, 4)
MIPS_SYS(sys_futex_time64, 6)
MIPS_SYS(sys_sched_rr_get_interval_time64, 2)
MIPS_SYS(sys_pidfd_send_signal, 4)
MIPS_SYS(sys_io_uring_setup, 2) /* 425 */
MIPS_SYS(sys_io_uring_enter, 6)
MIPS_SYS(sys_io_uring_register, 4)
MIPS_SYS(sys_open_tree, 3)
MIPS_SYS(sys_move_mount, 5)
MIPS_SYS(sys_fsopen, 2) /* 430 */
MIPS_SYS(sys_fsconfig, 5)
MIPS_SYS(sys_fsmount, 3)
MIPS_SYS(sys_fspick, 3)
MIPS_SYS(sys_pidfd_open, 2)
MIPS_SYS(sys_clone3, 2) /* 435 */

};
# undef MIPS_SYS
# endif /* O32 */
Expand Down Expand Up @@ -447,8 +522,14 @@ void cpu_loop(CPUMIPSState *env)
# ifdef TARGET_ABI_MIPSO32
syscall_num = env->active_tc.gpr[2] - 4000;
if (syscall_num >= sizeof(mips_syscall_args)) {
/* syscall_num is larger that any defined for MIPS O32 */
ret = -TARGET_ENOSYS;
} else if (mips_syscall_args[syscall_num] ==
MIPS_SYSCALL_NUMBER_UNUSED) {
/* syscall_num belongs to the range not defined for MIPS O32 */
ret = -TARGET_ENOSYS;
} else {
/* syscall_num is valid */
int nb_args;
abi_ulong sp_reg;
abi_ulong arg5 = 0, arg6 = 0, arg7 = 0, arg8 = 0;
Expand Down
45 changes: 45 additions & 0 deletions linux-user/mips/syscall_nr.h
View file
Expand Up @@ -376,5 +376,50 @@
#define TARGET_NR_statx (TARGET_NR_Linux + 366)
#define TARGET_NR_rseq (TARGET_NR_Linux + 367)
#define TARGET_NR_io_pgetevents (TARGET_NR_Linux + 368)
/* room for arch specific calls */
#define TARGET_NR_semget (TARGET_NR_Linux + 393)
#define TARGET_NR_semctl (TARGET_NR_Linux + 394)
#define TARGET_NR_shmget (TARGET_NR_Linux + 395)
#define TARGET_NR_shmctl (TARGET_NR_Linux + 396)
#define TARGET_NR_shmat (TARGET_NR_Linux + 397)
#define TARGET_NR_shmdt (TARGET_NR_Linux + 398)
#define TARGET_NR_msgget (TARGET_NR_Linux + 399)
#define TARGET_NR_msgsnd (TARGET_NR_Linux + 400)
#define TARGET_NR_msgrcv (TARGET_NR_Linux + 401)
#define TARGET_NR_msgctl (TARGET_NR_Linux + 402)
/* 403-423 common for 32-bit archs */
#define TARGET_NR_clock_gettime64 (TARGET_NR_Linux + 403)
#define TARGET_NR_clock_settime64 (TARGET_NR_Linux + 404)
#define TARGET_NR_clock_adjtime64 (TARGET_NR_Linux + 405)
#define TARGET_NR_clock_getres_time64 (TARGET_NR_Linux + 406)
#define TARGET_NR_clock_nanosleep_time64 (TARGET_NR_Linux + 407)
#define TARGET_NR_timer_gettime64 (TARGET_NR_Linux + 408)
#define TARGET_NR_timer_settime64 (TARGET_NR_Linux + 409)
#define TARGET_NR_timerfd_gettime64 (TARGET_NR_Linux + 410)
#define TARGET_NR_timerfd_settime64 (TARGET_NR_Linux + 411)
#define TARGET_NR_utimensat_time64 (TARGET_NR_Linux + 412)
#define TARGET_NR_pselect6_time64 (TARGET_NR_Linux + 413)
#define TARGET_NR_ppoll_time64 (TARGET_NR_Linux + 414)
#define TARGET_NR_io_pgetevents_time64 (TARGET_NR_Linux + 416)
#define TARGET_NR_recvmmsg_time64 (TARGET_NR_Linux + 417)
#define TARGET_NR_mq_timedsend_time64 (TARGET_NR_Linux + 418)
#define TARGET_NR_mq_timedreceive_time64 (TARGET_NR_Linux + 419)
#define TARGET_NR_semtimedop_time64 (TARGET_NR_Linux + 420)
#define TARGET_NR_rt_sigtimedwait_time64 (TARGET_NR_Linux + 421)
#define TARGET_NR_futex_time64 (TARGET_NR_Linux + 422)
#define TARGET_NR_sched_rr_get_interval_time64 (TARGET_NR_Linux + 423)
/* 424 onwards common for all archs */
#define TARGET_NR_pidfd_send_signal (TARGET_NR_Linux + 424)
#define TARGET_NR_io_uring_setup (TARGET_NR_Linux + 425)
#define TARGET_NR_io_uring_enter (TARGET_NR_Linux + 426)
#define TARGET_NR_io_uring_register (TARGET_NR_Linux + 427)
#define TARGET_NR_open_tree (TARGET_NR_Linux + 428)
#define TARGET_NR_move_mount (TARGET_NR_Linux + 429)
#define TARGET_NR_fsopen (TARGET_NR_Linux + 430)
#define TARGET_NR_fsconfig (TARGET_NR_Linux + 431)
#define TARGET_NR_fsmount (TARGET_NR_Linux + 432)
#define TARGET_NR_fspick (TARGET_NR_Linux + 433)
#define TARGET_NR_pidfd_open (TARGET_NR_Linux + 434)
#define TARGET_NR_clone3 (TARGET_NR_Linux + 435)

#endif

0 comments on commit 652c5bb

Please sign in to comment.