syscall_defines: add new/updated syscalls

io_uring is needed so update the syscall defines to match 5.6-rc5.

There was a slight refactor in arm upstream which changed some syscall
names to better reflect their 32 vs 64 bit variants. See kernel commit:
00bf25d6: y2038: use time32 syscall names on 32-bit

TEST=samus,  kukui, and kevin64 build.

Change-Id: Idcceb4bba313a3f826556e90ffde94f166de0a05
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2124007
Tested-by: kokoro <noreply+kokoro@google.com>
Tested-by: Dylan Reid <dgreid@chromium.org>
Commit-Queue: Dylan Reid <dgreid@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Abhishek Bhardwaj <abhishekbh@chromium.org>

3 files changed, 210 insertions, 87 deletions

diff --git a/syscall_defines/src/linux-arm/mod.rs b/syscall_defines/src/linux-arm/mod.rs
index fbaf4a2..1047f7a 100644
--- a/syscall_defines/src/linux-arm/mod.rs
+++ b/syscall_defines/src/linux-arm/mod.rs
@@ -18,21 +18,21 @@ pub enum LinuxSyscall {
     SYS_unlink = 10,
     SYS_execve = 11,
     SYS_chdir = 12,
-    SYS_time = 13,
+    SYS_time32 = 13,
     SYS_mknod = 14,
     SYS_chmod = 15,
-    SYS_lchown = 16,
+    SYS_lchown16 = 16,
     SYS_lseek = 19,
     SYS_getpid = 20,
     SYS_mount = 21,
-    SYS_umount = 22,
-    SYS_setuid = 23,
-    SYS_getuid = 24,
-    SYS_stime = 25,
+    SYS_oldumount = 22,
+    SYS_setuid16 = 23,
+    SYS_getuid16 = 24,
+    SYS_stime32 = 25,
     SYS_ptrace = 26,
     SYS_alarm = 27,
     SYS_pause = 29,
-    SYS_utime = 30,
+    SYS_utime32 = 30,
     SYS_access = 33,
     SYS_nice = 34,
     SYS_sync = 36,
@@ -44,12 +44,12 @@ pub enum LinuxSyscall {
     SYS_pipe = 42,
     SYS_times = 43,
     SYS_brk = 45,
-    SYS_setgid = 46,
-    SYS_getgid = 47,
-    SYS_geteuid = 49,
-    SYS_getegid = 50,
+    SYS_setgid16 = 46,
+    SYS_getgid16 = 47,
+    SYS_geteuid16 = 49,
+    SYS_getegid16 = 50,
     SYS_acct = 51,
-    SYS_umount2 = 52,
+    SYS_umount = 52,
     SYS_ioctl = 54,
     SYS_fcntl = 55,
     SYS_setpgid = 57,
@@ -61,31 +61,31 @@ pub enum LinuxSyscall {
     SYS_getpgrp = 65,
     SYS_setsid = 66,
     SYS_sigaction = 67,
-    SYS_setreuid = 70,
-    SYS_setregid = 71,
+    SYS_setreuid16 = 70,
+    SYS_setregid16 = 71,
     SYS_sigsuspend = 72,
     SYS_sigpending = 73,
     SYS_sethostname = 74,
     SYS_setrlimit = 75,
-    SYS_getrlimit = 76,
+    SYS_old_getrlimit = 76,
     SYS_getrusage = 77,
     SYS_gettimeofday = 78,
     SYS_settimeofday = 79,
-    SYS_getgroups = 80,
-    SYS_setgroups = 81,
-    SYS_select = 82,
+    SYS_getgroups16 = 80,
+    SYS_setgroups16 = 81,
+    SYS_old_select = 82,
     SYS_symlink = 83,
     SYS_readlink = 85,
     SYS_uselib = 86,
     SYS_swapon = 87,
     SYS_reboot = 88,
-    SYS_readdir = 89,
-    SYS_mmap = 90,
+    SYS_old_readdir = 89,
+    SYS_old_mmap = 90,
     SYS_munmap = 91,
     SYS_truncate = 92,
     SYS_ftruncate = 93,
     SYS_fchmod = 94,
-    SYS_fchown = 95,
+    SYS_fchown16 = 95,
     SYS_getpriority = 96,
     SYS_setpriority = 97,
     SYS_statfs = 99,
@@ -94,9 +94,9 @@ pub enum LinuxSyscall {
     SYS_syslog = 103,
     SYS_setitimer = 104,
     SYS_getitimer = 105,
-    SYS_stat = 106,
-    SYS_lstat = 107,
-    SYS_fstat = 108,
+    SYS_newstat = 106,
+    SYS_newlstat = 107,
+    SYS_newfstat = 108,
     SYS_vhangup = 111,
     SYS_syscall = 113,
     SYS_wait4 = 114,
@@ -104,11 +104,11 @@ pub enum LinuxSyscall {
     SYS_sysinfo = 116,
     SYS_ipc = 117,
     SYS_fsync = 118,
-    SYS_sigreturn = 119,
+    SYS_sigreturn_wrapper = 119,
     SYS_clone = 120,
     SYS_setdomainname = 121,
-    SYS_uname = 122,
-    SYS_adjtimex = 124,
+    SYS_newuname = 122,
+    SYS_adjtimex_time32 = 124,
     SYS_mprotect = 125,
     SYS_sigprocmask = 126,
     SYS_init_module = 128,
@@ -119,18 +119,18 @@ pub enum LinuxSyscall {
     SYS_bdflush = 134,
     SYS_sysfs = 135,
     SYS_personality = 136,
-    SYS_setfsuid = 138,
-    SYS_setfsgid = 139,
-    SYS__llseek = 140,
+    SYS_setfsuid16 = 138,
+    SYS_setfsgid16 = 139,
+    SYS_llseek = 140,
     SYS_getdents = 141,
-    SYS__newselect = 142,
+    SYS_select = 142,
     SYS_flock = 143,
     SYS_msync = 144,
     SYS_readv = 145,
     SYS_writev = 146,
     SYS_getsid = 147,
     SYS_fdatasync = 148,
-    SYS__sysctl = 149,
+    SYS_sysctl = 149,
     SYS_mlock = 150,
     SYS_munlock = 151,
     SYS_mlockall = 152,
@@ -142,58 +142,58 @@ pub enum LinuxSyscall {
     SYS_sched_yield = 158,
     SYS_sched_get_priority_max = 159,
     SYS_sched_get_priority_min = 160,
-    SYS_sched_rr_get_interval = 161,
-    SYS_nanosleep = 162,
+    SYS_sched_rr_get_interval_time32 = 161,
+    SYS_nanosleep_time32 = 162,
     SYS_mremap = 163,
-    SYS_setresuid = 164,
-    SYS_getresuid = 165,
+    SYS_setresuid16 = 164,
+    SYS_getresuid16 = 165,
     SYS_poll = 168,
     SYS_nfsservctl = 169,
-    SYS_setresgid = 170,
-    SYS_getresgid = 171,
+    SYS_setresgid16 = 170,
+    SYS_getresgid16 = 171,
     SYS_prctl = 172,
-    SYS_rt_sigreturn = 173,
+    SYS_rt_sigreturn_wrapper = 173,
     SYS_rt_sigaction = 174,
     SYS_rt_sigprocmask = 175,
     SYS_rt_sigpending = 176,
-    SYS_rt_sigtimedwait = 177,
+    SYS_rt_sigtimedwait_time32 = 177,
     SYS_rt_sigqueueinfo = 178,
     SYS_rt_sigsuspend = 179,
     SYS_pread64 = 180,
     SYS_pwrite64 = 181,
-    SYS_chown = 182,
+    SYS_chown16 = 182,
     SYS_getcwd = 183,
     SYS_capget = 184,
     SYS_capset = 185,
     SYS_sigaltstack = 186,
     SYS_sendfile = 187,
     SYS_vfork = 190,
-    SYS_ugetrlimit = 191,
+    SYS_getrlimit = 191,
     SYS_mmap2 = 192,
     SYS_truncate64 = 193,
     SYS_ftruncate64 = 194,
     SYS_stat64 = 195,
     SYS_lstat64 = 196,
     SYS_fstat64 = 197,
-    SYS_lchown32 = 198,
-    SYS_getuid32 = 199,
-    SYS_getgid32 = 200,
-    SYS_geteuid32 = 201,
-    SYS_getegid32 = 202,
-    SYS_setreuid32 = 203,
-    SYS_setregid32 = 204,
-    SYS_getgroups32 = 205,
-    SYS_setgroups32 = 206,
-    SYS_fchown32 = 207,
-    SYS_setresuid32 = 208,
-    SYS_getresuid32 = 209,
-    SYS_setresgid32 = 210,
-    SYS_getresgid32 = 211,
-    SYS_chown32 = 212,
-    SYS_setuid32 = 213,
-    SYS_setgid32 = 214,
-    SYS_setfsuid32 = 215,
-    SYS_setfsgid32 = 216,
+    SYS_lchown = 198,
+    SYS_getuid = 199,
+    SYS_getgid = 200,
+    SYS_geteuid = 201,
+    SYS_getegid = 202,
+    SYS_setreuid = 203,
+    SYS_setregid = 204,
+    SYS_getgroups = 205,
+    SYS_setgroups = 206,
+    SYS_fchown = 207,
+    SYS_setresuid = 208,
+    SYS_getresuid = 209,
+    SYS_setresgid = 210,
+    SYS_getresgid = 211,
+    SYS_chown = 212,
+    SYS_setuid = 213,
+    SYS_setgid = 214,
+    SYS_setfsuid = 215,
+    SYS_setfsgid = 216,
     SYS_getdents64 = 217,
     SYS_pivot_root = 218,
     SYS_mincore = 219,
@@ -215,12 +215,12 @@ pub enum LinuxSyscall {
     SYS_fremovexattr = 237,
     SYS_tkill = 238,
     SYS_sendfile64 = 239,
-    SYS_futex = 240,
+    SYS_futex_time32 = 240,
     SYS_sched_setaffinity = 241,
     SYS_sched_getaffinity = 242,
     SYS_io_setup = 243,
     SYS_io_destroy = 244,
-    SYS_io_getevents = 245,
+    SYS_io_getevents_time32 = 245,
     SYS_io_submit = 246,
     SYS_io_cancel = 247,
     SYS_exit_group = 248,
@@ -231,26 +231,26 @@ pub enum LinuxSyscall {
     SYS_remap_file_pages = 253,
     SYS_set_tid_address = 256,
     SYS_timer_create = 257,
-    SYS_timer_settime = 258,
-    SYS_timer_gettime = 259,
+    SYS_timer_settime32 = 258,
+    SYS_timer_gettime32 = 259,
     SYS_timer_getoverrun = 260,
     SYS_timer_delete = 261,
-    SYS_clock_settime = 262,
-    SYS_clock_gettime = 263,
-    SYS_clock_getres = 264,
-    SYS_clock_nanosleep = 265,
-    SYS_statfs64 = 266,
-    SYS_fstatfs64 = 267,
+    SYS_clock_settime32 = 262,
+    SYS_clock_gettime32 = 263,
+    SYS_clock_getres_time32 = 264,
+    SYS_clock_nanosleep_time32 = 265,
+    SYS_statfs64_wrapper = 266,
+    SYS_fstatfs64_wrapper = 267,
     SYS_tgkill = 268,
-    SYS_utimes = 269,
+    SYS_utimes_time32 = 269,
     SYS_arm_fadvise64_64 = 270,
     SYS_pciconfig_iobase = 271,
     SYS_pciconfig_read = 272,
     SYS_pciconfig_write = 273,
     SYS_mq_open = 274,
     SYS_mq_unlink = 275,
-    SYS_mq_timedsend = 276,
-    SYS_mq_timedreceive = 277,
+    SYS_mq_timedsend_time32 = 276,
+    SYS_mq_timedreceive_time32 = 277,
     SYS_mq_notify = 278,
     SYS_mq_getsetattr = 279,
     SYS_waitid = 280,
@@ -273,19 +273,19 @@ pub enum LinuxSyscall {
     SYS_recvmsg = 297,
     SYS_semop = 298,
     SYS_semget = 299,
-    SYS_semctl = 300,
+    SYS_old_semctl = 300,
     SYS_msgsnd = 301,
     SYS_msgrcv = 302,
     SYS_msgget = 303,
-    SYS_msgctl = 304,
+    SYS_old_msgctl = 304,
     SYS_shmat = 305,
     SYS_shmdt = 306,
     SYS_shmget = 307,
-    SYS_shmctl = 308,
+    SYS_old_shmctl = 308,
     SYS_add_key = 309,
     SYS_request_key = 310,
     SYS_keyctl = 311,
-    SYS_semtimedop = 312,
+    SYS_semtimedop_time32 = 312,
     SYS_vserver = 313,
     SYS_ioprio_set = 314,
     SYS_ioprio_get = 315,
@@ -299,7 +299,7 @@ pub enum LinuxSyscall {
     SYS_mkdirat = 323,
     SYS_mknodat = 324,
     SYS_fchownat = 325,
-    SYS_futimesat = 326,
+    SYS_futimesat_time32 = 326,
     SYS_fstatat64 = 327,
     SYS_unlinkat = 328,
     SYS_renameat = 329,
@@ -308,26 +308,26 @@ pub enum LinuxSyscall {
     SYS_readlinkat = 332,
     SYS_fchmodat = 333,
     SYS_faccessat = 334,
-    SYS_pselect6 = 335,
-    SYS_ppoll = 336,
+    SYS_pselect6_time32 = 335,
+    SYS_ppoll_time32 = 336,
     SYS_unshare = 337,
     SYS_set_robust_list = 338,
     SYS_get_robust_list = 339,
     SYS_splice = 340,
-    SYS_arm_sync_file_range = 341,
+    SYS_sync_file_range2 = 341,
     SYS_tee = 342,
     SYS_vmsplice = 343,
     SYS_move_pages = 344,
     SYS_getcpu = 345,
     SYS_epoll_pwait = 346,
     SYS_kexec_load = 347,
-    SYS_utimensat = 348,
+    SYS_utimensat_time32 = 348,
     SYS_signalfd = 349,
     SYS_timerfd_create = 350,
     SYS_eventfd = 351,
     SYS_fallocate = 352,
-    SYS_timerfd_settime = 353,
-    SYS_timerfd_gettime = 354,
+    SYS_timerfd_settime32 = 353,
+    SYS_timerfd_gettime32 = 354,
     SYS_signalfd4 = 355,
     SYS_eventfd2 = 356,
     SYS_epoll_create1 = 357,
@@ -338,14 +338,14 @@ pub enum LinuxSyscall {
     SYS_pwritev = 362,
     SYS_rt_tgsigqueueinfo = 363,
     SYS_perf_event_open = 364,
-    SYS_recvmmsg = 365,
+    SYS_recvmmsg_time32 = 365,
     SYS_accept4 = 366,
     SYS_fanotify_init = 367,
     SYS_fanotify_mark = 368,
     SYS_prlimit64 = 369,
     SYS_name_to_handle_at = 370,
     SYS_open_by_handle_at = 371,
-    SYS_clock_adjtime = 372,
+    SYS_clock_adjtime32 = 372,
     SYS_syncfs = 373,
     SYS_sendmmsg = 374,
     SYS_setns = 375,
@@ -361,4 +361,50 @@ pub enum LinuxSyscall {
     SYS_memfd_create = 385,
     SYS_bpf = 386,
     SYS_execveat = 387,
+    SYS_userfaultfd = 388,
+    SYS_membarrier = 389,
+    SYS_mlock2 = 390,
+    SYS_copy_file_range = 391,
+    SYS_preadv2 = 392,
+    SYS_pwritev2 = 393,
+    SYS_pkey_mprotect = 394,
+    SYS_pkey_alloc = 395,
+    SYS_pkey_free = 396,
+    SYS_statx = 397,
+    SYS_rseq = 398,
+    SYS_io_pgetevents_time32 = 399,
+    SYS_migrate_pages = 400,
+    SYS_kexec_file_load = 401,
+    SYS_clock_gettime = 403,
+    SYS_clock_settime = 404,
+    SYS_clock_adjtime = 405,
+    SYS_clock_getres = 406,
+    SYS_clock_nanosleep = 407,
+    SYS_timer_gettime = 408,
+    SYS_timer_settime = 409,
+    SYS_timerfd_gettime = 410,
+    SYS_timerfd_settime = 411,
+    SYS_utimensat = 412,
+    SYS_pselect6 = 413,
+    SYS_ppoll = 414,
+    SYS_io_pgetevents = 416,
+    SYS_recvmmsg = 417,
+    SYS_mq_timedsend = 418,
+    SYS_mq_timedreceive = 419,
+    SYS_semtimedop = 420,
+    SYS_rt_sigtimedwait = 421,
+    SYS_futex = 422,
+    SYS_sched_rr_get_interval = 423,
+    SYS_pidfd_send_signal = 424,
+    SYS_io_uring_setup = 425,
+    SYS_io_uring_enter = 426,
+    SYS_io_uring_register = 427,
+    SYS_open_tree = 428,
+    SYS_move_mount = 429,
+    SYS_fsopen = 430,
+    SYS_fsconfig = 431,
+    SYS_fsmount = 432,
+    SYS_fspick = 433,
+    SYS_pidfd_open = 434,
+    SYS_clone3 = 435,
 }
diff --git a/syscall_defines/src/linux-x86/mod.rs b/syscall_defines/src/linux-x86/mod.rs
index c6a3302..161861e 100644
--- a/syscall_defines/src/linux-x86/mod.rs
+++ b/syscall_defines/src/linux-x86/mod.rs
@@ -381,4 +381,58 @@ pub enum LinuxSyscall {
     SYS_userfaultfd = 374,
     SYS_membarrier = 375,
     SYS_mlock2 = 376,
+    SYS_copy_file_range = 377,
+    SYS_preadv2 = 378,
+    SYS_pwritev2 = 379,
+    SYS_pkey_mprotect = 380,
+    SYS_pkey_alloc = 381,
+    SYS_pkey_free = 382,
+    SYS_statx = 383,
+    SYS_arch_prctl = 384,
+    SYS_io_pgetevents_time32 = 385,
+    SYS_rseq = 386,
+    SYS_semget = 393,
+    SYS_semctl = 394,
+    SYS_shmget = 395,
+    SYS_shmctl = 396,
+    SYS_shmat = 397,
+    SYS_shmdt = 398,
+    SYS_msgget = 399,
+    SYS_msgsnd = 400,
+    SYS_msgrcv = 401,
+    SYS_msgctl = 402,
+    SYS_clock_gettime = 403,
+    SYS_clock_settime = 404,
+    SYS_clock_adjtime = 405,
+    SYS_clock_getres = 406,
+    SYS_clock_nanosleep = 407,
+    SYS_timer_gettime = 408,
+    SYS_timer_settime = 409,
+    SYS_timerfd_gettime = 410,
+    SYS_timerfd_settime = 411,
+    SYS_utimensat = 412,
+    SYS_pselect6 = 413,
+    SYS_ppoll = 414,
+    SYS_io_pgetevents = 416,
+    SYS_recvmmsg = 417,
+    SYS_mq_timedsend = 418,
+    SYS_mq_timedreceive = 419,
+    SYS_semtimedop = 420,
+    SYS_rt_sigtimedwait = 421,
+    SYS_futex = 422,
+    SYS_sched_rr_get_interval = 423,
+    SYS_pidfd_send_signal = 424,
+    SYS_io_uring_setup = 425,
+    SYS_io_uring_enter = 426,
+    SYS_io_uring_register = 427,
+    SYS_open_tree = 428,
+    SYS_move_mount = 429,
+    SYS_fsopen = 430,
+    SYS_fsconfig = 431,
+    SYS_fsmount = 432,
+    SYS_fspick = 433,
+    SYS_pidfd_open = 434,
+    SYS_clone3 = 435,
+    SYS_openat2 = 437,
+    SYS_pidfd_getfd = 438,
 }
diff --git a/syscall_defines/src/linux-x86_64/mod.rs b/syscall_defines/src/linux-x86_64/mod.rs
index f58961a..e7ac194 100644
--- a/syscall_defines/src/linux-x86_64/mod.rs
+++ b/syscall_defines/src/linux-x86_64/mod.rs
@@ -333,6 +333,29 @@ pub enum LinuxSyscall {
     SYS_userfaultfd = 323,
     SYS_membarrier = 324,
     SYS_mlock2 = 325,
+    SYS_copy_file_range = 326,
+    SYS_preadv2 = 327,
+    SYS_pwritev2 = 328,
+    SYS_pkey_mprotect = 329,
+    SYS_pkey_alloc = 330,
+    SYS_pkey_free = 331,
+    SYS_statx = 332,
+    SYS_io_pgetevents = 333,
+    SYS_rseq = 334,
+    SYS_pidfd_send_signal = 424,
+    SYS_io_uring_setup = 425,
+    SYS_io_uring_enter = 426,
+    SYS_io_uring_register = 427,
+    SYS_open_tree = 428,
+    SYS_move_mount = 429,
+    SYS_fsopen = 430,
+    SYS_fsconfig = 431,
+    SYS_fsmount = 432,
+    SYS_fspick = 433,
+    SYS_pidfd_open = 434,
+    SYS_clone3 = 435,
+    SYS_openat2 = 437,
+    SYS_pidfd_getfd = 438,
     compat_SYS_rt_sigaction = 512,
     compat_SYS_rt_sigreturn = 513,
     compat_SYS_ioctl = 514,