From nobody Wed Jan 31 00:46:16 2024 X-Original-To: dev-commits-src-all@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 4TPjyc66zfz580nt; Wed, 31 Jan 2024 00:46:16 +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 4TPjyc4QzNz45kl; Wed, 31 Jan 2024 00:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706661976; 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=1BVOiGIBAOe6qA5GVrH19oOv9r/ZPsVQDo/uXwuqxyY=; b=v3Uo88d8zVoM60B40yVcfsyeuQMttn4NmOV7vyFEfFvoAn5MaB37k6mkF5l7iRTqbzeUpj ThN8tH+LOMQqskv/znkN0u/M37jF27Z+HUymBNHu0yvGUUZlx49KK5qCXhKwoB4w3IJI/f T/XbbffGd1f+BxhnBHuXCL2/ytRrGOdUmvVD9hhkWgcjr/ZvIwOTmlFcJgFOIPWji2fXY7 SFuj+HAnc+hOsQ77D3C0tO/tNqYcA0K+NJTdskO+3e+sEqqoYPhK5RuV58y35JQ83U2bOd oqzKIocP1mm6SmSUo4Hh5bG7ONiPrV5GncQXa8l8XvET8Pek5IW4hB23WO4vTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706661976; 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=1BVOiGIBAOe6qA5GVrH19oOv9r/ZPsVQDo/uXwuqxyY=; b=E3pKtXGNzrd+lW1+FmYUthosYN2t8YcwunhWHle5/xdo9gBqL/V/2s1aONkxaMqJHVFEI6 whBL8VBbgb6BeMc13o7DyqVKsoD/LCFk2w0djoagR7RMT8O7fYmzUMae9jwUWeUOmGFe+P X9V9HbXBsr7QNtTuqzQ5IOu6ntGW6LZqv58ZpKtOOaAMrwIkWgIBkvq4Lw1ajqgtP5LSpU +vO0MdmcQrDujI4bnmldJm1RMb8Ac/v3QKJCDujhnCbS1ML1nytKe4T8hytUnrGUyTjLSn AxrcTs8KsctsuZn9cy4y8gmeeobnpWFfe3cwdXo1Uj6gFOC4DAsrgRRE+d63xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706661976; a=rsa-sha256; cv=none; b=dDFxbfKQnUjN/jINMAGh0R7ZMCFdvtWp53RKK6P+/MrX8V52CGx4J/iojZehhgmW6uh9q8 tPYrxBLnvN5dSMkpQr+yP8JPJOamcq+gUni3bGlFEDDUs4gGrXDW2QvgB07Vcjmw/KEJ/m RUICwmc3wmRTYC9lu9XdkfzcRs5CGh3PAP2NeDmcm8PF0wQ2rTnyesHigJq1wIjcJMYJGt GSgKDKQS+bLN5qKV4hklDH+myCmCR6JY+LmGL/fWK0JPhp7wM9ETreqa7kx31VO7cWH0Y+ vNLzgyKFwIextOmtomkmTV8ahC7dkBGQuHUFvaz9UcSYn5y/Z+ipXY9HQPbt4g== 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 4TPjyc3WS2zxZ9; Wed, 31 Jan 2024 00:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40V0kGJa063704; Wed, 31 Jan 2024 00:46:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40V0kGEe063701; Wed, 31 Jan 2024 00:46:16 GMT (envelope-from git) Date: Wed, 31 Jan 2024 00:46:16 GMT Message-Id: <202401310046.40V0kGEe063701@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: 136d75ad86d1 - stable/14 - regen List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 136d75ad86d1a62d673490ed2679e7819444f0a9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=136d75ad86d1a62d673490ed2679e7819444f0a9 commit 136d75ad86d1a62d673490ed2679e7819444f0a9 Author: Konstantin Belousov AuthorDate: 2024-01-24 05:21:28 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-30 20:24:43 +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 | 38 ++++++++++++++++++++++++++ sys/kern/init_sysent.c | 1 + sys/kern/syscalls.c | 1 + sys/kern/systrace_args.c | 38 ++++++++++++++++++++++++++ sys/sys/syscall.h | 3 +- sys/sys/syscall.mk | 3 +- sys/sys/sysproto.h | 9 ++++++ 10 files changed, 95 insertions(+), 3 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h index 3123c3b1f74c..26b47e766d4a 100644 --- a/sys/compat/freebsd32/freebsd32_syscall.h +++ b/sys/compat/freebsd32/freebsd32_syscall.h @@ -506,4 +506,5 @@ #define FREEBSD32_SYS_timerfd_create 585 #define FREEBSD32_SYS_freebsd32_timerfd_gettime 586 #define FREEBSD32_SYS_freebsd32_timerfd_settime 587 -#define FREEBSD32_SYS_MAXSYSCALL 588 +#define FREEBSD32_SYS_kcmp 588 +#define FREEBSD32_SYS_MAXSYSCALL 589 diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c index e64c36b32d00..8511d56552e6 100644 --- a/sys/compat/freebsd32/freebsd32_syscalls.c +++ b/sys/compat/freebsd32/freebsd32_syscalls.c @@ -593,4 +593,5 @@ const char *freebsd32_syscallnames[] = { "timerfd_create", /* 585 = timerfd_create */ "freebsd32_timerfd_gettime", /* 586 = freebsd32_timerfd_gettime */ "freebsd32_timerfd_settime", /* 587 = freebsd32_timerfd_settime */ + "kcmp", /* 588 = kcmp */ }; diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index 2bb45fc3d2e2..ecde86d07965 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -649,4 +649,5 @@ struct sysent freebsd32_sysent[] = { { .sy_narg = AS(timerfd_create_args), .sy_call = (sy_call_t *)sys_timerfd_create, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 585 = timerfd_create */ { .sy_narg = AS(freebsd32_timerfd_gettime_args), .sy_call = (sy_call_t *)freebsd32_timerfd_gettime, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 586 = freebsd32_timerfd_gettime */ { .sy_narg = AS(freebsd32_timerfd_settime_args), .sy_call = (sy_call_t *)freebsd32_timerfd_settime, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 587 = freebsd32_timerfd_settime */ + { .sy_narg = AS(kcmp_args), .sy_call = (sy_call_t *)sys_kcmp, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 588 = kcmp */ }; diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index fb1fddc6ae5e..8bf3c29ecdbd 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -3371,6 +3371,17 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 4; break; } + /* kcmp */ + case 588: { + struct kcmp_args *p = params; + iarg[a++] = p->pid1; /* pid_t */ + iarg[a++] = p->pid2; /* pid_t */ + iarg[a++] = p->type; /* int */ + uarg[a++] = (intptr_t)p->idx1; /* uintptr_t */ + uarg[a++] = (intptr_t)p->idx2; /* uintptr_t */ + *n_args = 5; + break; + } default: *n_args = 0; break; @@ -9101,6 +9112,28 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* kcmp */ + case 588: + switch (ndx) { + case 0: + p = "pid_t"; + break; + case 1: + p = "pid_t"; + break; + case 2: + p = "int"; + break; + case 3: + p = "uintptr_t"; + break; + case 4: + p = "uintptr_t"; + break; + default: + break; + }; + break; default: break; }; @@ -10989,6 +11022,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* kcmp */ + case 588: + 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 d44fec54fcd7..a893deb73d9b 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -648,4 +648,5 @@ struct sysent sysent[] = { { .sy_narg = AS(timerfd_create_args), .sy_call = (sy_call_t *)sys_timerfd_create, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 585 = timerfd_create */ { .sy_narg = AS(timerfd_gettime_args), .sy_call = (sy_call_t *)sys_timerfd_gettime, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 586 = timerfd_gettime */ { .sy_narg = AS(timerfd_settime_args), .sy_call = (sy_call_t *)sys_timerfd_settime, .sy_auevent = AUE_TIMERFD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 587 = timerfd_settime */ + { .sy_narg = AS(kcmp_args), .sy_call = (sy_call_t *)sys_kcmp, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 588 = kcmp */ }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 8f13ccb186ee..552d94f0d439 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -593,4 +593,5 @@ const char *syscallnames[] = { "timerfd_create", /* 585 = timerfd_create */ "timerfd_gettime", /* 586 = timerfd_gettime */ "timerfd_settime", /* 587 = timerfd_settime */ + "kcmp", /* 588 = kcmp */ }; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index 1b14b68c84d1..33b723ae0c36 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -3458,6 +3458,17 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 4; break; } + /* kcmp */ + case 588: { + struct kcmp_args *p = params; + iarg[a++] = p->pid1; /* pid_t */ + iarg[a++] = p->pid2; /* pid_t */ + iarg[a++] = p->type; /* int */ + uarg[a++] = (intptr_t)p->idx1; /* uintptr_t */ + uarg[a++] = (intptr_t)p->idx2; /* uintptr_t */ + *n_args = 5; + break; + } default: *n_args = 0; break; @@ -9246,6 +9257,28 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* kcmp */ + case 588: + switch (ndx) { + case 0: + p = "pid_t"; + break; + case 1: + p = "pid_t"; + break; + case 2: + p = "int"; + break; + case 3: + p = "uintptr_t"; + break; + case 4: + p = "uintptr_t"; + break; + default: + break; + }; + break; default: break; }; @@ -11224,6 +11257,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* kcmp */ + case 588: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 724ca454dbf7..3cff10924501 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -524,4 +524,5 @@ #define SYS_timerfd_create 585 #define SYS_timerfd_gettime 586 #define SYS_timerfd_settime 587 -#define SYS_MAXSYSCALL 588 +#define SYS_kcmp 588 +#define SYS_MAXSYSCALL 589 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index ef58619ea6d4..98aa9e370d0a 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -429,4 +429,5 @@ MIASM = \ membarrier.o \ timerfd_create.o \ timerfd_gettime.o \ - timerfd_settime.o + timerfd_settime.o \ + kcmp.o diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index d0eb5a43d00b..d96acfc47f91 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -1876,6 +1876,13 @@ struct timerfd_settime_args { char new_value_l_[PADL_(const struct itimerspec *)]; const struct itimerspec * new_value; char new_value_r_[PADR_(const struct itimerspec *)]; char old_value_l_[PADL_(struct itimerspec *)]; struct itimerspec * old_value; char old_value_r_[PADR_(struct itimerspec *)]; }; +struct kcmp_args { + char pid1_l_[PADL_(pid_t)]; pid_t pid1; char pid1_r_[PADR_(pid_t)]; + char pid2_l_[PADL_(pid_t)]; pid_t pid2; char pid2_r_[PADR_(pid_t)]; + char type_l_[PADL_(int)]; int type; char type_r_[PADR_(int)]; + char idx1_l_[PADL_(uintptr_t)]; uintptr_t idx1; char idx1_r_[PADR_(uintptr_t)]; + char idx2_l_[PADL_(uintptr_t)]; uintptr_t idx2; char idx2_r_[PADR_(uintptr_t)]; +}; int sys_exit(struct thread *, struct exit_args *); int sys_fork(struct thread *, struct fork_args *); int sys_read(struct thread *, struct read_args *); @@ -2276,6 +2283,7 @@ int sys_membarrier(struct thread *, struct membarrier_args *); int sys_timerfd_create(struct thread *, struct timerfd_create_args *); int sys_timerfd_gettime(struct thread *, struct timerfd_gettime_args *); int sys_timerfd_settime(struct thread *, struct timerfd_settime_args *); +int sys_kcmp(struct thread *, struct kcmp_args *); #ifdef COMPAT_43 @@ -3250,6 +3258,7 @@ int freebsd13_swapoff(struct thread *, struct freebsd13_swapoff_args *); #define SYS_AUE_timerfd_create AUE_TIMERFD #define SYS_AUE_timerfd_gettime AUE_TIMERFD #define SYS_AUE_timerfd_settime AUE_TIMERFD +#define SYS_AUE_kcmp AUE_NULL #undef PAD_ #undef PADL_