From nobody Wed Dec 3 23:20:00 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 4dMDBT02qGz6J1pJ 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 4dMDBS41z3z3Zmp for ; Wed, 03 Dec 2025 23:20:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764804000; 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=YNZEIDK9EKFu1KKil9RImkDPmO4O/CRznrLkkWvKq4c=; b=MvIZDlY6p/CMY/iueNkO9kb3ATRZ3JPq4vpND2iO6vnqnbyzP6QvYhI2jwz1VcqRChctVH HA3O1BrFpH5Sfd3jiuDp5uwWYurCfBV1bQn2KGE5wqOd55AEth4WdU7ilC3H3tjdcBdB5S pb8M6uPRLHfFEZqvoy84h0iq/HE7LiRg15E58MUDPpAW5/PmVOogoo2FpESxCM0L2elMRc 2fbtH34iplFS51vGkoo/+zREJhpel9D5YF3r9zIW9iLu32tBBR7yGOB+qeym5OBftibN0E vtRTEpw4LkgWTa+AtQte4frgOj5kF+mn+aK/ErKuJXr3IltJP6kjxgS1u4QWPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764804000; 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=YNZEIDK9EKFu1KKil9RImkDPmO4O/CRznrLkkWvKq4c=; b=qgfTDK8qTVIJcwa0R4qI82ww/47CWzRxaQZv9+3Dnsu8cfha+xP7k2Ot74zNzoIE4AroDh cZiGJ3S/ljoEKXtz4ykh4HU99DB/Dl8wSk9a0gp4tB0EsNHs+9tHjKLWMJMb3jzpJ9u54h EiPAPQhW1ue7QblmKnyTJfI3azEbSi6CKL3xDaScqzRmTj9PrwT62kuVwiNsRBpAuY/sYe Amc3C4/fR3TzXaKUcGJv1ThhLqkkZl/kcpBSaJMqiqsOtNlY7hHw0riey53sHhDv7EzS8G Zl38teAMRdx5r4qBdOHHnQOxnQ3k99p7t4HQgbNrkqTOUoYXqx96VJYeXW1Ayw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764804000; a=rsa-sha256; cv=none; b=fWCcsKCWubrVePAxbPIfaMQXvoyH7Q5eh0VyyySdzJWdqh7KZLXNUK2zkoQ0SMuQoijmE+ 5vfeSIbD0eNRMzBsPy5FJSrYdeJbloDBl0Phc/Vg/MN8CKU06a62vs1I7UzQbe/mgnDcOP jN4DfWdsGTlUc+pWjk06CEQhEjcCh+bCAyNT8OtT1QnmSQoo8Yv9X3DvYMXgZ8hBLi+jdx ANlHH61kSiFbnRocCVvQbtZEy/oU2+ZCU0YNbsYcIcqkC6rK7f9OOMdwrihCoIID5rUKSw 5i5o8zyYP/ZCu6LJtY3IsVo0HGgXSEAEc4QCkrluImiPK9dJXPkVj2yWycvlcQ== 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 4dMDBS39TlzyZ7 for ; Wed, 03 Dec 2025 23:20:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dbcb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 03 Dec 2025 23:20:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 57673d166940 - main - bpf: retire struct bpf_if_ext 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57673d166940feafe09f411294b57fa6c8af3585 Auto-Submitted: auto-generated Date: Wed, 03 Dec 2025 23:20:00 +0000 Message-Id: <6930c5a0.3dbcb.36f5bf5b@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=57673d166940feafe09f411294b57fa6c8af3585 commit 57673d166940feafe09f411294b57fa6c8af3585 Author: Gleb Smirnoff AuthorDate: 2025-12-03 23:16:15 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-03 23:19:44 +0000 bpf: retire struct bpf_if_ext The struct was used for bpf_if to bif_dlist masking, that is used to optimize bpf_peers_present() call. The only functional change here is that bif_dlist and bif_next swap their places in the structure. Both belong to the first cache line anyway. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53867 --- sys/net/bpf.c | 13 ++++++------- sys/net/bpf.h | 13 ++++--------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 23a23fbfe22e..f5302059d5eb 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -93,14 +93,11 @@ MALLOC_DEFINE(M_BPF, "BPF", "BPF data"); -static const struct bpf_if_ext dead_bpf_if = { - .bif_dlist = CK_LIST_HEAD_INITIALIZER() -}; +static const struct bpfd_list dead_bpf_if = CK_LIST_HEAD_INITIALIZER(); struct bpf_if { -#define bif_next bif_ext.bif_next -#define bif_dlist bif_ext.bif_dlist - struct bpf_if_ext bif_ext; /* public members */ + struct bpfd_list bif_dlist; /* list of all interfaces */ + CK_LIST_ENTRY(bpf_if) bif_next; /* descriptor list */ u_int bif_dlt; /* link layer type */ u_int bif_hdrlen; /* length of link header */ struct bpfd_list bif_wlist; /* writer-only list */ @@ -110,7 +107,9 @@ struct bpf_if { struct epoch_context epoch_ctx; }; -CTASSERT(offsetof(struct bpf_if, bif_ext) == 0); +/* See bpf_peers_present() in bpf.h. */ +_Static_assert(offsetof(struct bpf_if, bif_dlist) == 0, + "bpf_if shall start with bif_dlist"); struct bpf_program_buffer { struct epoch_context epoch_ctx; diff --git a/sys/net/bpf.h b/sys/net/bpf.h index dfb8373bb329..b18840bfd2bf 100644 --- a/sys/net/bpf.h +++ b/sys/net/bpf.h @@ -410,11 +410,6 @@ SYSCTL_DECL(_net_bpf); struct bpf_if; CK_LIST_HEAD(bpfd_list, bpf_d); -struct bpf_if_ext { - CK_LIST_ENTRY(bpf_if) bif_next; /* list of all interfaces */ - struct bpfd_list bif_dlist; /* descriptor list */ -}; - void bpf_bufheld(struct bpf_d *d); int bpf_validate(const struct bpf_insn *, int); void bpf_tap(struct bpf_if *, u_char *, u_int); @@ -435,12 +430,12 @@ void bpfilterattach(int); u_int bpf_filter(const struct bpf_insn *, u_char *, u_int, u_int); static __inline bool -bpf_peers_present(struct bpf_if *bpf) +bpf_peers_present(const struct bpf_if *bpf) { - struct bpf_if_ext *ext; + const struct bpfd_list *dlist; - ext = (struct bpf_if_ext *)bpf; - return (!CK_LIST_EMPTY(&ext->bif_dlist)); + dlist = (const struct bpfd_list *)bpf; + return (!CK_LIST_EMPTY(dlist)); } #define BPF_TAP(_ifp, _pkt, _pktlen) \