From nobody Fri Jul 31 15:54:52 2026 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 4hBVy462hKz6n42K for ; Fri, 31 Jul 2026 15:54:52 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hBVy44sxNz3r2S for ; Fri, 31 Jul 2026 15:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785513292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ID3pWo90vv6f5gWFY9DjJfALT5FjqtFFDC6dBqCCKCA=; b=pmorddgq22vjlXp3OxH8DWQsjVLYh+m/d9E1GYB660fVk5U7/kv4xa1QNc7WNXg352oHQZ 0TurFu0JDh2V0C+ZKF1B+C8iOTfnQbn+v46xdQoAqUni1qnBsJUtMAqKddaskBVMcCJQ1b JilsRQN30af12zm/xwt7JIomce47OlGLteGoz8XFxT5d5PF6vsESwuLDrH3BGnV6+L3mYY +EXXCXZwXEQbkU3C22cEJ7uruZ5NkIjL65CDYPx+yiqMQb5mLShRkXuUkVFSROOPEC8R2D SfR2CY9wZcrSiOMbMbXXXgB8tOclklNzArGrRXePrMBobEoPTNjlQFc6MA3ybw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785513292; a=rsa-sha256; cv=none; b=LC6kftLlrY3wuG5k/lfjJnEZ8bUX0+O9/sen7yfiiZ39r819dIWg127UwUlp2qVyszXSk+ xe91OfvsmM/I6/EhXc6wSzUXxlPtP9ActURiaoiCw8JMEPzSoSvpb5niC31INwg0WKlUe+ 1vW4RiprWTjSmlHpLj4O8b86rDBM+Vh3gHDwRyuceZbng+ATDi21rIYdkzA6+zzPL1bEfO GgiAP/x3FzEjkbyYL3ZfNSqDy7Wu9j/3/PsOnBQ5vqHP4TvbbVGeMCR2r2xvrNwWCjFupK RkXP7XLSeDP1tuV5wfdTswledue8184ex/U02JUUTXRIbnIpQ55gIZ9tlvJy5A== 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=1785513292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ID3pWo90vv6f5gWFY9DjJfALT5FjqtFFDC6dBqCCKCA=; b=Hy22jK8Srtq4nw9DtXB/eVkgW+2iIkvspG+bOAMfd4jdxG4a2bll6yyMAfdYCV687IZxSu znxeXlR4d5qk74mZGniC1XULyVCGwath6lLcyR4/jhCKn2/DnUg6uuPie+jSneZxSLIk/x cA1Yd4ns0KpHmHeyWF7MzN4DrMnCbz2kQynfnLhD5nCmjJXrjPni3fsDiCPhd17/0FF+2Q iXbohFcI03PN+QVr/SSVRQ6zM7VwhKpORGM2LnOR74SVrUgzD5NCL5lFzFtEg0lRmbb497 5RrxYL6jlcLJi/VCO1U9kbZlO8yvxGlVd4NHXzV9O/Vp27LWYUqmfasWix2q/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hBVy43VQDz15yP for ; Fri, 31 Jul 2026 15:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32695 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 31 Jul 2026 15:54:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Adrian Chadd Subject: git: ff97443beef6 - main - kqueue: do not buffer the whole knote report when sizing it 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff97443beef614a12652cb96ccebe95e9046e82a Auto-Submitted: auto-generated Date: Fri, 31 Jul 2026 15:54:52 +0000 Message-Id: <6a6cc54c.32695.765f48cb@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=ff97443beef614a12652cb96ccebe95e9046e82a commit ff97443beef614a12652cb96ccebe95e9046e82a Author: Abdelkader Boudih AuthorDate: 2026-07-31 15:46:38 +0000 Commit: Adrian Chadd CommitDate: 2026-07-31 15:46:45 +0000 kqueue: do not buffer the whole knote report when sizing it kern_proc_kqueues_out() reported into an intermediate sbuf and copied the result into the caller's. A process that had leaked 468k kqueue descriptors wired 757 MB of M_SBUF while dumping core, over roughly 9M reallocations, then copied the whole thing again. Reviewed by: adrian, markj Differential Revision: https://reviews.freebsd.org/D58536 PR: 296835 MFC after: 1 week --- sys/kern/kern_event.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 28e31a227357..e8395707a29d 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -3359,18 +3359,18 @@ kern_proc_kqueues_out(struct proc *p, struct sbuf *sb, size_t maxlen, size_t sb_len; int error; - if (maxlen == -1 || maxlen == 0) + if (maxlen == -1) + return (kern_proc_kqueues_out1(curthread, p, sb, compat32)); + + if (maxlen == 0) sb_len = 128; else sb_len = maxlen; - s = sbuf_new(&sm, NULL, sb_len, maxlen == -1 ? SBUF_AUTOEXTEND : - SBUF_FIXEDLEN); + s = sbuf_new(&sm, NULL, sb_len, SBUF_FIXEDLEN); error = kern_proc_kqueues_out1(curthread, p, s, compat32); sbuf_finish(s); - if (error == 0) { - sbuf_bcat(sb, sbuf_data(s), MIN(sbuf_len(s), maxlen == -1 ? - SIZE_T_MAX : maxlen)); - } + if (error == 0) + sbuf_bcat(sb, sbuf_data(s), MIN(sbuf_len(s), maxlen)); sbuf_delete(s); return (error); }