From nobody Mon Jun 17 04:03:30 2024 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 4W2bpV3sWGz5NCg5; Mon, 17 Jun 2024 04:03:30 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W2bpV1rqvz4qvH; Mon, 17 Jun 2024 04:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718597010; 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=mlkj/8HTILA+UHkzpdV8ZbBPkeD82Tf0EHx3e+rrmno=; b=hKAsffAqZfPrRHk5RkzKw9ol60+GI7wvLLZ+pXiBwMs4AVJks6FKE4ezZ6D94QwO0hGnZi x4thBnd6mpgLB8wxttYJHgXTk013VUG76rqqpBSMCkOv//gm4oYRQHUqZs3WXuWGMRA3yy zXOVFWG0aFgmFZouzz5vcv4XeLAjswzk7CHHmhPsBHTXklQYY506uxkFQIddPi3/u/3khU FIIjce6wF+KYXAHIlig9XZ5BVE6t2fXOzrZlHxtXJXZ5X5yWwxKV8dq6XkBtDuU9QfAysd /aaE22iPpLWBt6Hg8GPn0K6+Ta6dziceZhrFJAJH2H/kI9woUb2SMCmq4pYhBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718597010; a=rsa-sha256; cv=none; b=DTrbyCn1xI4P+q8QEmlvTxPZwxlnZ+R+fFVVqnMCP4vd8fKENfIv/ziITPrPih4oejhcMO pD1uB5pqbegL4VlyflYVhfilkqLYcaT3/aNM1uGU46fMU6i3CV/kQ4pR1TD7mAohSzEwOx KD3AxcLhCoVKvr7/yPXFLJsRTTm0tizOX8BMPTXFjPszhwN7Rjqtz3JZBu0pcrcc2Xpo15 522myRxAkB0EcPg0qohXmR9WwEPGFXaRFgmsQpMg7amLrFxDe3Rx4qAoL5Qm2b0m0aUqzJ j+5tFNgdjkK56MsqAWMTU5MWeJlciJ0atZjBjVszaSDh892Ng+wVg4B9KHak5Q== 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=1718597010; 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=mlkj/8HTILA+UHkzpdV8ZbBPkeD82Tf0EHx3e+rrmno=; b=oKEYvno0XMmauf7cAt620eiiyQb455IGLLrcYgWLCdORGPNwEESurw5+WOsozKU0yklBFJ FkTUj1e4vQtRsHBTIvlBIZ6ResOXh8eoqdM1qQpUmLb7026molhbDW0xj0qqxwyfU6wqif JCNBd1uHBwXBNx3IUfdiDeD2zRrsQUhrua8Lv8fc/OLnNrDuTDQpSKReMrryQ5rQ1aqfDr MmXH4SJHEqOmYWeOGlBWmq+X+7w7A6JoWu6AF3xxW/slkC/Dyj27HhBk1OttPnVvjNX1PM mxo0pGTIZfjsPg9w0TUBrOUh3j2pbD1wIIvuXC/W8V6BzFXBUe5xPeXWxqLj2g== 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 4W2bpV1Sxcz1Fxm; Mon, 17 Jun 2024 04:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45H43UDK039709; Mon, 17 Jun 2024 04:03:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H43UDI039706; Mon, 17 Jun 2024 04:03:30 GMT (envelope-from git) Date: Mon, 17 Jun 2024 04:03:30 GMT Message-Id: <202406170403.45H43UDI039706@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 954e548b7e88 - stable/14 - pflog: Correctly check if bpf peers are present 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 954e548b7e88b7490aa5b23d16df7972c407bef1 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=954e548b7e88b7490aa5b23d16df7972c407bef1 commit 954e548b7e88b7490aa5b23d16df7972c407bef1 Author: Zhenlei Huang AuthorDate: 2024-06-09 01:05:22 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-17 03:59:49 +0000 pflog: Correctly check if bpf peers are present On creating the pflog(4) interface, pflog_clone_create() does an unconditional bpfattach(). Use bpf_peers_present() which was introduced in commit 16d878cc99ef [1] to check the presence of bpf peers. This will save a little CPU cycles when no bpf peers present. There should be no functional change. 1. 16d878cc99ef Fix the following bpf(4) race condition which can result in a panic Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45532 (cherry picked from commit ebc2bab04823c24c524f913457d6b88dc7ea9fac) --- sys/netpfil/pf/if_pflog.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/netpfil/pf/if_pflog.c b/sys/netpfil/pf/if_pflog.c index 82e0daa01898..f20dc214f56e 100644 --- a/sys/netpfil/pf/if_pflog.c +++ b/sys/netpfil/pf/if_pflog.c @@ -223,9 +223,10 @@ pflog_packet(struct pfi_kkif *kif, struct mbuf *m, sa_family_t af, struct pfloghdr hdr; if (kif == NULL || m == NULL || rm == NULL || pd == NULL) - return ( 1); + return (1); - if ((ifn = V_pflogifs[rm->logif]) == NULL || !ifn->if_bpf) + ifn = V_pflogifs[rm->logif]; + if (ifn == NULL || !bpf_peers_present(ifn->if_bpf)) return (0); bzero(&hdr, sizeof(hdr)); @@ -274,7 +275,7 @@ pflog_packet(struct pfi_kkif *kif, struct mbuf *m, sa_family_t af, if_inc_counter(ifn, IFCOUNTER_OPACKETS, 1); if_inc_counter(ifn, IFCOUNTER_OBYTES, m->m_pkthdr.len); - BPF_MTAP2(ifn, &hdr, PFLOG_HDRLEN, m); + bpf_mtap2(ifn->if_bpf, &hdr, PFLOG_HDRLEN, m); return (0); }