From nobody Wed Apr 5 14:39:22 2023 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 4Ps6hq1q0Nz43Z3Z; Wed, 5 Apr 2023 14:39:23 +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 4Ps6hq1BrTz3lnx; Wed, 5 Apr 2023 14:39:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680705563; 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=+9qDpW1P2ZtSFoUmMse4QSeKaEqg2O/u/Blep21Nu08=; b=DYfQMtuIX9lMFKctnaCn23ijZn6uUhwJpdKFieGiFnKuRacizqb/tfTLsdaohkrs+ICw8g fIiwf8LR7+TRNbyGxWmR3d/lxobObD1W/XrQ9ZdcZFPLEJmOUbKOQ+RWBJzM2WGS6Gp+ea VGpW2StwiZP0IhrV5ouFpzdo5W6hTyUgSXRTprhEdJNmO0431aWmaza5R06fb88CuhoYcp kDlnOM9DdB90JqBzrTJpiTBgJaGk9fQtqZ9lyeoGI/lG3Pr8Qb2xARWnolSp1ekrWsQZTO 491Pd9+lBbsXFz3xBBaiJ1QI8eRHkfcTmTi5SoqehXgkzsFGYeSVGlfzd8MlBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680705563; 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=+9qDpW1P2ZtSFoUmMse4QSeKaEqg2O/u/Blep21Nu08=; b=KACGHjTofm+z0tLpaG9qnw+h8X1ITfHfTPv/VXhM91Yvyzx91SqGhXD0YuD1Zo8j0jL7ub IDDqqgY0yg7x2XfnvQ7LEEagMWOonTuoeRClKJTJuFnKHxDpFdC2XbvFjlRMwNfhygvepR Fghe3rm5MQsWXVdIDgP6O3c4JL2wXbrFjuQrWOX0jD9aU3ODAiC9xsktojfPELHLhNfGZx pcSn39rCp+qtYyxxrSruGGfRUrRH9fV4yL/eOugDIBWBc1m029Ag3+TfiwJHMx/l6Yebq9 6iBJYzkKCsCNrxmzggtpAc5y2UFrEWUR64cx6mUW+FrfQT/3qD8RRbXJSJ3B5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680705563; a=rsa-sha256; cv=none; b=cgVXhhB7LaK8+jm9GU8qEnqQRbffn2HvhOOR7qYVad0ZTfXC7VHm1PLuxTHdwdPRNZ07UZ UcUQzyyMCcRza7d93evpPCOVKud5TTjusz5Id/4OJobi7TCuRKi2CjoSYMGoPw2PeVcedu J7kvHDtn3nXOW38qmPWxuU5QsJunyaXUammXanr+LKXqQRwDCWcLZKx2QD6jpmL8fz2/VQ qnyYybYKEaHOgyykd9FVzg3o18hCh7PRaffMnCze4t7NznwkUOpdPBpZLCVWJuYI+o8lmG c59xRHvUd/mHdAT8H0N732JVq4tL7EhDNgVtOonnxzz/I2Fa19AI/eMREsPrTg== 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 4Ps6hq0B4gzR7S; Wed, 5 Apr 2023 14:39:23 +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 335EdMBv084388; Wed, 5 Apr 2023 14:39:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 335EdMws084387; Wed, 5 Apr 2023 14:39:22 GMT (envelope-from git) Date: Wed, 5 Apr 2023 14:39:22 GMT Message-Id: <202304051439.335EdMws084387@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 82bbdde4ebc9 - main - bridge: Try to make the GRAB_OUR_PACKETS macro a bit more readable 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 82bbdde4ebc9deb30d3a05ddec4d76f0a88df881 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=82bbdde4ebc9deb30d3a05ddec4d76f0a88df881 commit 82bbdde4ebc9deb30d3a05ddec4d76f0a88df881 Author: Mark Johnston AuthorDate: 2023-04-05 14:37:00 +0000 Commit: Mark Johnston CommitDate: 2023-04-05 14:37:00 +0000 bridge: Try to make the GRAB_OUR_PACKETS macro a bit more readable - Let the compiler use constant folding to eliminate conditionals. - Fix some inconsistent whitespace. No functional change intended. Reviewed by: zlei MFC after: 2 weeks Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D38410 --- sys/net/if_bridge.c | 49 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 60a1683c74ae..2855236e4013 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -2539,32 +2539,28 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) return (m); } -#if (defined(INET) || defined(INET6)) -# define OR_CARP_CHECK_WE_ARE_DST(iface) \ - || ((iface)->if_carp \ - && (*carp_forus_p)((iface), eh->ether_dhost)) -# define OR_CARP_CHECK_WE_ARE_SRC(iface) \ - || ((iface)->if_carp \ - && (*carp_forus_p)((iface), eh->ether_shost)) +#if defined(INET) || defined(INET6) +#define CARP_CHECK_WE_ARE_DST(iface) \ + ((iface)->if_carp && (*carp_forus_p)((iface), eh->ether_dhost)) +#define CARP_CHECK_WE_ARE_SRC(iface) \ + ((iface)->if_carp && (*carp_forus_p)((iface), eh->ether_shost)) #else -# define OR_CARP_CHECK_WE_ARE_DST(iface) -# define OR_CARP_CHECK_WE_ARE_SRC(iface) +#define CARP_CHECK_WE_ARE_DST(iface) false +#define CARP_CHECK_WE_ARE_SRC(iface) false #endif #ifdef INET6 -# define OR_PFIL_HOOKED_INET6 \ - || PFIL_HOOKED_IN(V_inet6_pfil_head) +#define PFIL_HOOKED_INET6 PFIL_HOOKED_IN(V_inet6_pfil_head) #else -# define OR_PFIL_HOOKED_INET6 +#define PFIL_HOOKED_INET6 false #endif -#define GRAB_OUR_PACKETS(iface) \ - if ((iface)->if_type == IFT_GIF) \ - continue; \ - /* It is destined for us. */ \ - if (memcmp(IF_LLADDR((iface)), eh->ether_dhost, ETHER_ADDR_LEN) == 0 \ - OR_CARP_CHECK_WE_ARE_DST((iface)) \ - ) { \ +#define GRAB_OUR_PACKETS(iface) \ + if ((iface)->if_type == IFT_GIF) \ + continue; \ + /* It is destined for us. */ \ + if (memcmp(IF_LLADDR(iface), eh->ether_dhost, ETHER_ADDR_LEN) == 0 || \ + CARP_CHECK_WE_ARE_DST(iface)) { \ if (bif->bif_flags & IFBIF_LEARNING) { \ error = bridge_rtupdate(sc, eh->ether_shost, \ vlan, bif, 0, IFBAF_DYNAMIC); \ @@ -2583,8 +2579,8 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) if_inc_counter(bifp, IFCOUNTER_IPACKETS, 1); \ if_inc_counter(bifp, IFCOUNTER_IBYTES, m->m_pkthdr.len); \ /* Filter on the physical interface. */ \ - if (V_pfil_local_phys && (PFIL_HOOKED_IN(V_inet_pfil_head) \ - OR_PFIL_HOOKED_INET6)) { \ + if (V_pfil_local_phys && (PFIL_HOOKED_IN(V_inet_pfil_head) || \ + PFIL_HOOKED_INET6)) { \ if (bridge_pfil(&m, NULL, ifp, \ PFIL_IN) != 0 || m == NULL) { \ return (NULL); \ @@ -2596,9 +2592,8 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) } \ \ /* We just received a packet that we sent out. */ \ - if (memcmp(IF_LLADDR((iface)), eh->ether_shost, ETHER_ADDR_LEN) == 0 \ - OR_CARP_CHECK_WE_ARE_SRC((iface)) \ - ) { \ + if (memcmp(IF_LLADDR(iface), eh->ether_shost, ETHER_ADDR_LEN) == 0 || \ + CARP_CHECK_WE_ARE_SRC(iface)) { \ m_freem(m); \ return (NULL); \ } @@ -2622,9 +2617,9 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) GRAB_OUR_PACKETS(bif2->bif_ifp) } -#undef OR_CARP_CHECK_WE_ARE_DST -#undef OR_CARP_CHECK_WE_ARE_SRC -#undef OR_PFIL_HOOKED_INET6 +#undef CARP_CHECK_WE_ARE_DST +#undef CARP_CHECK_WE_ARE_SRC +#undef PFIL_HOOKED_INET6 #undef GRAB_OUR_PACKETS /* Perform the bridge forwarding function. */