From nobody Sun Apr 16 11:10:33 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PznXn5NPyz458Zp; Sun, 16 Apr 2023 11:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PznXn2Gvxz41yB; Sun, 16 Apr 2023 11:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681643433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I047CXeGHGkxxpBv4I6lLtr7Et+oEV9bKHOunCTF/pQ=; b=ooBFvTa4MIFE2DpMO7fueEhiU1mbz90hU/xiXV/7I2mZBuRqwwzAHyU/hNSv4s0pGcFIC9 HVR/9+ywClxG2kv9mQP9U5jTbOta6l16Wrrm1P1UPCA1XsL4G7yL7JzGLbDGt2IUM4WH8U jX4pnPojzXMtja81KIxPGBbdDg/d9HzMFkiXe0pyZRfYiMiGGNUae+TYCDxVDkERghoRMM lMPnhCMopyIgmhMHu3D3fVAbXVkm24mUhRK7Zbji5zzjUIS+ty6DiG4qiDcMi3/SqjITtM UzcTfZnDXDtf8FvCW9W4LebYIqksZBM42gDlTsvM/9OW9pMs/7S71yk/vBusaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681643433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I047CXeGHGkxxpBv4I6lLtr7Et+oEV9bKHOunCTF/pQ=; b=hTUwUdHfh5Lz4FUjNLZAtkGPVU1jyFe/jsBE+QbOXpN1WfrVlya7OcIRjqx/IYanbBz3FF t5L8KoAOlH4D9oWn+Olp9lGWppaIQBTbNZicSwJyy5nVHPccbjEKY5tefuOQO/HziG1qNX fzXK1uQHzRTtNUy3Z+UjFEXqoduzHvI0g0MOP0iUIuTceKxFbCuPAs+5E8KsGlqiiff6Dj qH16H3/fv6w/Ecinm19KnBMgCr0f9rogkdKmPOl/CnISV+ojOpbVqWYxY4h7jqunxSaMal 7/KuOOxXqP1CDiUwSOm5G1IKseyaf8sLrJaGD8/RVhFILKqJhcWiY1Df/SkdDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681643433; a=rsa-sha256; cv=none; b=BjPgCppj8LzS1xAwb5FN/EgHA942/mlZYT5NcOBwdT3Szlqb7Rt+Gqzq6vOvLVmtwDJsiE S1RQB1LZzuTkhSTCSWMIz+qc9Kem1emQgN76ZesmytTACY+6DNI1NcrPWjIbb/J9kaWRMT 9uEGvGrZcR17heIj8bj5Y55zqFv8EBPV5SrowEiDKIx/1NhBx8hbgqkB3y4qhUJnn/c+uh 54kgCCgRsauCoRtrQsvA2PoEeUUsx2FtftOPUl5DPCuJpLolxZZw19Yv5t8wN9ykF7CL1o mrHguavPisTosQkQxjSGCilTq2R0C8LkTr6TeDNFK7qW6/LW1ejBik7Sxy9D4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PznXn13zFzlHp; Sun, 16 Apr 2023 11:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33GBAXHw048074; Sun, 16 Apr 2023 11:10:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GBAXCN048073; Sun, 16 Apr 2023 11:10:33 GMT (envelope-from git) Date: Sun, 16 Apr 2023 11:10:33 GMT Message-Id: <202304161110.33GBAXCN048073@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 166804038038 - stable/13 - Regen List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 16680403803806b37b730990eee6f08d11c46995 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=16680403803806b37b730990eee6f08d11c46995 commit 16680403803806b37b730990eee6f08d11c46995 Author: Konstantin Belousov AuthorDate: 2023-04-04 13:24:11 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-16 10:59:44 +0000 Regen --- sys/compat/freebsd32/freebsd32_sysent.c | 2 +- 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 +++++ 7 files changed, 34 insertions(+), 3 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index 0b6b0a6a5d57..b683e366c864 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -607,7 +607,7 @@ struct sysent freebsd32_sysent[] = { { .sy_narg = AS(rctl_remove_rule_args), .sy_call = (sy_call_t *)sys_rctl_remove_rule, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 529 = rctl_remove_rule */ #ifdef PAD64_REQUIRED { .sy_narg = AS(freebsd32_posix_fallocate_args), .sy_call = (sy_call_t *)freebsd32_posix_fallocate, .sy_auevent = AUE_POSIX_FALLOCATE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 530 = freebsd32_posix_fallocate */ - { .sy_narg = AS(freebsd32_posix_fadvise_args), .sy_call = (sy_call_t *)freebsd32_posix_fadvise, .sy_auevent = AUE_POSIX_FADVISE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 531 = freebsd32_posix_fadvise */ + { .sy_narg = AS(freebsd32_posix_fadvise_args), .sy_call = (sy_call_t *)freebsd32_posix_fadvise, .sy_auevent = AUE_POSIX_FADVISE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 531 = freebsd32_posix_fadvise */ { .sy_narg = AS(freebsd32_wait6_args), .sy_call = (sy_call_t *)freebsd32_wait6, .sy_auevent = AUE_WAIT6, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 532 = freebsd32_wait6 */ #else { .sy_narg = AS(freebsd32_posix_fallocate_args), .sy_call = (sy_call_t *)freebsd32_posix_fallocate, .sy_auevent = AUE_POSIX_FALLOCATE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 530 = freebsd32_posix_fallocate */ diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 091b146417bc..05e51fdac863 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -638,4 +638,5 @@ struct sysent sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 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(kqueuex_args), .sy_call = (sy_call_t *)sys_kqueuex, .sy_auevent = AUE_KQUEUE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 583 = kqueuex */ }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 985afba8c17c..72251162d837 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -589,4 +589,5 @@ const char *syscallnames[] = { "#580", /* 580 = fspacectl */ "sched_getcpu", /* 581 = sched_getcpu */ "swapoff", /* 582 = swapoff */ + "kqueuex", /* 583 = kqueuex */ }; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index fa3c4ed20f2c..78a76358b43b 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -3412,6 +3412,13 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 2; break; } + /* kqueuex */ + case 583: { + struct kqueuex_args *p = params; + uarg[0] = p->flags; /* u_int */ + *n_args = 1; + break; + } default: *n_args = 0; break; @@ -9117,6 +9124,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* kqueuex */ + case 583: + switch (ndx) { + case 0: + p = "u_int"; + break; + default: + break; + }; + break; default: break; }; @@ -11070,6 +11087,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* kqueuex */ + 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 253d53ad71fa..d80bf9b5930e 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -519,4 +519,5 @@ #define SYS_aio_readv 579 #define SYS_sched_getcpu 581 #define SYS_swapoff 582 -#define SYS_MAXSYSCALL 583 +#define SYS_kqueuex 583 +#define SYS_MAXSYSCALL 584 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index 134cc6a52188..54911eb44b55 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -424,4 +424,5 @@ MIASM = \ aio_writev.o \ aio_readv.o \ sched_getcpu.o \ - swapoff.o + swapoff.o \ + kqueuex.o diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index 700f33dc5155..57d264798c71 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -1854,6 +1854,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 kqueuex_args { + char flags_l_[PADL_(u_int)]; u_int flags; char flags_r_[PADR_(u_int)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_sys_exit(struct thread *, struct sys_exit_args *); int sys_fork(struct thread *, struct fork_args *); @@ -2250,6 +2253,7 @@ int sys_aio_writev(struct thread *, struct aio_writev_args *); int sys_aio_readv(struct thread *, struct aio_readv_args *); int sys_sched_getcpu(struct thread *, struct sched_getcpu_args *); int sys_swapoff(struct thread *, struct swapoff_args *); +int sys_kqueuex(struct thread *, struct kqueuex_args *); #ifdef COMPAT_43 @@ -3196,6 +3200,7 @@ int freebsd12_closefrom(struct thread *, struct freebsd12_closefrom_args *); #define SYS_AUE_aio_readv AUE_AIO_READV #define SYS_AUE_sched_getcpu AUE_NULL #define SYS_AUE_swapoff AUE_SWAPOFF +#define SYS_AUE_kqueuex AUE_KQUEUE #undef PAD_ #undef PADL_