Date: Mon, 27 Mar 2023 23:39:35 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 6a0a634590e4 - main - Regen Message-ID: <202303272339.32RNdZJL063736@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6a0a634590e44851b9915634f370e0d547b9012f commit 6a0a634590e44851b9915634f370e0d547b9012f Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2023-03-25 23:45:16 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2023-03-27 23:39:26 +0000 Regen --- sys/compat/freebsd32/freebsd32_syscall.h | 3 ++- sys/compat/freebsd32/freebsd32_syscalls.c | 1 + sys/compat/freebsd32/freebsd32_sysent.c | 1 + sys/compat/freebsd32/freebsd32_systrace_args.c | 22 ++++++++++++++++++++++ sys/kern/init_sysent.c | 1 + sys/kern/syscalls.c | 1 + sys/kern/systrace_args.c | 22 ++++++++++++++++++++++ sys/sys/syscall.h | 3 ++- sys/sys/syscall.mk | 3 ++- sys/sys/sysproto.h | 5 +++++ 10 files changed, 59 insertions(+), 3 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h index 4e055a27f3c6..604a41ad80ed 100644 --- a/sys/compat/freebsd32/freebsd32_syscall.h +++ b/sys/compat/freebsd32/freebsd32_syscall.h @@ -501,4 +501,5 @@ #define FREEBSD32_SYS_fspacectl 580 #define FREEBSD32_SYS_sched_getcpu 581 #define FREEBSD32_SYS_swapoff 582 -#define FREEBSD32_SYS_MAXSYSCALL 583 +#define FREEBSD32_SYS_kqueue1 583 +#define FREEBSD32_SYS_MAXSYSCALL 584 diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c index d52c197b8f26..512cee44bfd8 100644 --- a/sys/compat/freebsd32/freebsd32_syscalls.c +++ b/sys/compat/freebsd32/freebsd32_syscalls.c @@ -589,4 +589,5 @@ const char *freebsd32_syscallnames[] = { "fspacectl", /* 580 = fspacectl */ "sched_getcpu", /* 581 = sched_getcpu */ "swapoff", /* 582 = swapoff */ + "kqueue1", /* 583 = kqueue1 */ }; diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index ee9630ff3783..172138cc3d99 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -645,4 +645,5 @@ struct sysent freebsd32_sysent[] = { { .sy_narg = AS(fspacectl_args), .sy_call = (sy_call_t *)sys_fspacectl, .sy_auevent = AUE_FSPACECTL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 580 = fspacectl */ { .sy_narg = 0, .sy_call = (sy_call_t *)sys_sched_getcpu, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 581 = sched_getcpu */ { .sy_narg = AS(swapoff_args), .sy_call = (sy_call_t *)sys_swapoff, .sy_auevent = AUE_SWAPOFF, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 582 = swapoff */ + { .sy_narg = AS(kqueue1_args), .sy_call = (sy_call_t *)sys_kqueue1, .sy_auevent = AUE_KQUEUE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 583 = kqueue1 */ }; diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index 92ea09104a26..0436fc807ea2 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -3321,6 +3321,13 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 2; break; } + /* kqueue1 */ + case 583: { + struct kqueue1_args *p = params; + uarg[a++] = p->flags; /* u_int */ + *n_args = 1; + break; + } default: *n_args = 0; break; @@ -8964,6 +8971,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* kqueue1 */ + case 583: + switch (ndx) { + case 0: + p = "u_int"; + break; + default: + break; + }; + break; default: break; }; @@ -10822,6 +10839,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* kqueue1 */ + case 583: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 392fe231604e..6d0db175ecd2 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -644,4 +644,5 @@ struct sysent sysent[] = { { .sy_narg = AS(fspacectl_args), .sy_call = (sy_call_t *)sys_fspacectl, .sy_auevent = AUE_FSPACECTL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 580 = fspacectl */ { .sy_narg = 0, .sy_call = (sy_call_t *)sys_sched_getcpu, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 581 = sched_getcpu */ { .sy_narg = AS(swapoff_args), .sy_call = (sy_call_t *)sys_swapoff, .sy_auevent = AUE_SWAPOFF, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 582 = swapoff */ + { .sy_narg = AS(kqueue1_args), .sy_call = (sy_call_t *)sys_kqueue1, .sy_auevent = AUE_KQUEUE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 583 = kqueue1 */ }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index aa4792ccff8a..88b6dfe2f602 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -589,4 +589,5 @@ const char *syscallnames[] = { "fspacectl", /* 580 = fspacectl */ "sched_getcpu", /* 581 = sched_getcpu */ "swapoff", /* 582 = swapoff */ + "kqueue1", /* 583 = kqueue1 */ }; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index 8464a214548c..a278632e1d79 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -3417,6 +3417,13 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 2; break; } + /* kqueue1 */ + case 583: { + struct kqueue1_args *p = params; + uarg[a++] = p->flags; /* u_int */ + *n_args = 1; + break; + } default: *n_args = 0; break; @@ -9134,6 +9141,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* kqueue1 */ + case 583: + switch (ndx) { + case 0: + p = "u_int"; + break; + default: + break; + }; + break; default: break; }; @@ -11087,6 +11104,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* kqueue1 */ + case 583: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 081437449b70..2378497a96c0 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -520,4 +520,5 @@ #define SYS_fspacectl 580 #define SYS_sched_getcpu 581 #define SYS_swapoff 582 -#define SYS_MAXSYSCALL 583 +#define SYS_kqueue1 583 +#define SYS_MAXSYSCALL 584 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index 56518e94d30d..10093a5f4942 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -425,4 +425,5 @@ MIASM = \ aio_readv.o \ fspacectl.o \ sched_getcpu.o \ - swapoff.o + swapoff.o \ + kqueue1.o diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index e062eaf8c0e6..e3c7b473258a 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -1855,6 +1855,9 @@ struct swapoff_args { char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)]; char flags_l_[PADL_(u_int)]; u_int flags; char flags_r_[PADR_(u_int)]; }; +struct kqueue1_args { + char flags_l_[PADL_(u_int)]; u_int flags; char flags_r_[PADR_(u_int)]; +}; int sys_exit(struct thread *, struct exit_args *); int sys_fork(struct thread *, struct fork_args *); int sys_read(struct thread *, struct read_args *); @@ -2250,6 +2253,7 @@ int sys_aio_readv(struct thread *, struct aio_readv_args *); int sys_fspacectl(struct thread *, struct fspacectl_args *); int sys_sched_getcpu(struct thread *, struct sched_getcpu_args *); int sys_swapoff(struct thread *, struct swapoff_args *); +int sys_kqueue1(struct thread *, struct kqueue1_args *); #ifdef COMPAT_43 @@ -3219,6 +3223,7 @@ int freebsd13_swapoff(struct thread *, struct freebsd13_swapoff_args *); #define SYS_AUE_fspacectl AUE_FSPACECTL #define SYS_AUE_sched_getcpu AUE_NULL #define SYS_AUE_swapoff AUE_SWAPOFF +#define SYS_AUE_kqueue1 AUE_KQUEUE #undef PAD_ #undef PADL_
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303272339.32RNdZJL063736>