From nobody Mon Apr 07 01:29:05 2025 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 4ZWBSf2Jktz5sNY4; Mon, 07 Apr 2025 01:29:06 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZWBSd6LYbz3whh; Mon, 07 Apr 2025 01:29:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743989345; 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=vAl9tmIdHJcr8qv1tWcXG5cw6eZrSsWcGeiAUEKrhtQ=; b=Myp4adlIDtq3XSaNJ3i11oToFvzC9AvF3sjmHdWqUa52V1r8ut7QMsmQbJHjePS67jWqk6 Awdh82/XEHnruxC3TV5BrTrcoySsLCCnAZU+FpvOtLR8bSXaP5JqqnPCksFUJe+ng0gkog Q9JT+dmMhxfTjD/XtQxU0udAvHyKG8movRSWrf0198aDykiMQgBmcwfVoFPZCN/FTRHY6u V4Oi9wCjze+Xfe/q30mWM1k/rmRtY/uAHgpKtR9mnWbMwWZ7Ru5a900iBPjjkpxuVhBTMr gBQBkUHIWizr/eCOl0m6WFPwP+JaxCf2hx23pR3UsOWGiwByIIfi3OhAojpf0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743989345; a=rsa-sha256; cv=none; b=v5dFNyKqElUfZjschYdLrBKHcQ6bU3eP1OO0Gfr4rmzxcRVLWlH++fKd3BQnI8ET6xjCrk sf1xpdW2wVI3rKjIWM6XnoRf8/8+q6/VbFH3IWAvYu4sVfG0WUuxeCsga/5fmBkxI7wRK5 osOZE9Z/vJpUdGH1VZn/o4J4RgmsQpDHaKceUeELa3swqGsvZWFyVtoNaLYw5b5CA3uNfE KxfFu6y0AFnuyDCzqB9JkxeewkeVg0G725UzErSMJUilaBCRWMaCycy7arvwHkKVM0jeYv 85qVEulogUL2xe4mBjUrP3wWcM8NQA/86I2bGdUJq7lAeqriFNJa6mGCNx9GnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743989345; 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=vAl9tmIdHJcr8qv1tWcXG5cw6eZrSsWcGeiAUEKrhtQ=; b=jSscRWNHkykR5Luc2+5RWXwsw+LqVSpUfxSKQ8pU/n4UIFuroDtyrpgy5dYkHK5OiG9zwk SykaW4lGUcGTK1cgkOIL86gK01dP7nrom2SGl/8ezXAx+Acu1OC34cEH3jQnCaFlGEhDUD F+Kd+2jT+4pz7hxuxydcxfTZUNHD6YzCr62jaFjU6cY5BVg5qBtlwGe+lCLXsWlzUqX5pf sac3zFjCLosZTwef9g6ojiCmLr5NHyvULt6xqftUyGYjvm22ciJtejJGoECrvd96g3IQ+r VxuUTdrFznHcWLhb+EXU5Cf0u6ZaO6zdnUjQUIxAxemMWcWN5uIAQ+krwhaKMg== 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 4ZWBSd55WSz953; Mon, 07 Apr 2025 01:29:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5371T5qI063092; Mon, 7 Apr 2025 01:29:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5371T59m063089; Mon, 7 Apr 2025 01:29:05 GMT (envelope-from git) Date: Mon, 7 Apr 2025 01:29:05 GMT Message-Id: <202504070129.5371T59m063089@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: c69b90d08b29 - stable/14 - kinfo_knote: add knt_kq_fd member 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: c69b90d08b29d0bf6ae0d8b6ae0a29c4ad3c8886 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c69b90d08b29d0bf6ae0d8b6ae0a29c4ad3c8886 commit c69b90d08b29d0bf6ae0d8b6ae0a29c4ad3c8886 Author: Konstantin Belousov AuthorDate: 2025-03-13 23:34:40 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-07 01:28:21 +0000 kinfo_knote: add knt_kq_fd member (cherry picked from commit 9d1e7a7e8e8bde5b343226ce0fefc583932d5af3) --- sys/kern/kern_event.c | 19 ++++++++++++------- sys/sys/user.h | 1 + 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index b0106b5fa9ce..e9808e3c6e19 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -2873,7 +2873,7 @@ knote_status_export(int kn_status) static int kern_proc_kqueue_report_one(struct sbuf *s, struct proc *p, - struct kqueue *kq, struct knote *kn) + int kq_fd, struct kqueue *kq, struct knote *kn) { struct kinfo_knote kin; int error; @@ -2882,6 +2882,7 @@ kern_proc_kqueue_report_one(struct sbuf *s, struct proc *p, return (0); memset(&kin, 0, sizeof(kin)); + kin.knt_kq_fd = kq_fd; memcpy(&kin.knt_event, &kn->kn_kevent, sizeof(struct kevent)); kin.knt_status = knote_status_export(kn->kn_status); kn_enter_flux(kn); @@ -2895,7 +2896,8 @@ kern_proc_kqueue_report_one(struct sbuf *s, struct proc *p, } static int -kern_proc_kqueue_report(struct sbuf *s, struct proc *p, struct kqueue *kq) +kern_proc_kqueue_report(struct sbuf *s, struct proc *p, int kq_fd, + struct kqueue *kq) { struct knote *kn; int error, i; @@ -2904,7 +2906,8 @@ kern_proc_kqueue_report(struct sbuf *s, struct proc *p, struct kqueue *kq) KQ_LOCK(kq); for (i = 0; i < kq->kq_knlistsize; i++) { SLIST_FOREACH(kn, &kq->kq_knlist[i], kn_link) { - error = kern_proc_kqueue_report_one(s, p, kq, kn); + error = kern_proc_kqueue_report_one(s, p, kq_fd, + kq, kn); if (error != 0) goto out; } @@ -2913,7 +2916,8 @@ kern_proc_kqueue_report(struct sbuf *s, struct proc *p, struct kqueue *kq) goto out; for (i = 0; i <= kq->kq_knhashmask; i++) { SLIST_FOREACH(kn, &kq->kq_knhash[i], kn_link) { - error = kern_proc_kqueue_report_one(s, p, kq, kn); + error = kern_proc_kqueue_report_one(s, p, kq_fd, + kq, kn); if (error != 0) goto out; } @@ -2931,7 +2935,7 @@ sysctl_kern_proc_kqueue(SYSCTL_HANDLER_ARGS) struct file *fp; struct kqueue *kq; struct sbuf *s, sm; - int error, error1, *name; + int error, error1, kq_fd, *name; name = (int *)arg1; if ((u_int)arg2 != 2) @@ -2949,7 +2953,8 @@ sysctl_kern_proc_kqueue(SYSCTL_HANDLER_ARGS) #endif td = curthread; - error = fget_remote(td, p, name[1] /* kqfd */, &fp); + kq_fd = name[1]; + error = fget_remote(td, p, kq_fd, &fp); if (error != 0) goto out1; if (fp->f_type != DTYPE_KQUEUE) { @@ -2965,7 +2970,7 @@ sysctl_kern_proc_kqueue(SYSCTL_HANDLER_ARGS) sbuf_clear_flags(s, SBUF_INCLUDENUL); kq = fp->f_data; - error = kern_proc_kqueue_report(s, p, kq); + error = kern_proc_kqueue_report(s, p, kq_fd, kq); error1 = sbuf_finish(s); if (error == 0) error = error1; diff --git a/sys/sys/user.h b/sys/sys/user.h index aa8c38d13288..34031c99fc97 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -679,6 +679,7 @@ struct kinfo_vm_layout { #define KNOTE_EXTDATA_PIPE 2 struct kinfo_knote { + int knt_kq_fd; struct kevent knt_event; int knt_status; int knt_extdata;