From nobody Tue Mar 14 20:01:38 2023 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 4Pbktp5YNtz3yfp6; Tue, 14 Mar 2023 20:01:38 +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 4Pbktp4y5Dz3jNL; Tue, 14 Mar 2023 20:01:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678824098; 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=rnujZZ1Oy0eblXTJ8+2q0q1+jGb/cSIst4gEdWYMA2U=; b=LRbh2cllvLzWODyDMArk9HLX54Am2y6tp9Ritg6jpAvGjw+Iw4+PhrfyEiz0QK9RcRZEwY jS5X+z1EdOP/38MmJK+nVHdyYLAabMpR4/1pwzTw3el6PdnynHHRjk7J584kAbZF8ZwHc0 KXMHA3BmMMKEWKSwIYd9fWyGo1F85xtK1quj95TE7xjOElWgOkxoskTwoRCVwjASFxNaKb CXFofDtGz/RvfWFBcIX+9raqvOU7JnCedOtO9s8YmVWTPWzfdFCceVnH1+aF63JOB0ALh5 2YVQ08SWNRcfgrtzL2dC9EvsIVvHaobZZoJ6LmE5/9FIW6z1V8zMQbPWeqiOnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678824098; 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=rnujZZ1Oy0eblXTJ8+2q0q1+jGb/cSIst4gEdWYMA2U=; b=nqMjSzqd1NNXYu0pzZKVVk4ayhGg6PblfXlWOo/WLilvX7dL9b9YTP54BmScPu3mkkm21q NQ2WR6CIYlUBgZtEYeyKnwcT/WbuUs7akwT/qVxt23POfPgkit16lpbkyBcDKdw27YVSzI BURYgFd/j6AWkPvyMF3ftNa16K+Lx2gfZAFgpab2YuQYIs0mggO41QQ2xAqAAjhHlbNLpB FfvDYvTjNA4+rIL2BNP6eLMzL6ZleVzL34t7eOaMdhtwnuUnWXOyvodA2EOcUc1cVEs7hy u3Yruoud5FVraNe/8I9+G0dVVY7erYW99qYKihX5Ick4IQ+JbtK/+KoQy8Z6og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678824098; a=rsa-sha256; cv=none; b=Zz47KLXpwRvCCcA6pHX9hyYT+3fNPw1giJMbz3/ZDg4gw6AivGmSX0eq7iHmFRI3Xitx58 rCA51Yr78pft0sYFa4ZD0sYxmO98JPsGzVksodZjRc2+w44yiudKaD3pKrpYOTm8mYg3Li dpM4LmkKI9+92HuQG8KvpaPcAf8DCnLggnvuzCOeda63gmNIwh6LBYHRvHK4MLokqZO0Iw nTQbzpWE37K8umf1sEXgbg4SWnVhiU1VBhJZp8V1wyYJsjWKEpTQdN15PYLjR6J6y+KQa1 QWGPjTPfdIGabl+FFqq3pH8IgUuD7p8cMQvjD5ao9ATIt8RlIZZyCQCEyOQ9uA== 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 4Pbktp41n3zpK0; Tue, 14 Mar 2023 20:01:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32EK1cSN019016; Tue, 14 Mar 2023 20:01:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32EK1cel019015; Tue, 14 Mar 2023 20:01:38 GMT (envelope-from git) Date: Tue, 14 Mar 2023 20:01:38 GMT Message-Id: <202303142001.32EK1cel019015@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: adf62e836315 - main - infiniband: Convert BPF handling for IfAPI 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: adf62e83631571e74caf3d78ddb091870b9d6ecf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=adf62e83631571e74caf3d78ddb091870b9d6ecf commit adf62e83631571e74caf3d78ddb091870b9d6ecf Author: Justin Hibbits AuthorDate: 2023-02-09 02:32:47 +0000 Commit: Justin Hibbits CommitDate: 2023-03-14 19:51:32 +0000 infiniband: Convert BPF handling for IfAPI Summary: All callers of infiniband_bpf_mtap() call it through the wrapper macro, which checks the if_bpf member explicitly. Since this is getting hidden, move this check into the internal function and remove the wrapper macro. Reviewed by: hselasky Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D39024 --- sys/net/if_infiniband.c | 5 ++++- sys/net/if_lagg.c | 4 ++-- sys/net/infiniband.h | 8 -------- sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/sys/net/if_infiniband.c b/sys/net/if_infiniband.c index e5830d977e80..6764373b3d1a 100644 --- a/sys/net/if_infiniband.c +++ b/sys/net/if_infiniband.c @@ -128,6 +128,9 @@ infiniband_bpf_mtap(struct ifnet *ifp, struct mbuf *mb) struct infiniband_header *ibh; struct ether_header eh; + if (!bpf_peers_present(ifp->if_bpf)) + return; + if (mb->m_len < sizeof(*ibh)) return; @@ -439,7 +442,7 @@ infiniband_input(struct ifnet *ifp, struct mbuf *m) } /* Let BPF have it before we strip the header. */ - INFINIBAND_BPF_MTAP(ifp, m); + infiniband_bpf_mtap(ifp, m); /* Allow monitor mode to claim this frame, after stats are updated. */ if (ifp->if_flags & IFF_MONITOR) { diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 1ac8492834fc..a50cd995c6eb 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -2154,7 +2154,7 @@ lagg_transmit_infiniband(struct ifnet *ifp, struct mbuf *m) return (ENXIO); } - INFINIBAND_BPF_MTAP(ifp, m); + infiniband_bpf_mtap(ifp, m); error = lagg_proto_start(sc, m); NET_EPOCH_EXIT(et); @@ -2222,7 +2222,7 @@ lagg_input_infiniband(struct ifnet *ifp, struct mbuf *m) return (NULL); } - INFINIBAND_BPF_MTAP(scifp, m); + infiniband_bpf_mtap(scifp, m); m = lagg_proto_input(sc, lp, m); if (m != NULL && (scifp->if_flags & IFF_MONITOR) != 0) { diff --git a/sys/net/infiniband.h b/sys/net/infiniband.h index b9fead61c220..6d41f0fe8816 100644 --- a/sys/net/infiniband.h +++ b/sys/net/infiniband.h @@ -41,14 +41,6 @@ #define INFINIBAND_IS_MULTICAST(addr) \ ((addr)[4] == 0xff) -#define INFINIBAND_BPF_MTAP(_ifp, _m) \ -do { \ - if (bpf_peers_present((_ifp)->if_bpf)) { \ - M_ASSERTVALID(_m); \ - infiniband_bpf_mtap(_ifp, _m); \ - } \ -} while (0) - struct infiniband_header { uint8_t ib_hwaddr[INFINIBAND_ADDR_LEN]; uint16_t ib_protocol; /* big endian */ diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c index f7b257c92784..3f01d8b0218e 100644 --- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c @@ -747,7 +747,7 @@ ipoib_start_locked(struct ifnet *dev, struct ipoib_dev_priv *priv) IFQ_DRV_DEQUEUE(&dev->if_snd, mb); if (mb == NULL) break; - INFINIBAND_BPF_MTAP(dev, mb); + infiniband_bpf_mtap(dev, mb); ipoib_send_one(priv, mb); } }