From nobody Wed Jan 31 00:46:08 2024 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 4TPjyT01Mnz580VW; Wed, 31 Jan 2024 00:46:09 +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 4TPjyS4byPz45MC; Wed, 31 Jan 2024 00:46:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706661968; 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=cJol7t5z3rxwrN8EffLTD2g0RKHdew/xPQCQ/0gW278=; b=YoDDigOstcVnTPeRXtMenzl4CUvuiBYXpuGhZi242dzc6yYbrt3o9mnkgjM9N3dXUQwu1Y wLKkZwLcRJ9R9FDYAz2nbhIIhNPl0QG4DnD8YP1ZAiZdyftqe9DwUijQf7r6utFOOJufY8 ney5CFqdGWhqlKhNzreG13ZaPnke959QmYCNbTo28MYV0WIYsSisQW359rNn5c18zO80AD rJq8pxYwNUvZswY96KFtFwTsav1GVYRYh9p27LHMFakanwdnBQ8Rlv/jTxE5peFvm7Avuw ccbLN97mz00KaET/sMQdi7S9bGCTpylxcQT2zlVwCpxmbSlUPek5fbGN39E5pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706661968; 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=cJol7t5z3rxwrN8EffLTD2g0RKHdew/xPQCQ/0gW278=; b=VHiyR7TKtCp1cMxU3b8siN35Y84ivaGoPb7af7IySl7ugMJOmnOvMQzjiX4xZtosOBStv4 /rOHIqMoJH+cVooMDKnAIZF3PhLxqUrJlGMUtX869QManr/SPfbMKoyhYu4w415CqTbTnW Dz3CR8x9Yuylw1CPNV6i0LKkYrDkKXrcv2duwznnaX/dHEQ02kemZepGMXtCArWrPlHXPF QeAhVhT27Fmd2R66VfEjW2GcqHVbBkW0L8acTr+DyIQUI3ScMoIWBph/UBFHlMYjv4fxgs KWqpnfT6Mps9LpI7R+kuuCxFIlvMM7gf0lOKgPuNpxrDRj7lBh2PfJRZg70Q5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706661968; a=rsa-sha256; cv=none; b=oi+uKQ1iTaShhbrjA7hn/rYXzDYYAGD4U51S82DuDsMnubDE2+/4+7BdFAVgvkJg6Zm6BD 7SyaPM1LIs+G6A6SJINWI2ZCo6MrsHSSIVhPbJSSZV2ZBxATbujoraLwCt/4mYUq2CwyGN YmJeV8qKssbLRmwqYkiJStw6PSObKKDBm0L4Hh4SihjrT7uEZhx3FNQ3/aGihvLoVflkmc nxibE/VR8YBMACIw2I9ZeYnoFSCO717I8G/YXgrP/NARYKrCsjiPxQdwe/QWFlopJDfGdy e+8GzfC84iP81Sfk/QATbtRUMxAqlC9xy/sDWMT+tgyjzuFsql588SkP4uBfjw== 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 4TPjyS3hlszxj0; Wed, 31 Jan 2024 00:46:08 +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 40V0k87Y063405; Wed, 31 Jan 2024 00:46:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40V0k849063402; Wed, 31 Jan 2024 00:46:08 GMT (envelope-from git) Date: Wed, 31 Jan 2024 00:46:08 GMT Message-Id: <202401310046.40V0k849063402@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: add51cc280f3 - stable/14 - Add kcmp(2) kernel bits 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/14 X-Git-Reftype: branch X-Git-Commit: add51cc280f3a48abb2f4fc2e2e4f56efc186d54 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=add51cc280f3a48abb2f4fc2e2e4f56efc186d54 commit add51cc280f3a48abb2f4fc2e2e4f56efc186d54 Author: Konstantin Belousov AuthorDate: 2024-01-19 19:49:36 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-30 20:24:42 +0000 Add kcmp(2) kernel bits (cherry picked from commit d8decc9ae31af7ffc77276c89639fb13eb1020cc) --- sys/kern/sys_generic.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ sys/kern/syscalls.master | 10 +++++- sys/sys/syscallsubr.h | 2 ++ sys/sys/systm.h | 2 ++ sys/sys/unistd.h | 7 ++++ 5 files changed, 107 insertions(+), 1 deletion(-) diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index 961bfeaf2bad..b3aaa2956d6f 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -67,6 +67,7 @@ #include #include #include +#include #include #include #include @@ -2073,3 +2074,89 @@ kern_posix_error(struct thread *td, int error) td->td_retval[0] = error; return (0); } + +int +kcmp_cmp(uintptr_t a, uintptr_t b) +{ + if (a == b) + return (0); + else if (a < b) + return (1); + return (2); +} + +static int +kcmp_pget(struct thread *td, pid_t pid, struct proc **pp) +{ + if (pid == td->td_proc->p_pid) { + *pp = td->td_proc; + return (0); + } + return (pget(pid, PGET_CANDEBUG | PGET_NOTWEXIT | PGET_HOLD, pp)); +} + +int +kern_kcmp(struct thread *td, pid_t pid1, pid_t pid2, int type, + uintptr_t idx1, uintptr_t idx2) +{ + struct proc *p1, *p2; + struct file *fp1, *fp2; + int error, res; + + res = -1; + p1 = p2 = NULL; + error = kcmp_pget(td, pid1, &p1); + if (error == 0) + error = kcmp_pget(td, pid2, &p2); + if (error != 0) + goto out; + + switch (type) { + case KCMP_FILE: + case KCMP_FILEOBJ: + error = fget_remote(td, p1, idx1, &fp1); + if (error == 0) { + error = fget_remote(td, p2, idx2, &fp2); + if (error == 0) { + if (type == KCMP_FILEOBJ) + res = fo_cmp(fp1, fp2, td); + else + res = kcmp_cmp((uintptr_t)fp1, + (uintptr_t)fp2); + fdrop(fp2, td); + } + fdrop(fp1, td); + } + break; + case KCMP_FILES: + res = kcmp_cmp((uintptr_t)p1->p_fd, (uintptr_t)p2->p_fd); + break; + case KCMP_SIGHAND: + res = kcmp_cmp((uintptr_t)p1->p_sigacts, + (uintptr_t)p2->p_sigacts); + break; + case KCMP_VM: + res = kcmp_cmp((uintptr_t)p1->p_vmspace, + (uintptr_t)p2->p_vmspace); + break; + default: + error = EINVAL; + break; + } + +out: + if (p1 != NULL && p1 != td->td_proc) + PRELE(p1); + if (p2 != NULL && p2 != td->td_proc) + PRELE(p2); + + td->td_retval[0] = res; + return (error); +} + +int +sys_kcmp(struct thread *td, struct kcmp_args *uap) +{ + return (kern_kcmp(td, uap->pid1, uap->pid2, uap->type, + uap->idx1, uap->idx2)); +} diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index f7c235ced26c..a50d7723378c 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -3338,6 +3338,14 @@ _Out_opt_ _Contains_long_timet_ struct itimerspec *old_value ); } - +588 AUE_NULL STD { + int kcmp( + pid_t pid1, + pid_t pid2, + int type, + uintptr_t idx1, + uintptr_t idx2 + ); + } ; vim: syntax=off diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 15e05985e75f..29c7c364ccf6 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -200,6 +200,8 @@ int kern_ioctl(struct thread *td, int fd, u_long com, caddr_t data); int kern_jail(struct thread *td, struct jail *j); int kern_jail_get(struct thread *td, struct uio *options, int flags); int kern_jail_set(struct thread *td, struct uio *options, int flags); +int kern_kcmp(struct thread *td, pid_t pid1, pid_t pid2, int type, + uintptr_t idx1, uintptr_t idx2); int kern_kevent(struct thread *td, int fd, int nchanges, int nevents, struct kevent_copyops *k_ops, const struct timespec *timeout); int kern_kevent_anonymous(struct thread *td, int nevents, diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 0e90b6062b72..9a0932e50dc9 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -487,6 +487,8 @@ int poll_no_poll(int events); /* XXX: Should be void nanodelay(u_int nsec); */ void DELAY(int usec); +int kcmp_cmp(uintptr_t a, uintptr_t b); + /* Root mount holdback API */ struct root_hold_token { int flags; diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h index 77df90cd26b1..1b9262c75af4 100644 --- a/sys/sys/unistd.h +++ b/sys/sys/unistd.h @@ -197,6 +197,13 @@ RFPROCDESC | RFSPAWN | RFPPWAIT) #define RFKERNELONLY (RFSTOPPED | RFHIGHPID | RFPROCDESC) +/* kcmp() options. */ +#define KCMP_FILE 100 +#define KCMP_FILEOBJ 101 +#define KCMP_FILES 102 +#define KCMP_SIGHAND 103 +#define KCMP_VM 104 + #define SWAPOFF_FORCE 0x00000001 /*