From nobody Wed Mar 29 16:32:40 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 4PmsXm6DNpz42mDD; Wed, 29 Mar 2023 16:32:40 +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 4PmsXm5j1Dz4YHp; Wed, 29 Mar 2023 16:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680107560; 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=QpEMgtzRkjD6gnYGN8hY6I9wGqOvCkvW6rTmylocSac=; b=j7k2xiLTYQAU2zxAOmH6LLWSbKUsDoDy/W/Twi0xRYPX6DYwwvgBceNHEUaefEbh7PsVcT NQ4YoVN0PmQ4Iu55BLIwFOOtGvFQB8Ckdaz6SXypowYuQ6oeertBUvvGbuLzSGc6lyEQNr R+QXYkZmlsXgFMx2Ci/9ESGROCZBdq16O0SwaNVLIB8vmqfoYr4CNYaTVWqNIC23c0zbHB MOf1iZZMEtR0sq+4Y7LVjGEexm93MSaOGqrcIzsQlrrYzNn3AM50P2ymjRCwJ0rv4GADDY LgCEQsA24ejQb1OiGob6xfl2ZFmRKOE15Ue0Ao7JvmXMEgPAJu0TiG1GgERP9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680107560; 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=QpEMgtzRkjD6gnYGN8hY6I9wGqOvCkvW6rTmylocSac=; b=q/HtoaXV52rmOLI/ac1ekALnJ7WDOtFsldM/eOA509ChQnOhxomUNGMWmO9YyP3TU2ein8 nNN+FjfmzbpQvldRLw0k8+/wygs3QFi89U3bU/3WOfDvNpUvdhckawjWY19Bwjzl9ya9Hv 5LHQcTAdViWdINYq9LzXzADzs53xW16P8zAe6fCtePBa1KcQfz0bcbqY5VWxPQu5/Bu6Ty 1JK2h9jNkSubyo7GmuZmIX3bZR89AK6Ih/E8UzryDPR/FlHtlgydHwRgN8FOdAGOOsaCK4 gV6tAVE1Xzuep5/HQQeyZR7/qelZ9QEt7p+8GPlY3tDtfmQCc57btQBRzt++vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680107560; a=rsa-sha256; cv=none; b=t76onqdB4uHbHGk+/bBkbaBCu7Cs/FOY1t6UL8OrcKasMQ3nh65vFMizAB6GtVu5vHs9G1 PwR3rMf8g3qOCHkR+1YPmI4Pm7MNZlXsitfNgOhgdxtjVpRE3ilTmA9g7VSolr3LEKqKMb ilAPHLWAa9Ol1diZahWhfhVuOOoBlMsZdpvBZQ2CEm6ho8BZjfC0OfsEEl6BnKBu4k0jKW +1fbft4BhtzoL83C6oGke3VfHm4kTcB2EQjEXpEgkdndhk2KhMsVQh+UmvjwLNS3NCwu9D XxuskPW3tESGUznEEu1NverjTTVMKVM9JqAwHnRyM+42dk/7HvAlqSllFi9c4Q== 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 4PmsXm4pK5zdDt; Wed, 29 Mar 2023 16:32:40 +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 32TGWedg006711; Wed, 29 Mar 2023 16:32:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TGWeY8006710; Wed, 29 Mar 2023 16:32:40 GMT (envelope-from git) Date: Wed, 29 Mar 2023 16:32:40 GMT Message-Id: <202303291632.32TGWeY8006710@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: d4a80d21b3d3 - main - lagg(4): Do not enter net epoch recursively 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4a80d21b3d32a2de02d1820cc1f38dba1f127cb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d4a80d21b3d32a2de02d1820cc1f38dba1f127cb commit d4a80d21b3d32a2de02d1820cc1f38dba1f127cb Author: Zhenlei Huang AuthorDate: 2023-03-29 16:25:16 +0000 Commit: Zhenlei Huang CommitDate: 2023-03-29 16:29:51 +0000 lagg(4): Do not enter net epoch recursively This saves a little resources. No functional change intended. Reviewed by: kp Fixes: b8a6e03fac92 Widen NET_EPOCH coverage MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39267 --- sys/net/if_lagg.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 7acfa524670c..063782b49ad7 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -2107,18 +2107,15 @@ lagg_setflags(struct lagg_port *lp, int status) static int lagg_transmit_ethernet(struct ifnet *ifp, struct mbuf *m) { - struct epoch_tracker et; struct lagg_softc *sc = (struct lagg_softc *)ifp->if_softc; - int error; + NET_EPOCH_ASSERT(); #if defined(KERN_TLS) || defined(RATELIMIT) if (m->m_pkthdr.csum_flags & CSUM_SND_TAG) MPASS(m->m_pkthdr.snd_tag->ifp == ifp); #endif - NET_EPOCH_ENTER(et); /* We need a Tx algorithm and at least one port */ if (sc->sc_proto == LAGG_PROTO_NONE || sc->sc_count == 0) { - NET_EPOCH_EXIT(et); m_freem(m); if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); return (ENXIO); @@ -2126,26 +2123,21 @@ lagg_transmit_ethernet(struct ifnet *ifp, struct mbuf *m) ETHER_BPF_MTAP(ifp, m); - error = lagg_proto_start(sc, m); - NET_EPOCH_EXIT(et); - return (error); + return (lagg_proto_start(sc, m)); } static int lagg_transmit_infiniband(struct ifnet *ifp, struct mbuf *m) { - struct epoch_tracker et; struct lagg_softc *sc = (struct lagg_softc *)ifp->if_softc; - int error; + NET_EPOCH_ASSERT(); #if defined(KERN_TLS) || defined(RATELIMIT) if (m->m_pkthdr.csum_flags & CSUM_SND_TAG) MPASS(m->m_pkthdr.snd_tag->ifp == ifp); #endif - NET_EPOCH_ENTER(et); /* We need a Tx algorithm and at least one port */ if (sc->sc_proto == LAGG_PROTO_NONE || sc->sc_count == 0) { - NET_EPOCH_EXIT(et); m_freem(m); if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); return (ENXIO); @@ -2153,9 +2145,7 @@ lagg_transmit_infiniband(struct ifnet *ifp, struct mbuf *m) infiniband_bpf_mtap(ifp, m); - error = lagg_proto_start(sc, m); - NET_EPOCH_EXIT(et); - return (error); + return (lagg_proto_start(sc, m)); } /* @@ -2169,16 +2159,14 @@ lagg_qflush(struct ifnet *ifp __unused) static struct mbuf * lagg_input_ethernet(struct ifnet *ifp, struct mbuf *m) { - struct epoch_tracker et; struct lagg_port *lp = ifp->if_lagg; struct lagg_softc *sc = lp->lp_softc; struct ifnet *scifp = sc->sc_ifp; - NET_EPOCH_ENTER(et); + NET_EPOCH_ASSERT(); if ((scifp->if_drv_flags & IFF_DRV_RUNNING) == 0 || lp->lp_detaching != 0 || sc->sc_proto == LAGG_PROTO_NONE) { - NET_EPOCH_EXIT(et); m_freem(m); return (NULL); } @@ -2198,7 +2186,6 @@ lagg_input_ethernet(struct ifnet *ifp, struct mbuf *m) } #endif /* DEV_NETMAP */ - NET_EPOCH_EXIT(et); return (m); }