From nobody Fri Jan 14 18:10:25 2022 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 398411942B05; Fri, 14 Jan 2022 18:10:28 +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 4Jb8VB6w95z4p7Q; Fri, 14 Jan 2022 18:10:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642183827; 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=X9X3Wo+iLgAM4aWq+oUwUaON/JBUwFdjQVasp3yk/lU=; b=bP3bUXFiSZCXUE0DIjJ628zrApWT8q6u9GJpdHra6QiydPwtoJzKZlJLJe5l1Xc5PJs56m gu+RyE2PVnBR5EiBQl4hG21c7rRoTSfW4OAsbpYcwMIXrSl4nGWxlHeGULBoXGEdJZDxnd 322BB428lQzF5RvlswMcXCxpF9+e3Q51g8qmuVNJ9Sa0q466mE3kvEZDJXec6h2JIuFzhq 41CEAX9a0o/6c0EsqDoIRscy2dIM4HugwhMGFzPpe41t9N+l+9cU0zG4bi0ZP4TUKwY8NA Gor+kW0PzNZ8FR5ypFCNuRbbz+vqAbPAiawH7JkcbeT6aRJU7ZCm8Rq32Yt/tQ== 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 E739A18574; Fri, 14 Jan 2022 18:10:25 +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 20EIAPl1095461; Fri, 14 Jan 2022 18:10:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20EIAPZ2095460; Fri, 14 Jan 2022 18:10:25 GMT (envelope-from git) Date: Fri, 14 Jan 2022 18:10:25 GMT Message-Id: <202201141810.20EIAPZ2095460@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: 6e676b5550e8 - 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: 6e676b5550e89ac084dab73397d3586755a4a9c5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642183827; 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=X9X3Wo+iLgAM4aWq+oUwUaON/JBUwFdjQVasp3yk/lU=; b=QsflhKKT47OgRVLEGf5w3uIxDVmh5MTAZK4Aq3qrXZwgDbVzIr4lCGgKxaB8aszM6HnEXE 419g9OTy2tCfiJ83rdUhduYo6rMGf+gR+EW9ZS2p27qL43E0noXYV2ke8y1KK9PWp7xI3u JNPIqpxo5q2IU7D+dxZ+Gt1QeAAdhhHQJ9XxadS6EdMxJIDkOFXzXq4BoQSCfLTK0qdYHl bQTLE6QTZ8nBKdqUB9jHJF8u+qFdELi0CyuNtgoICZzPqisLmSWgd1Dwaj2FX2zaDpu59K kt5XH5ROpP6B5AlbMtlbsrM3i5/R1p4xuK1R2o0HqMclHE8vfGQSQd16YyMf9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642183827; a=rsa-sha256; cv=none; b=cJzwnEqMm1MTeUVnS4cK2q/bNAmi/2Is445TxbWXzuyD/jtTyGwsk80xrrV1U0iYjvtnxh 2QZUzQuUkVx9+7sq2LkECkyCJlsW69GoYCKhYgF2AGDDWWCkizvZ0KISq04Uyggfsjz0Iq by63dgNsYgA/Yok1+vDZoDMumi9ks2rbegtMvrOwrfCdac9O7GCHAjqswitV3uxE5J29gw RO1o7e32KEp/kaP4r/6Q7BGT3pMcvK+/RsCBOVQD/iVaXd6GA4i5Jigk45NGTFqFT1SXx6 Zz+jTJKa/jupPCgdIrFBTj0FupdLY1FAAbDO+3rY6Rihms2yzXqoXFOSa4NKVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6e676b5550e89ac084dab73397d3586755a4a9c5 commit 6e676b5550e89ac084dab73397d3586755a4a9c5 Author: Konstantin Belousov AuthorDate: 2021-11-10 19:44:25 +0000 Commit: Konstantin Belousov CommitDate: 2022-01-14 16:17:30 +0000 Regen --- sys/compat/freebsd32/freebsd32_syscall.h | 1 + sys/compat/freebsd32/freebsd32_syscalls.c | 2 +- sys/compat/freebsd32/freebsd32_sysent.c | 2 +- sys/compat/freebsd32/freebsd32_systrace_args.c | 10 ++++++++++ sys/kern/init_sysent.c | 2 +- sys/kern/syscalls.c | 2 +- sys/kern/systrace_args.c | 10 ++++++++++ sys/sys/syscall.h | 1 + sys/sys/syscall.mk | 1 + sys/sys/sysproto.h | 5 +++++ 10 files changed, 32 insertions(+), 4 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h index 2d64d847121d..b6945902ab31 100644 --- a/sys/compat/freebsd32/freebsd32_syscall.h +++ b/sys/compat/freebsd32/freebsd32_syscall.h @@ -508,4 +508,5 @@ #define FREEBSD32_SYS___specialfd 577 #define FREEBSD32_SYS_freebsd32_aio_writev 578 #define FREEBSD32_SYS_freebsd32_aio_readv 579 +#define FREEBSD32_SYS_sched_getcpu 581 #define FREEBSD32_SYS_MAXSYSCALL 583 diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c index 2b777fa568b7..d7d73e0445ff 100644 --- a/sys/compat/freebsd32/freebsd32_syscalls.c +++ b/sys/compat/freebsd32/freebsd32_syscalls.c @@ -617,6 +617,6 @@ const char *freebsd32_syscallnames[] = { "freebsd32_aio_writev", /* 578 = freebsd32_aio_writev */ "freebsd32_aio_readv", /* 579 = freebsd32_aio_readv */ "#580", /* 580 = fspacectl */ - "#581", /* 581 = sched_getcpu */ + "sched_getcpu", /* 581 = sched_getcpu */ "#582", /* 582 = swapoff */ }; diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index 1996b75e9a08..b683e366c864 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -670,6 +670,6 @@ struct sysent freebsd32_sysent[] = { { .sy_narg = AS(freebsd32_aio_writev_args), .sy_call = (sy_call_t *)freebsd32_aio_writev, .sy_auevent = AUE_AIO_WRITEV, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 578 = freebsd32_aio_writev */ { .sy_narg = AS(freebsd32_aio_readv_args), .sy_call = (sy_call_t *)freebsd32_aio_readv, .sy_auevent = AUE_AIO_READV, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 579 = freebsd32_aio_readv */ { .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 *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 581 = sched_getcpu */ + { .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 = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 582 = swapoff */ }; diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index 818a34e0cdad..ff650e90eff3 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -3407,6 +3407,11 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 1; break; } + /* sched_getcpu */ + case 581: { + *n_args = 0; + break; + } default: *n_args = 0; break; @@ -9183,6 +9188,9 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* sched_getcpu */ + case 581: + break; default: break; }; @@ -11102,6 +11110,8 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* sched_getcpu */ + case 581: default: break; }; diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index a571c64144b0..9d11e6bdd61b 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -636,6 +636,6 @@ struct sysent sysent[] = { { .sy_narg = AS(aio_writev_args), .sy_call = (sy_call_t *)sys_aio_writev, .sy_auevent = AUE_AIO_WRITEV, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 578 = aio_writev */ { .sy_narg = AS(aio_readv_args), .sy_call = (sy_call_t *)sys_aio_readv, .sy_auevent = AUE_AIO_READV, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 579 = aio_readv */ { .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 *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 581 = sched_getcpu */ + { .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 */ }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 7533aff46a93..985afba8c17c 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -587,6 +587,6 @@ const char *syscallnames[] = { "aio_writev", /* 578 = aio_writev */ "aio_readv", /* 579 = aio_readv */ "#580", /* 580 = fspacectl */ - "#581", /* 581 = sched_getcpu */ + "sched_getcpu", /* 581 = sched_getcpu */ "swapoff", /* 582 = swapoff */ }; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index 8dbeb0d485f5..fa3c4ed20f2c 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -3399,6 +3399,11 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 1; break; } + /* sched_getcpu */ + case 581: { + *n_args = 0; + break; + } /* swapoff */ case 582: { struct swapoff_args *p = params; @@ -9096,6 +9101,9 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* sched_getcpu */ + case 581: + break; /* swapoff */ case 582: switch (ndx) { @@ -11055,6 +11063,8 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* sched_getcpu */ + case 581: /* swapoff */ case 582: if (ndx == 0 || ndx == 1) diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 2b8b9bb0ccd1..253d53ad71fa 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -517,5 +517,6 @@ #define SYS___specialfd 577 #define SYS_aio_writev 578 #define SYS_aio_readv 579 +#define SYS_sched_getcpu 581 #define SYS_swapoff 582 #define SYS_MAXSYSCALL 583 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index 71847a1563c3..134cc6a52188 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -423,4 +423,5 @@ MIASM = \ __specialfd.o \ aio_writev.o \ aio_readv.o \ + sched_getcpu.o \ swapoff.o diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index 06146e13f31b..700f33dc5155 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -1847,6 +1847,9 @@ struct aio_writev_args { struct aio_readv_args { char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char aiocbp_r_[PADR_(struct aiocb *)]; }; +struct sched_getcpu_args { + register_t dummy; +}; 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)]; @@ -2245,6 +2248,7 @@ int sys_rpctls_syscall(struct thread *, struct rpctls_syscall_args *); int sys___specialfd(struct thread *, struct __specialfd_args *); 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 *); #ifdef COMPAT_43 @@ -3190,6 +3194,7 @@ int freebsd12_closefrom(struct thread *, struct freebsd12_closefrom_args *); #define SYS_AUE___specialfd AUE_SPECIALFD #define SYS_AUE_aio_writev AUE_AIO_WRITEV #define SYS_AUE_aio_readv AUE_AIO_READV +#define SYS_AUE_sched_getcpu AUE_NULL #define SYS_AUE_swapoff AUE_SWAPOFF #undef PAD_