Module Name: src Committed By: christos Date: Fri Feb 3 16:28:42 UTC 2017
Modified Files: src/sys/compat/linux/arch/arm: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/sys/compat/linux/arch/arm/linux_syscall.h \ src/sys/compat/linux/arch/arm/linux_syscallargs.h \ src/sys/compat/linux/arch/arm/linux_syscalls.c \ src/sys/compat/linux/arch/arm/linux_sysent.c cvs rdiff -u -r1.10 -r1.11 \ src/sys/compat/linux/arch/arm/linux_systrace_args.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/compat/linux/arch/arm/linux_syscall.h diff -u src/sys/compat/linux/arch/arm/linux_syscall.h:1.77 src/sys/compat/linux/arch/arm/linux_syscall.h:1.78 --- src/sys/compat/linux/arch/arm/linux_syscall.h:1.77 Fri Feb 3 01:07:29 2017 +++ src/sys/compat/linux/arch/arm/linux_syscall.h Fri Feb 3 11:28:42 2017 @@ -1,10 +1,10 @@ -/* $NetBSD: linux_syscall.h,v 1.77 2017/02/03 06:07:29 martin Exp $ */ +/* $NetBSD: linux_syscall.h,v 1.78 2017/02/03 16:28:42 christos Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.66 2017/02/03 06:06:09 martin Exp + * created from NetBSD: syscalls.master,v 1.67 2017/02/03 16:28:34 christos Exp */ #ifndef _LINUX_SYS_SYSCALL_H_ @@ -709,9 +709,15 @@ /* syscall: "pipe2" ret: "int" args: "int *" "int" */ #define LINUX_SYS_pipe2 359 +/* syscall: "recvmmsg" ret: "int" args: "int" "struct linux_mmsghdr *" "unsigned int" "unsigned int" "struct timespec *" */ +#define LINUX_SYS_recvmmsg 365 + /* syscall: "accept4" ret: "int" args: "int" "struct osockaddr *" "int *" "int" */ #define LINUX_SYS_accept4 366 +/* syscall: "sendmmsg" ret: "int" args: "int" "struct linux_mmsghdr *" "unsigned int" "unsigned int" */ +#define LINUX_SYS_sendmmsg 374 + /* syscall: "breakpoint" ret: "int" args: */ #define LINUX_SYS_breakpoint 385 Index: src/sys/compat/linux/arch/arm/linux_syscallargs.h diff -u src/sys/compat/linux/arch/arm/linux_syscallargs.h:1.77 src/sys/compat/linux/arch/arm/linux_syscallargs.h:1.78 --- src/sys/compat/linux/arch/arm/linux_syscallargs.h:1.77 Fri Feb 3 01:07:29 2017 +++ src/sys/compat/linux/arch/arm/linux_syscallargs.h Fri Feb 3 11:28:42 2017 @@ -1,10 +1,10 @@ -/* $NetBSD: linux_syscallargs.h,v 1.77 2017/02/03 06:07:29 martin Exp $ */ +/* $NetBSD: linux_syscallargs.h,v 1.78 2017/02/03 16:28:42 christos Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.66 2017/02/03 06:06:09 martin Exp + * created from NetBSD: syscalls.master,v 1.67 2017/02/03 16:28:34 christos Exp */ #ifndef _LINUX_SYS_SYSCALLARGS_H_ @@ -1091,6 +1091,15 @@ struct linux_sys_pipe2_args { }; check_syscall_args(linux_sys_pipe2) +struct linux_sys_recvmmsg_args { + syscallarg(int) s; + syscallarg(struct linux_mmsghdr *) msgvec; + syscallarg(unsigned int) vlen; + syscallarg(unsigned int) flags; + syscallarg(struct timespec *) timeout; +}; +check_syscall_args(linux_sys_recvmmsg) + struct linux_sys_accept4_args { syscallarg(int) s; syscallarg(struct osockaddr *) name; @@ -1099,6 +1108,14 @@ struct linux_sys_accept4_args { }; check_syscall_args(linux_sys_accept4) +struct linux_sys_sendmmsg_args { + syscallarg(int) s; + syscallarg(struct linux_mmsghdr *) msgvec; + syscallarg(unsigned int) vlen; + syscallarg(unsigned int) flags; +}; +check_syscall_args(linux_sys_sendmmsg) + struct linux_sys_cacheflush_args { syscallarg(uintptr_t) from; syscallarg(intptr_t) to; @@ -1557,8 +1574,12 @@ int linux_sys_dup3(struct lwp *, const s int linux_sys_pipe2(struct lwp *, const struct linux_sys_pipe2_args *, register_t *); +int linux_sys_recvmmsg(struct lwp *, const struct linux_sys_recvmmsg_args *, register_t *); + int linux_sys_accept4(struct lwp *, const struct linux_sys_accept4_args *, register_t *); +int linux_sys_sendmmsg(struct lwp *, const struct linux_sys_sendmmsg_args *, register_t *); + int linux_sys_breakpoint(struct lwp *, const void *, register_t *); int linux_sys_cacheflush(struct lwp *, const struct linux_sys_cacheflush_args *, register_t *); Index: src/sys/compat/linux/arch/arm/linux_syscalls.c diff -u src/sys/compat/linux/arch/arm/linux_syscalls.c:1.77 src/sys/compat/linux/arch/arm/linux_syscalls.c:1.78 --- src/sys/compat/linux/arch/arm/linux_syscalls.c:1.77 Fri Feb 3 01:07:29 2017 +++ src/sys/compat/linux/arch/arm/linux_syscalls.c Fri Feb 3 11:28:42 2017 @@ -1,14 +1,14 @@ -/* $NetBSD: linux_syscalls.c,v 1.77 2017/02/03 06:07:29 martin Exp $ */ +/* $NetBSD: linux_syscalls.c,v 1.78 2017/02/03 16:28:42 christos Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.66 2017/02/03 06:06:09 martin Exp + * created from NetBSD: syscalls.master,v 1.67 2017/02/03 16:28:34 christos Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.77 2017/02/03 06:07:29 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.78 2017/02/03 16:28:42 christos Exp $"); #if defined(_KERNEL_OPT) #include <sys/param.h> @@ -400,25 +400,25 @@ const char *const linux_syscallnames[] = /* 362 */ "#362 (unimplemented pwritev)", /* 363 */ "#363 (unimplemented rt_tgsigqueueinfo)", /* 364 */ "#364 (unimplemented perf_counter_open)", - /* 365 */ "#365 (unimplemented recvmmsg)", + /* 365 */ "recvmmsg", /* 366 */ "accept4", - /* 367 */ "#367 (unimplemented)", - /* 368 */ "#368 (unimplemented)", - /* 369 */ "#369 (unimplemented)", - /* 370 */ "#370 (unimplemented)", - /* 371 */ "#371 (unimplemented)", - /* 372 */ "#372 (unimplemented)", - /* 373 */ "#373 (unimplemented)", - /* 374 */ "#374 (unimplemented)", - /* 375 */ "#375 (unimplemented)", - /* 376 */ "#376 (unimplemented)", - /* 377 */ "#377 (unimplemented)", - /* 378 */ "#378 (unimplemented)", - /* 379 */ "#379 (unimplemented)", - /* 380 */ "#380 (unimplemented)", - /* 381 */ "#381 (unimplemented)", - /* 382 */ "#382 (unimplemented)", - /* 383 */ "#383 (unimplemented)", + /* 367 */ "#367 (unimplemented fanotify_init)", + /* 368 */ "#368 (unimplemented fanotify_mark)", + /* 369 */ "#369 (unimplemented prlimit64)", + /* 370 */ "#370 (unimplemented name_to_handle_at)", + /* 371 */ "#371 (unimplemented open_by_handle_at)", + /* 372 */ "#372 (unimplemented clock_adjtime)", + /* 373 */ "#373 (unimplemented syncfs)", + /* 374 */ "sendmmsg", + /* 375 */ "#375 (unimplemented setns)", + /* 376 */ "#376 (unimplemented process_vm_readv)", + /* 377 */ "#377 (unimplemented process_vm_writev)", + /* 378 */ "#378 (unimplemented kcmp)", + /* 379 */ "#379 (unimplemented finit_module)", + /* 380 */ "#380 (unimplemented sched_setattr)", + /* 381 */ "#381 (unimplemented sched_getattr)", + /* 382 */ "#382 (unimplemented renameat2)", + /* 383 */ "#383 (unimplemented seccomp)", /* 384 */ "#384 (unimplemented / * base * /)", /* 385 */ "breakpoint", /* 386 */ "cacheflush", @@ -922,25 +922,25 @@ const char *const altlinux_syscallnames[ /* 362 */ NULL, /* unimplemented pwritev */ /* 363 */ NULL, /* unimplemented rt_tgsigqueueinfo */ /* 364 */ NULL, /* unimplemented perf_counter_open */ - /* 365 */ NULL, /* unimplemented recvmmsg */ + /* 365 */ NULL, /* recvmmsg */ /* 366 */ NULL, /* accept4 */ - /* 367 */ NULL, /* unimplemented */ - /* 368 */ NULL, /* unimplemented */ - /* 369 */ NULL, /* unimplemented */ - /* 370 */ NULL, /* unimplemented */ - /* 371 */ NULL, /* unimplemented */ - /* 372 */ NULL, /* unimplemented */ - /* 373 */ NULL, /* unimplemented */ - /* 374 */ NULL, /* unimplemented */ - /* 375 */ NULL, /* unimplemented */ - /* 376 */ NULL, /* unimplemented */ - /* 377 */ NULL, /* unimplemented */ - /* 378 */ NULL, /* unimplemented */ - /* 379 */ NULL, /* unimplemented */ - /* 380 */ NULL, /* unimplemented */ - /* 381 */ NULL, /* unimplemented */ - /* 382 */ NULL, /* unimplemented */ - /* 383 */ NULL, /* unimplemented */ + /* 367 */ NULL, /* unimplemented fanotify_init */ + /* 368 */ NULL, /* unimplemented fanotify_mark */ + /* 369 */ NULL, /* unimplemented prlimit64 */ + /* 370 */ NULL, /* unimplemented name_to_handle_at */ + /* 371 */ NULL, /* unimplemented open_by_handle_at */ + /* 372 */ NULL, /* unimplemented clock_adjtime */ + /* 373 */ NULL, /* unimplemented syncfs */ + /* 374 */ NULL, /* sendmmsg */ + /* 375 */ NULL, /* unimplemented setns */ + /* 376 */ NULL, /* unimplemented process_vm_readv */ + /* 377 */ NULL, /* unimplemented process_vm_writev */ + /* 378 */ NULL, /* unimplemented kcmp */ + /* 379 */ NULL, /* unimplemented finit_module */ + /* 380 */ NULL, /* unimplemented sched_setattr */ + /* 381 */ NULL, /* unimplemented sched_getattr */ + /* 382 */ NULL, /* unimplemented renameat2 */ + /* 383 */ NULL, /* unimplemented seccomp */ /* 384 */ NULL, /* unimplemented / * base * / */ /* 385 */ NULL, /* breakpoint */ /* 386 */ NULL, /* cacheflush */ Index: src/sys/compat/linux/arch/arm/linux_sysent.c diff -u src/sys/compat/linux/arch/arm/linux_sysent.c:1.77 src/sys/compat/linux/arch/arm/linux_sysent.c:1.78 --- src/sys/compat/linux/arch/arm/linux_sysent.c:1.77 Fri Feb 3 01:07:29 2017 +++ src/sys/compat/linux/arch/arm/linux_sysent.c Fri Feb 3 11:28:42 2017 @@ -1,14 +1,14 @@ -/* $NetBSD: linux_sysent.c,v 1.77 2017/02/03 06:07:29 martin Exp $ */ +/* $NetBSD: linux_sysent.c,v 1.78 2017/02/03 16:28:42 christos Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.66 2017/02/03 06:06:09 martin Exp + * created from NetBSD: syscalls.master,v 1.67 2017/02/03 16:28:34 christos Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.77 2017/02/03 06:07:29 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.78 2017/02/03 16:28:42 christos Exp $"); #include <sys/param.h> #include <sys/poll.h> @@ -1494,8 +1494,10 @@ struct sysent linux_sysent[] = { .sy_call = linux_sys_nosys, }, /* 364 = filler */ { - .sy_call = linux_sys_nosys, - }, /* 365 = filler */ + ns(struct linux_sys_recvmmsg_args), + .sy_flags = SYCALL_ARG_PTR, + .sy_call = (sy_call_t *)linux_sys_recvmmsg + }, /* 365 = recvmmsg */ { ns(struct linux_sys_accept4_args), .sy_flags = SYCALL_ARG_PTR, @@ -1523,8 +1525,10 @@ struct sysent linux_sysent[] = { .sy_call = linux_sys_nosys, }, /* 373 = filler */ { - .sy_call = linux_sys_nosys, - }, /* 374 = filler */ + ns(struct linux_sys_sendmmsg_args), + .sy_flags = SYCALL_ARG_PTR, + .sy_call = (sy_call_t *)linux_sys_sendmmsg + }, /* 374 = sendmmsg */ { .sy_call = linux_sys_nosys, }, /* 375 = filler */ Index: src/sys/compat/linux/arch/arm/linux_systrace_args.c diff -u src/sys/compat/linux/arch/arm/linux_systrace_args.c:1.10 src/sys/compat/linux/arch/arm/linux_systrace_args.c:1.11 --- src/sys/compat/linux/arch/arm/linux_systrace_args.c:1.10 Fri Feb 3 01:07:29 2017 +++ src/sys/compat/linux/arch/arm/linux_systrace_args.c Fri Feb 3 11:28:42 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_systrace_args.c,v 1.10 2017/02/03 06:07:29 martin Exp $ */ +/* $NetBSD: linux_systrace_args.c,v 1.11 2017/02/03 16:28:42 christos Exp $ */ /* * System call argument to DTrace register array converstion. @@ -1859,6 +1859,17 @@ systrace_args(register_t sysnum, const v *n_args = 2; break; } + /* linux_sys_recvmmsg */ + case 365: { + const struct linux_sys_recvmmsg_args *p = params; + iarg[0] = SCARG(p, s); /* int */ + uarg[1] = (intptr_t) SCARG(p, msgvec); /* struct linux_mmsghdr * */ + uarg[2] = SCARG(p, vlen); /* unsigned int */ + uarg[3] = SCARG(p, flags); /* unsigned int */ + uarg[4] = (intptr_t) SCARG(p, timeout); /* struct timespec * */ + *n_args = 5; + break; + } /* linux_sys_accept4 */ case 366: { const struct linux_sys_accept4_args *p = params; @@ -1869,6 +1880,16 @@ systrace_args(register_t sysnum, const v *n_args = 4; break; } + /* linux_sys_sendmmsg */ + case 374: { + const struct linux_sys_sendmmsg_args *p = params; + iarg[0] = SCARG(p, s); /* int */ + uarg[1] = (intptr_t) SCARG(p, msgvec); /* struct linux_mmsghdr * */ + uarg[2] = SCARG(p, vlen); /* unsigned int */ + uarg[3] = SCARG(p, flags); /* unsigned int */ + *n_args = 4; + break; + } /* linux_sys_breakpoint */ case 385: { *n_args = 0; @@ -4915,6 +4936,28 @@ systrace_entry_setargdesc(int sysnum, in break; }; break; + /* linux_sys_recvmmsg */ + case 365: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "struct linux_mmsghdr *"; + break; + case 2: + p = "unsigned int"; + break; + case 3: + p = "unsigned int"; + break; + case 4: + p = "struct timespec *"; + break; + default: + break; + }; + break; /* linux_sys_accept4 */ case 366: switch(ndx) { @@ -4934,6 +4977,25 @@ systrace_entry_setargdesc(int sysnum, in break; }; break; + /* linux_sys_sendmmsg */ + case 374: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "struct linux_mmsghdr *"; + break; + case 2: + p = "unsigned int"; + break; + case 3: + p = "unsigned int"; + break; + default: + break; + }; + break; /* linux_sys_breakpoint */ case 385: break; @@ -6050,11 +6112,21 @@ systrace_return_setargdesc(int sysnum, i if (ndx == 0 || ndx == 1) p = "int"; break; + /* linux_sys_recvmmsg */ + case 365: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_sys_accept4 */ case 366: if (ndx == 0 || ndx == 1) p = "int"; break; + /* linux_sys_sendmmsg */ + case 374: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_sys_breakpoint */ case 385: /* linux_sys_cacheflush */