Module Name: src Committed By: thorpej Date: Sun Sep 19 15:52:05 UTC 2021
Modified Files: src/sys/kern: init_sysent.c syscalls.c syscalls_autoload.c systrace_args.c src/sys/rump/include/rump: rump_syscalls.h src/sys/rump/librump/rumpkern: rump_syscalls.c src/sys/sys: syscall.h syscallargs.h Log Message: Regen for eventfd(2) and timerfd(2). To generate a diff of this commit: cvs rdiff -u -r1.337 -r1.338 src/sys/kern/init_sysent.c cvs rdiff -u -r1.325 -r1.326 src/sys/kern/syscalls.c cvs rdiff -u -r1.41 -r1.42 src/sys/kern/syscalls_autoload.c cvs rdiff -u -r1.47 -r1.48 src/sys/kern/systrace_args.c cvs rdiff -u -r1.124 -r1.125 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.155 -r1.156 src/sys/rump/librump/rumpkern/rump_syscalls.c cvs rdiff -u -r1.319 -r1.320 src/sys/sys/syscall.h cvs rdiff -u -r1.303 -r1.304 src/sys/sys/syscallargs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/kern/init_sysent.c diff -u src/sys/kern/init_sysent.c:1.337 src/sys/kern/init_sysent.c:1.338 --- src/sys/kern/init_sysent.c:1.337 Mon Nov 2 18:56:16 2020 +++ src/sys/kern/init_sysent.c Sun Sep 19 15:52:04 2021 @@ -1,14 +1,14 @@ -/* $NetBSD: init_sysent.c,v 1.337 2020/11/02 18:56:16 christos Exp $ */ +/* $NetBSD: init_sysent.c,v 1.338 2021/09/19 15:52:04 thorpej Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.307 2020/11/02 18:55:12 christos Exp + * created from NetBSD: syscalls.master,v 1.308 2021/09/19 15:51:27 thorpej Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.337 2020/11/02 18:56:16 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.338 2021/09/19 15:52:04 thorpej Exp $"); #ifdef _KERNEL_OPT #include "opt_modular.h" @@ -934,14 +934,19 @@ struct sysent sysent[] = { }, /* 176 = filler */ #endif { - .sy_call = sys_nosys, - }, /* 177 = filler */ + ns(struct sys_timerfd_create_args), + .sy_call = (sy_call_t *)sys_timerfd_create + }, /* 177 = timerfd_create */ { - .sy_call = sys_nosys, - }, /* 178 = filler */ + ns(struct sys_timerfd_settime_args), + .sy_flags = SYCALL_ARG_PTR, + .sy_call = (sy_call_t *)sys_timerfd_settime + }, /* 178 = timerfd_settime */ { - .sy_call = sys_nosys, - }, /* 179 = filler */ + ns(struct sys_timerfd_gettime_args), + .sy_flags = SYCALL_ARG_PTR, + .sy_call = (sy_call_t *)sys_timerfd_gettime + }, /* 179 = timerfd_gettime */ { .sy_call = sys_nosys, }, /* 180 = filler */ @@ -1336,8 +1341,9 @@ struct sysent sysent[] = { .sy_call = (sy_call_t *)sys_nomodule }, /* 266 = compat_50_mq_timedreceive */ { - .sy_call = sys_nosys, - }, /* 267 = filler */ + ns(struct sys_eventfd_args), + .sy_call = (sy_call_t *)sys_eventfd + }, /* 267 = eventfd */ { .sy_call = sys_nosys, }, /* 268 = filler */ Index: src/sys/kern/syscalls.c diff -u src/sys/kern/syscalls.c:1.325 src/sys/kern/syscalls.c:1.326 --- src/sys/kern/syscalls.c:1.325 Mon Nov 2 18:56:16 2020 +++ src/sys/kern/syscalls.c Sun Sep 19 15:52:04 2021 @@ -1,14 +1,14 @@ -/* $NetBSD: syscalls.c,v 1.325 2020/11/02 18:56:16 christos Exp $ */ +/* $NetBSD: syscalls.c,v 1.326 2021/09/19 15:52:04 thorpej Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.307 2020/11/02 18:55:12 christos Exp + * created from NetBSD: syscalls.master,v 1.308 2021/09/19 15:51:27 thorpej Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.325 2020/11/02 18:56:16 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.326 2021/09/19 15:52:04 thorpej Exp $"); #if defined(_KERNEL_OPT) #ifdef _KERNEL_OPT @@ -223,9 +223,9 @@ const char *const syscallnames[] = { #else /* 176 */ "#176 (excluded ntp_adjtime)", #endif - /* 177 */ "#177 (unimplemented)", - /* 178 */ "#178 (unimplemented)", - /* 179 */ "#179 (unimplemented)", + /* 177 */ "timerfd_create", + /* 178 */ "timerfd_settime", + /* 179 */ "timerfd_gettime", /* 180 */ "#180 (unimplemented)", /* 181 */ "setgid", /* 182 */ "setegid", @@ -313,7 +313,7 @@ const char *const syscallnames[] = { /* 264 */ "mq_receive", /* 265 */ "compat_50_mq_timedsend", /* 266 */ "compat_50_mq_timedreceive", - /* 267 */ "#267 (unimplemented)", + /* 267 */ "eventfd", /* 268 */ "#268 (unimplemented)", /* 269 */ "#269 (unimplemented)", /* 270 */ "__posix_rename", @@ -760,9 +760,9 @@ const char *const altsyscallnames[] = { #else /* 176 */ NULL, /* excluded ntp_adjtime */ #endif - /* 177 */ NULL, /* unimplemented */ - /* 178 */ NULL, /* unimplemented */ - /* 179 */ NULL, /* unimplemented */ + /* 177 */ NULL, /* timerfd_create */ + /* 178 */ NULL, /* timerfd_settime */ + /* 179 */ NULL, /* timerfd_gettime */ /* 180 */ NULL, /* unimplemented */ /* 181 */ NULL, /* setgid */ /* 182 */ NULL, /* setegid */ @@ -850,7 +850,7 @@ const char *const altsyscallnames[] = { /* 264 */ NULL, /* mq_receive */ /* 265 */ NULL, /* compat_50_mq_timedsend */ /* 266 */ NULL, /* compat_50_mq_timedreceive */ - /* 267 */ NULL, /* unimplemented */ + /* 267 */ NULL, /* eventfd */ /* 268 */ NULL, /* unimplemented */ /* 269 */ NULL, /* unimplemented */ /* 270 */ NULL, /* __posix_rename */ Index: src/sys/kern/syscalls_autoload.c diff -u src/sys/kern/syscalls_autoload.c:1.41 src/sys/kern/syscalls_autoload.c:1.42 --- src/sys/kern/syscalls_autoload.c:1.41 Mon Nov 2 18:56:16 2020 +++ src/sys/kern/syscalls_autoload.c Sun Sep 19 15:52:04 2021 @@ -1,14 +1,14 @@ -/* $NetBSD: syscalls_autoload.c,v 1.41 2020/11/02 18:56:16 christos Exp $ */ +/* $NetBSD: syscalls_autoload.c,v 1.42 2021/09/19 15:52:04 thorpej Exp $ */ /* * System call autoload table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.307 2020/11/02 18:55:12 christos Exp + * created from NetBSD: syscalls.master,v 1.308 2021/09/19 15:51:27 thorpej Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.41 2020/11/02 18:56:16 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.42 2021/09/19 15:52:04 thorpej Exp $"); #ifdef _KERNEL_OPT #include "opt_modular.h" Index: src/sys/kern/systrace_args.c diff -u src/sys/kern/systrace_args.c:1.47 src/sys/kern/systrace_args.c:1.48 --- src/sys/kern/systrace_args.c:1.47 Wed Apr 14 02:45:58 2021 +++ src/sys/kern/systrace_args.c Sun Sep 19 15:52:04 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: systrace_args.c,v 1.47 2021/04/14 02:45:58 christos Exp $ */ +/* $NetBSD: systrace_args.c,v 1.48 2021/09/19 15:52:04 thorpej Exp $ */ /* * System call argument to DTrace register array conversion. @@ -1311,6 +1311,32 @@ systrace_args(register_t sysnum, const v } #else #endif + /* sys_timerfd_create */ + case 177: { + const struct sys_timerfd_create_args *p = params; + iarg[0] = SCARG(p, clock_id); /* clockid_t */ + iarg[1] = SCARG(p, flags); /* int */ + *n_args = 2; + break; + } + /* sys_timerfd_settime */ + case 178: { + const struct sys_timerfd_settime_args *p = params; + iarg[0] = SCARG(p, fd); /* int */ + iarg[1] = SCARG(p, flags); /* int */ + uarg[2] = (intptr_t) SCARG(p, new_value); /* const struct itimerspec * */ + uarg[3] = (intptr_t) SCARG(p, old_value); /* struct itimerspec * */ + *n_args = 4; + break; + } + /* sys_timerfd_gettime */ + case 179: { + const struct sys_timerfd_gettime_args *p = params; + iarg[0] = SCARG(p, fd); /* int */ + uarg[1] = (intptr_t) SCARG(p, curr_value); /* struct itimerspec * */ + *n_args = 2; + break; + } /* sys_setgid */ case 181: { const struct sys_setgid_args *p = params; @@ -1964,6 +1990,14 @@ systrace_args(register_t sysnum, const v *n_args = 5; break; } + /* sys_eventfd */ + case 267: { + const struct sys_eventfd_args *p = params; + uarg[0] = SCARG(p, val); /* unsigned int */ + iarg[1] = SCARG(p, flags); /* int */ + *n_args = 2; + break; + } /* sys___posix_rename */ case 270: { const struct sys___posix_rename_args *p = params; @@ -5980,6 +6014,51 @@ systrace_entry_setargdesc(int sysnum, in break; #else #endif + /* sys_timerfd_create */ + case 177: + switch(ndx) { + case 0: + p = "clockid_t"; + break; + case 1: + p = "int"; + break; + default: + break; + }; + break; + /* sys_timerfd_settime */ + case 178: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "int"; + break; + case 2: + p = "const struct itimerspec *"; + break; + case 3: + p = "struct itimerspec *"; + break; + default: + break; + }; + break; + /* sys_timerfd_gettime */ + case 179: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "struct itimerspec *"; + break; + default: + break; + }; + break; /* sys_setgid */ case 181: switch(ndx) { @@ -7091,6 +7170,19 @@ systrace_entry_setargdesc(int sysnum, in break; }; break; + /* sys_eventfd */ + case 267: + switch(ndx) { + case 0: + p = "unsigned int"; + break; + case 1: + p = "int"; + break; + default: + break; + }; + break; /* sys___posix_rename */ case 270: switch(ndx) { @@ -11159,6 +11251,21 @@ systrace_return_setargdesc(int sysnum, i break; #else #endif + /* sys_timerfd_create */ + case 177: + if (ndx == 0 || ndx == 1) + p = "int"; + break; + /* sys_timerfd_settime */ + case 178: + if (ndx == 0 || ndx == 1) + p = "int"; + break; + /* sys_timerfd_gettime */ + case 179: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* sys_setgid */ case 181: if (ndx == 0 || ndx == 1) @@ -11541,6 +11648,11 @@ systrace_return_setargdesc(int sysnum, i if (ndx == 0 || ndx == 1) p = "ssize_t"; break; + /* sys_eventfd */ + case 267: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* sys___posix_rename */ case 270: if (ndx == 0 || ndx == 1) Index: src/sys/rump/include/rump/rump_syscalls.h diff -u src/sys/rump/include/rump/rump_syscalls.h:1.124 src/sys/rump/include/rump/rump_syscalls.h:1.125 --- src/sys/rump/include/rump/rump_syscalls.h:1.124 Mon Nov 2 18:56:16 2020 +++ src/sys/rump/include/rump/rump_syscalls.h Sun Sep 19 15:52:04 2021 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.h,v 1.124 2020/11/02 18:56:16 christos Exp $ */ +/* $NetBSD: rump_syscalls.h,v 1.125 2021/09/19 15:52:04 thorpej Exp $ */ /* * System call protos in rump namespace. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.307 2020/11/02 18:55:12 christos Exp + * created from NetBSD: syscalls.master,v 1.308 2021/09/19 15:51:27 thorpej Exp */ #ifndef _RUMP_RUMP_SYSCALLS_H_ Index: src/sys/rump/librump/rumpkern/rump_syscalls.c diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.155 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.156 --- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.155 Mon Nov 2 18:56:16 2020 +++ src/sys/rump/librump/rumpkern/rump_syscalls.c Sun Sep 19 15:52:04 2021 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.c,v 1.155 2020/11/02 18:56:16 christos Exp $ */ +/* $NetBSD: rump_syscalls.c,v 1.156 2021/09/19 15:52:04 thorpej Exp $ */ /* * System call vector and marshalling for rump. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.307 2020/11/02 18:55:12 christos Exp + * created from NetBSD: syscalls.master,v 1.308 2021/09/19 15:51:27 thorpej Exp */ #ifdef RUMP_CLIENT @@ -15,7 +15,7 @@ #ifdef __NetBSD__ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.155 2020/11/02 18:56:16 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.156 2021/09/19 15:52:04 thorpej Exp $"); #include <sys/fstypes.h> #include <sys/proc.h> @@ -7347,17 +7347,14 @@ struct sysent rump_sysent[] = { }, /* 176 = filler */ #endif { - .sy_flags = SYCALL_NOSYS, .sy_call = (sy_call_t *)(void *)rumpns_enosys, - }, /* 177 = filler */ +}, /* 177 = timerfd_create */ { - .sy_flags = SYCALL_NOSYS, .sy_call = (sy_call_t *)(void *)rumpns_enosys, - }, /* 178 = filler */ +}, /* 178 = timerfd_settime */ { - .sy_flags = SYCALL_NOSYS, .sy_call = (sy_call_t *)(void *)rumpns_enosys, - }, /* 179 = filler */ +}, /* 179 = timerfd_gettime */ { .sy_flags = SYCALL_NOSYS, .sy_call = (sy_call_t *)(void *)rumpns_enosys, @@ -7699,9 +7696,8 @@ struct sysent rump_sysent[] = { .sy_call = (sy_call_t *)(void *)rumpns_sys_nomodule, }, /* 266 = mq_timedreceive */ { - .sy_flags = SYCALL_NOSYS, .sy_call = (sy_call_t *)(void *)rumpns_enosys, - }, /* 267 = filler */ +}, /* 267 = eventfd */ { .sy_flags = SYCALL_NOSYS, .sy_call = (sy_call_t *)(void *)rumpns_enosys, Index: src/sys/sys/syscall.h diff -u src/sys/sys/syscall.h:1.319 src/sys/sys/syscall.h:1.320 --- src/sys/sys/syscall.h:1.319 Mon Nov 2 18:56:15 2020 +++ src/sys/sys/syscall.h Sun Sep 19 15:52:05 2021 @@ -1,10 +1,10 @@ -/* $NetBSD: syscall.h,v 1.319 2020/11/02 18:56:15 christos Exp $ */ +/* $NetBSD: syscall.h,v 1.320 2021/09/19 15:52:05 thorpej Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.307 2020/11/02 18:55:12 christos Exp + * created from NetBSD: syscalls.master,v 1.308 2021/09/19 15:51:27 thorpej Exp */ #ifndef _SYS_SYSCALL_H_ @@ -513,6 +513,15 @@ #else /* 176 is excluded ntp_adjtime */ #endif +/* syscall: "timerfd_create" ret: "int" args: "clockid_t" "int" */ +#define SYS_timerfd_create 177 + +/* syscall: "timerfd_settime" ret: "int" args: "int" "int" "const struct itimerspec *" "struct itimerspec *" */ +#define SYS_timerfd_settime 178 + +/* syscall: "timerfd_gettime" ret: "int" args: "int" "struct itimerspec *" */ +#define SYS_timerfd_gettime 179 + /* syscall: "setgid" ret: "int" args: "gid_t" */ #define SYS_setgid 181 @@ -744,6 +753,9 @@ /* syscall: "compat_50_mq_timedreceive" ret: "ssize_t" args: "mqd_t" "char *" "size_t" "unsigned *" "const struct timespec50 *" */ #define SYS_compat_50_mq_timedreceive 266 +/* syscall: "eventfd" ret: "int" args: "unsigned int" "int" */ +#define SYS_eventfd 267 + /* syscall: "__posix_rename" ret: "int" args: "const char *" "const char *" */ #define SYS___posix_rename 270 Index: src/sys/sys/syscallargs.h diff -u src/sys/sys/syscallargs.h:1.303 src/sys/sys/syscallargs.h:1.304 --- src/sys/sys/syscallargs.h:1.303 Mon Nov 2 18:56:15 2020 +++ src/sys/sys/syscallargs.h Sun Sep 19 15:52:05 2021 @@ -1,10 +1,10 @@ -/* $NetBSD: syscallargs.h,v 1.303 2020/11/02 18:56:15 christos Exp $ */ +/* $NetBSD: syscallargs.h,v 1.304 2021/09/19 15:52:05 thorpej Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.307 2020/11/02 18:55:12 christos Exp + * created from NetBSD: syscalls.master,v 1.308 2021/09/19 15:51:27 thorpej Exp */ #ifndef _SYS_SYSCALLARGS_H_ @@ -1125,6 +1125,32 @@ check_syscall_args(sys_ntp_adjtime) #else #endif +#ifndef RUMP_CLIENT +struct sys_timerfd_create_args { + syscallarg(clockid_t) clock_id; + syscallarg(int) flags; +}; +check_syscall_args(sys_timerfd_create) +#endif /* !RUMP_CLIENT */ + +#ifndef RUMP_CLIENT +struct sys_timerfd_settime_args { + syscallarg(int) fd; + syscallarg(int) flags; + syscallarg(const struct itimerspec *) new_value; + syscallarg(struct itimerspec *) old_value; +}; +check_syscall_args(sys_timerfd_settime) +#endif /* !RUMP_CLIENT */ + +#ifndef RUMP_CLIENT +struct sys_timerfd_gettime_args { + syscallarg(int) fd; + syscallarg(struct itimerspec *) curr_value; +}; +check_syscall_args(sys_timerfd_gettime) +#endif /* !RUMP_CLIENT */ + struct sys_setgid_args { syscallarg(gid_t) gid; }; @@ -1710,6 +1736,14 @@ struct compat_50_sys_mq_timedreceive_arg check_syscall_args(compat_50_sys_mq_timedreceive) #endif /* !RUMP_CLIENT */ +#ifndef RUMP_CLIENT +struct sys_eventfd_args { + syscallarg(unsigned int) val; + syscallarg(int) flags; +}; +check_syscall_args(sys_eventfd) +#endif /* !RUMP_CLIENT */ + struct sys___posix_rename_args { syscallarg(const char *) from; syscallarg(const char *) to; @@ -3655,6 +3689,12 @@ int sys_ntp_adjtime(struct lwp *, const #else #endif +int sys_timerfd_create(struct lwp *, const struct sys_timerfd_create_args *, register_t *); + +int sys_timerfd_settime(struct lwp *, const struct sys_timerfd_settime_args *, register_t *); + +int sys_timerfd_gettime(struct lwp *, const struct sys_timerfd_gettime_args *, register_t *); + int sys_setgid(struct lwp *, const struct sys_setgid_args *, register_t *); int sys_setegid(struct lwp *, const struct sys_setegid_args *, register_t *); @@ -3809,6 +3849,8 @@ int compat_50_sys_mq_timedsend(struct lw int compat_50_sys_mq_timedreceive(struct lwp *, const struct compat_50_sys_mq_timedreceive_args *, register_t *); +int sys_eventfd(struct lwp *, const struct sys_eventfd_args *, register_t *); + int sys___posix_rename(struct lwp *, const struct sys___posix_rename_args *, register_t *); int sys_swapctl(struct lwp *, const struct sys_swapctl_args *, register_t *);