From nobody Wed Oct 28 15:07:45 2026 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 4jF9hd3Pz8z6xc0R for ; Wed, 28 Oct 2026 15:07:45 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jF9hd1hvsz4gS1 for ; Wed, 28 Oct 2026 15:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793200065; 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=WE+S9ARktZHK2GPcuIajLQwhm7cnUjLucb3IlvJ30KQ=; b=FLCpxrVkTDBC5/v2o3GaSGzSQeAdrSGY74c0JaoPvxIQeDfKxi7HsVKn/F2Oq6mGvv49yX +TgC+nA0YW9H9lt5Vn4P7D7tF4Ax1L9USC3MTsMPosn8REjUqBX6GEAzheAL/Kb4FkdDpa kfd63RfeQLxO6QNLpFpCRJYIAu3oSJY3RfBICRu7KIJoUZgvlpbjqgELnkovCteW5IVjVa 7Zj/BeYGjOGwRWARgv5hbslvn2mGgrdU3NiV/VwyjwoPQg/jKvLC9gaAhm9i+mKGE0/jg/ SxadlwiFDB/MKwFqpT+mj4Rb7j2NoWqGBi5aIoOGBTHeFFJs5g72E/Eglcy74Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793200065; b=i5wUtp2NmC+W9Q3rU4hp6r0Yi7sKOMgrNxSU+bumnE1U/vkf12gi3DOniGJgOa3UvDuxqF 3SQRl5qv4VVhoRnVwxg4j0Bv0V548YCDHOSgeZ1aUzkxIkUa4vE7FAFeU7pWy8JUjE7AJ/ Ghf5d/Wl3a4ZtK0/VNu/VYiAJvuWT1cxftpD2v/7Z8nXFhUYetYLdYqSUoo1kPoLFIP2AB pwObedd91aKPk9pvoZ7YBOfBk4qY5PQKWJ4wanA84PU38pyywj/tXfXrIlxO8xcUFkayRF CDzOonRF8Q31mwQoHeVen6iyYTTJo9X5GRxuyfdeXVlIt/WeII8zBgGA3CTHuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793200065; 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=WE+S9ARktZHK2GPcuIajLQwhm7cnUjLucb3IlvJ30KQ=; b=EwcdVrBxIw8AKQscNKEbdX51W9CUT9JFtTT+0WUICDSPP8sX2PvsmlvrxiMt3udnceaN4j Hbg9iUK/V5v3uA/lUjkWifPz7DNzIsd65h9hTA+vh6l+U3NXnSIw7AwJkiyJmCPGtCghCb bEghQ12FLyxjzSUfUX2qIiGQbMb3Nl9gNDCB3dkxtmCh4/MgzNiIq0uOC5ghZSVo/VkZE3 GVtYgG7WPnQyK4mYlLSx002tWzSKJ630sMv9wo2ce+5mAEF7tseNRm99glRCVPklI92YmE llJCbNc/wyqn4bSOhIvNMeH3tXt8ytoX2JpmYjNEaKSnYOLrfHZnxtuc5PNy1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jF9hd1M7rz1CJM for ; Wed, 28 Oct 2026 15:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21d8c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 15:07:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Abdelkader Boudih From: Adrian Chadd Subject: git: 170480880433 - stable/15 - kqueue: do not buffer the whole knote report when sizing it List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 1704808804333ec3feb74f52158e9ee7e7db8b88 Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 15:07:45 +0000 Message-Id: <6ae20fc1.21d8c.7dffef4b@gitrepo.freebsd.org> The branch stable/15 has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=1704808804333ec3feb74f52158e9ee7e7db8b88 commit 1704808804333ec3feb74f52158e9ee7e7db8b88 Author: Abdelkader Boudih AuthorDate: 2026-07-31 15:46:38 +0000 Commit: Adrian Chadd CommitDate: 2026-10-28 15:07:21 +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 (cherry picked from commit ff97443beef614a12652cb96ccebe95e9046e82a) --- 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 5bfa6f8a800e..058dbca25a72 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -3368,18 +3368,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); }