From nobody Wed Dec 3 23:20:01 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 4dMDBT5k8Mz6J1rF for ; Wed, 03 Dec 2025 23:20:01 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dMDBT47hBz3bFB for ; Wed, 03 Dec 2025 23:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764804001; 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=10yA3lewqrGwlAfWywfmq8U8iZGaEMlH+J+dWmd2Gq4=; b=sN1hUcVhvYvKzNh+xBKOCILXEHD06TkHT1hQU2jrloHfmmxZSWbuPhEvc1WBjJSkrc2jk3 lO7pJsipb1BLwFGB44TvmfXgMHVAHXuYQtDY9J2cNCsTypTRI4pTKyEuY4NHoG4NNQqtec j+kY4anhC6mVyi97vTDrgOzJYU4MRL6Krwuouwtha58kM4iDngL1XmVRTnAmWWXYTgOFNR sBlbmkLZ+TvIPuZ7k0xqzPqEznxZrbVsfbfGeuXRtZ0tD4hWd51GOtPkkVxbO4UosSW+mq KJcvb2Inx7BBZd+Asq/vNjBdiCq5FrOGjYt9fA31aoY7NP1ZzaTShNradS+RYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764804001; 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=10yA3lewqrGwlAfWywfmq8U8iZGaEMlH+J+dWmd2Gq4=; b=FsSWJRwXHxljfH4LNcgMtqxycHJWZw+CBf6venuwaLFd5dnKySWwmgyNzf/DKrncOSXYv5 +mLIZtRm/SrNXJj9pQQG4xZ8N1piAuCIj3RUf8KUMDAoE3yD7N6Qyxd6Hoa1tVSYYVHcpI FaecKCKkJUe3eARRgnMMtaqEQrHBVC6+kUO5aALEDlfMSxVAX1jX+VGEf6wEFzEz+fddrZ lTwwyMH1cceC8tS/ubO/d/SzITQy+WGHsQE9UDCpoBsQNPaIjZCC1wqgNBvyFhuKH6BIEu F/qrOoT8PfrvN4ro37RjVwWIh88rB36VtXWRoCkaZH8Meyp4ObFPe2nkVck5oA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764804001; a=rsa-sha256; cv=none; b=ZiwWGCzp4M4KKALiHJr+GdpJ0NTOlMvHakEaVLvhrgS9yKhLcFzviVKMksUpFjhTtGSVZw VPTqxWRDX1fy71BJWI1+5sFdQhofDjjJJCryaAOPUxMhs04Cq0W1WyBezjW/stTm89z+fk lXL8UHiH3840tMrTUydnVhIg66qsZH44lJ9y2w1vVI03hOPM3n6uUUbuJbpOmUEV29/8ps CLvw4eCuHiGn7WkJszz/ESfEI89EHevXh5Qq3mME51tiWepyJHWNpFI+10CdV+sn5qBvuP FLjvfYlNwwCUJAQNY8zAU1JJpN8JBAXXurtdfx2UOW/n+Ou7ikrPfhFfqPdcIw== 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 4dMDBT3WGnzy4H for ; Wed, 03 Dec 2025 23:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d56a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 23:20:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 845896655815 - main - bpf: calculate net.bpf.stats buffer size dynamically 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 845896655815eaf339953e2aa48d79ca4539874b Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 23:20:01 +0000 Message-Id: <6930c5a1.3d56a.1c37f13b@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=845896655815eaf339953e2aa48d79ca4539874b commit 845896655815eaf339953e2aa48d79ca4539874b Author: Gleb Smirnoff AuthorDate: 2025-12-03 23:16:33 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-03 23:19:45 +0000 bpf: calculate net.bpf.stats buffer size dynamically This removed the global counter, that was updated in a racy manner. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53868 --- sys/net/bpf.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index f5302059d5eb..aff0d3c761ad 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -178,7 +178,6 @@ struct bpf_dltlist32 { CK_LIST_HEAD(bpf_iflist, bpf_if); static struct bpf_iflist bpf_iflist = CK_LIST_HEAD_INITIALIZER(); static struct sx bpf_sx; /* bpf global lock */ -static int bpf_bpfd_cnt; static void bpfif_ref(struct bpf_if *); static void bpfif_rele(struct bpf_if *); @@ -760,7 +759,6 @@ bpf_attachd(struct bpf_d *d, struct bpf_if *bp) bpf_wakeup(d); BPFD_UNLOCK(d); - bpf_bpfd_cnt++; CTR3(KTR_NET, "%s: bpf_attach called by pid %d, adding to %s list", __func__, d->bd_pid, d->bd_writer ? "writer" : "active"); @@ -864,7 +862,6 @@ bpf_detachd(struct bpf_d *d, bool detached_ifp) bpf_wakeup(d); } BPFD_UNLOCK(d); - bpf_bpfd_cnt--; /* Call event handler iff d is attached */ if (error == 0) @@ -3044,7 +3041,8 @@ bpf_stats_sysctl(SYSCTL_HANDLER_ARGS) { static const struct xbpf_d zerostats; struct xbpf_d *xbdbuf, *xbd, tempstats; - int index, error; + u_int bpfd_cnt, index; + int error; struct bpf_if *bp; struct bpf_d *bd; @@ -3074,25 +3072,33 @@ bpf_stats_sysctl(SYSCTL_HANDLER_ARGS) bpf_zero_counters(); return (0); } - if (req->oldptr == NULL) - return (SYSCTL_OUT(req, 0, bpf_bpfd_cnt * sizeof(*xbd))); - if (bpf_bpfd_cnt == 0) - return (SYSCTL_OUT(req, 0, 0)); - xbdbuf = malloc(req->oldlen, M_BPF, M_WAITOK); + bpfd_cnt = 0; BPF_LOCK(); - if (req->oldlen < (bpf_bpfd_cnt * sizeof(*xbd))) { + CK_LIST_FOREACH(bp, &bpf_iflist, bif_next) { + CK_LIST_FOREACH(bd, &bp->bif_wlist, bd_next) + bpfd_cnt++; + CK_LIST_FOREACH(bd, &bp->bif_dlist, bd_next) + bpfd_cnt++; + } + if (bpfd_cnt == 0 || req->oldptr == NULL) { + BPF_UNLOCK(); + return (SYSCTL_OUT(req, 0, bpfd_cnt * sizeof(*xbd))); + } + if (req->oldlen < bpfd_cnt * sizeof(*xbd)) { BPF_UNLOCK(); - free(xbdbuf, M_BPF); return (ENOMEM); } + xbdbuf = malloc(bpfd_cnt * sizeof(*xbd), M_BPF, M_WAITOK); index = 0; CK_LIST_FOREACH(bp, &bpf_iflist, bif_next) { /* Send writers-only first */ CK_LIST_FOREACH(bd, &bp->bif_wlist, bd_next) { + MPASS(index <= bpfd_cnt); xbd = &xbdbuf[index++]; bpfstats_fill_xbpf(xbd, bd); } CK_LIST_FOREACH(bd, &bp->bif_dlist, bd_next) { + MPASS(index <= bpfd_cnt); xbd = &xbdbuf[index++]; bpfstats_fill_xbpf(xbd, bd); }