From nobody Mon Apr 7 01:29:04 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 4ZWBSd1smtz5sNJy; Mon, 07 Apr 2025 01:29:05 +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 4ZWBSc6b2tz3wYV; Mon, 07 Apr 2025 01:29:04 +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=dQtsa/pL5IBYehUtxPcywBXeCkbqi7jvN0VGuRHspOI=; b=DbHo4Hj/Kasy+UCjdQ0votpAQwbW6zkb9CWPdDS/SGgWyqaAHwVluRaR9Rvl3aI0PJiEBK gqwUar3WdyhEkpqGF/IEQ4f6Zhczf6Ola4QhFM9PCgoo6XkLgRU6Mk5qEZHbYoqDu4kpWK O94O+7Ig+wyGE/A8hH/i0jyLvjNxB2nwwcypnq05wJNVQmq/ucL5kiwx68q8FIpZ8KViHp 9MJPm01huFX0NOeSGbNmfV/MuSDHXUoRlx/PQPRCy9WYLg0dbscHniX+VlcL2LFDlnLBEC VRbEH/4TMt92z/c1W1LUI6K6xl6TR70pet0GXHH8cQrNu2ULRoNVYnDR1T6VEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743989345; a=rsa-sha256; cv=none; b=s1ldTBFWjg5T12UNtS7n3b4dJtnwBe1qwJ4v44b8Q5bWPrbBNUxpU/Wa/mSFB0IiFj18Ao MJqzHeE1iMTE7fUF+qpv4+FMTvzAK5Q3U3lmgFj9TGhD4UyyL6PWapLXw5zN9jlz26zUdW XucgoPpaSz80LzN2rKdT1dbKO0dAQ3ig0WRg8lqdsUbNwI4F7q6fsfPzI2XTt9VAcWeF/Y 1CqjuJ1uazHIecPzhJU3RF1ekTbL2EfJ3uFzc/PMmHvugiIWrhD8m/pwJ9+PtO5jPmZ60Q XkeWOlHRf6VfVaRJ+Q5qhSfgG4+2ftnjLNO8mbQIPFSyyd0xMTHDZu1l7u1nhw== 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=dQtsa/pL5IBYehUtxPcywBXeCkbqi7jvN0VGuRHspOI=; b=igl4lQ6vJQb1bo6Q/toLjx3oAObI7/cRGTdQjKg7T+VqKRAUAFD4pg4fo3A6IE0/Y4euPv eu8lLp4qfpEgHOPN/JQtI4CE7ROLhyhaqQg5CqbgCfOdQ1q03Wq/6bQ9btNSQ4VcJcBZ0r GsSEWYBtdh4J2c5zEhqYgy4gEMm0MDlSQcJcpyRk6+UaSEMOk5oMLTW6uOWnUpJDMMIK6u 1QpEmzOz1qi3hf2CGUzNF711aY2/42bhVJtVJ3gtEvPoJ9/sgDhNDWTsUCrJWDqCWEOnfR H8+t+yVfNHa6zorCaKn94IilxZtS2LmnxVY520eVG9rFjJd7WCtzxUOMV07tSw== 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 4ZWBSc4fBxz9fr; Mon, 07 Apr 2025 01:29:04 +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 5371T4d2063051; Mon, 7 Apr 2025 01:29:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5371T4Cf063048; Mon, 7 Apr 2025 01:29:04 GMT (envelope-from git) Date: Mon, 7 Apr 2025 01:29:04 GMT Message-Id: <202504070129.5371T4Cf063048@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: 52464e913a56 - stable/14 - sysctl_kern_proc_kqueue(): convert to use sbuf 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: 52464e913a568fb419302fe03536ca1a5cd0b508 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=52464e913a568fb419302fe03536ca1a5cd0b508 commit 52464e913a568fb419302fe03536ca1a5cd0b508 Author: Konstantin Belousov AuthorDate: 2025-03-13 22:30:32 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-07 01:28:21 +0000 sysctl_kern_proc_kqueue(): convert to use sbuf (cherry picked from commit fee6a52e433811fde5a9f6be06bb446b5336aba3) --- sys/kern/kern_event.c | 74 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 30 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 14aa3abd1901..b0106b5fa9ce 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -58,6 +58,7 @@ #include #include #include +#include #include #include #include @@ -2871,7 +2872,7 @@ knote_status_export(int kn_status) } static int -sysctl_kern_proc_kqueue_report_one(struct proc *p, struct sysctl_req *req, +kern_proc_kqueue_report_one(struct sbuf *s, struct proc *p, struct kqueue *kq, struct knote *kn) { struct kinfo_knote kin; @@ -2887,13 +2888,41 @@ sysctl_kern_proc_kqueue_report_one(struct proc *p, struct sysctl_req *req, KQ_UNLOCK_FLUX(kq); if (kn->kn_fop->f_userdump != NULL) (void)kn->kn_fop->f_userdump(p, kn, &kin); - error = SYSCTL_OUT(req, &kin, sizeof(kin)); - maybe_yield(); + error = sbuf_bcat(s, &kin, sizeof(kin)); KQ_LOCK(kq); kn_leave_flux(kn); return (error); } +static int +kern_proc_kqueue_report(struct sbuf *s, struct proc *p, struct kqueue *kq) +{ + struct knote *kn; + int error, i; + + error = 0; + 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); + if (error != 0) + goto out; + } + } + if (kq->kq_knhashmask == 0) + 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); + if (error != 0) + goto out; + } + } +out: + KQ_UNLOCK_FLUX(kq); + return (error); +} + static int sysctl_kern_proc_kqueue(SYSCTL_HANDLER_ARGS) { @@ -2901,8 +2930,8 @@ sysctl_kern_proc_kqueue(SYSCTL_HANDLER_ARGS) struct proc *p; struct file *fp; struct kqueue *kq; - struct knote *kn; - int error, i, *name; + struct sbuf *s, sm; + int error, error1, *name; name = (int *)arg1; if ((u_int)arg2 != 2) @@ -2928,34 +2957,19 @@ sysctl_kern_proc_kqueue(SYSCTL_HANDLER_ARGS) goto out2; } - kq = fp->f_data; - if (req->oldptr == NULL) { - error = SYSCTL_OUT(req, NULL, sizeof(struct kinfo_knote) * - kq->kq_knlistsize * 11 / 10); + s = sbuf_new_for_sysctl(&sm, NULL, 0, req); + if (s == NULL) { + error = ENOMEM; goto out2; } + sbuf_clear_flags(s, SBUF_INCLUDENUL); - KQ_LOCK(kq); - for (i = 0; i < kq->kq_knlistsize; i++) { - SLIST_FOREACH(kn, &kq->kq_knlist[i], kn_link) { - error = sysctl_kern_proc_kqueue_report_one(p, req, - kq, kn); - if (error != 0) - goto out3; - } - } - if (kq->kq_knhashmask == 0) - goto out3; - for (i = 0; i <= kq->kq_knhashmask; i++) { - SLIST_FOREACH(kn, &kq->kq_knhash[i], kn_link) { - error = sysctl_kern_proc_kqueue_report_one(p, req, - kq, kn); - if (error != 0) - goto out3; - } - } -out3: - KQ_UNLOCK_FLUX(kq); + kq = fp->f_data; + error = kern_proc_kqueue_report(s, p, kq); + error1 = sbuf_finish(s); + if (error == 0) + error = error1; + sbuf_delete(s); out2: fdrop(fp, td); out1: