From nobody Mon Mar 24 02:24:46 2025 X-Original-To: dev-commits-src-main@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 4ZLcMM2Y5dz5r9cl; Mon, 24 Mar 2025 02:24:47 +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 4ZLcML6Wycz4949; Mon, 24 Mar 2025 02:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742783086; 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=r0vl2ppfQkYht1PnkwafhSPYJGjT7G8qZJsGy+oH2Mg=; b=D0gmZDEIRATXN7GhE5UU+b+YX5oQTgRFZ8W54AAMlsFPjSEnUXGfg911wCEdRzxmeEsWPR RVOrYEox6SlygPmDNjQlfinR4SJpJsh2Lz5yKRRQ3G2v+a6Te4+dENNj2DS3+Dq66gW2pN OZE7IbQJKeovfzZ4AW/SsffeEs5gb4OczSZAPAkZ4rUNvcPO1l488EgFrnOOByhA3KArnH 7S0l+ZxotKuDN7PFwBsdU1yzzPNG6xyBQleFvjQ+ikPls3u7cnjXjnAE8vvQBxpSR6VBrQ ReZUKYa4qvHqsrjrcURemmvdWthMTFbMl03t2rzVRj4ZfLc/8KRqjIRXuuv3Dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742783086; a=rsa-sha256; cv=none; b=P0Aq39RJhGhDHn1QzUZeWQ/WuvhtNgHwwh9P7dXol5nDNtYr3UpfWupmiZ2o0mVLrtxEnA om9pgvQFf0QB3jJZVCl+9loRhpEtxlvEJx+ZRZwDlkAfZQIBBbkWaysHotasCofoCjE3HL 0sr6x8Cfd6aQGTTtVeKt2+60xIYcaPVcPDD16MPMo3cF+OK68erE84NuQfThT8qCh8XDIj Csh+Z6M+dTSM6iMh/ZEALQdoSKbnIT+/3rwLlIZG9NLXjTiWDHzCUO0sm4ByRpTbCV3Q67 gLmfCdGFT6VZ/dbJRKcOjFasSCjRjpYp9R7a1SPVM5VwRlOVLz5fM+0jWn4GXQ== 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=1742783086; 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=r0vl2ppfQkYht1PnkwafhSPYJGjT7G8qZJsGy+oH2Mg=; b=p1sdYAq2DvGZrQ67wc43MCrztLBf3Uhi56SFxzwfbIhZ7Cb6M8gwBoUub9t308FJT1PskS Ggtd8hj1eQIKvfElJ/qUdLAMEFkauLVAenJS+rFQpK+VHxMWRVRLTzg56TLYyOhkD5256/ 8t0mU98NGxiDTEamxy1RrWIX/mgugYSabFTIceqZ1wNnD4LQMdM45veP52mQkGsl3vAQGw NMXlPB6JNAo8q7YPXC5zueMLsNloPHd1UWx2gIgWJGcoj+zAeEzY2qdKToM7yKqOx0w1cV Kc/Z0wya2Y1c5gsTu2ekXW3mQZ1jlfcHxJak8VM978SWRB9i2YgrTi7xcK2UuA== 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 4ZLcML5vsJzbY6; Mon, 24 Mar 2025 02:24:46 +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 52O2OkEu069659; Mon, 24 Mar 2025 02:24:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52O2Ok3c069656; Mon, 24 Mar 2025 02:24:46 GMT (envelope-from git) Date: Mon, 24 Mar 2025 02:24:46 GMT Message-Id: <202503240224.52O2Ok3c069656@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: fee6a52e4338 - main - sysctl_kern_proc_kqueue(): convert to use sbuf List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: fee6a52e433811fde5a9f6be06bb446b5336aba3 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fee6a52e433811fde5a9f6be06bb446b5336aba3 commit fee6a52e433811fde5a9f6be06bb446b5336aba3 Author: Konstantin Belousov AuthorDate: 2025-03-13 22:30:32 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-24 02:24:13 +0000 sysctl_kern_proc_kqueue(): convert to use sbuf Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D49372 --- 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: