From nobody Mon Apr 10 05:08:00 2023 X-Original-To: dev-commits-src-branches@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 4PvxnD3VhNz44mRG; Mon, 10 Apr 2023 05:08:00 +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 4PvxnD2Gxkz3Pm1; Mon, 10 Apr 2023 05:08:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681103280; 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=i7G1Uqrb7Pgg6PrWvTk+h6Pvq7hltA/mN9ZfK7EDkjI=; b=eD9HGsgA4pjApJvJIotEsu1Hf540njMswdWHN4AGRYLyuu0fhD9U5upZetlw+LNsZebQVz 488j7g9QIVsKlIRLDSvwAt6v9OHfyfqR/I0R73Iju75Hb8etTTm6JAt/TSU7Qv+JuDfQsv 9WHs5YL+O1rjLWJ72S12JQpsVtGp+x/ya5jzsw79vD2sTd0HDiOXF8BcDkn6mB9IDNIrpx L9jM1SEcJVOv1S9bWR3ooCWK6tLa58z5JAbE7Xv0SlTVlV2EO0CYw6g1kTahDZaHfM8vlY rp3YmvwHWpSOHnqdQRNcNUfuYHNx/ciA4c2cIm5kcJ+kf+VhMV/9msugg76zjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681103280; 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=i7G1Uqrb7Pgg6PrWvTk+h6Pvq7hltA/mN9ZfK7EDkjI=; b=bpOVjo3Dtdv5fAwDAlbM2/wHuv5EP75v+3+A3jDaecRVONOOLKHAWRW7i8hJ4J2/W4boQa 8Z+6s5IGQnpxoIda1LsxfbpgsJyTx5pWuixWtYUFkB/AfqnYGFEBqYE3xommHuyZmbN6S1 YjmjSDk9kv3XvWrVblZ6F0N2FOiFwOZO+ESO1UXxAXJuUFXl0U0n8bMBIoved1ocKNdca+ 1OuDd54WAAYU7qPOCBvO243pWj7zxm8TIrhFtXTGFl7HD/PvNgNWub4NxlnjldoMSMXgxm 7e4K7Os3pRIzIcOrjhX/bLbI4nD0tn01L9G3NPirOmQSWI7IhForCW1di68jpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681103280; a=rsa-sha256; cv=none; b=YYl7Swid6ekdnTojImRLX1/7QnPCbNlMZ3YlFrnJqopmXY23GDnwlYhf2VT/K6mIU6GYOo Q+CnSXvEqqfJVQCc1Gc0WHFI4B/P85S0vj7R3KnGyLGSW5EXaPozyeuqGBzMrytqK6aODD EbVzoRHI6yyXUPZ98UmZZe3fxWzqOtXPJGuv5YNbdMj+AgYArn0ersaK1/HnfI4kjUSGWb 8d30bMwRu3yOs6OquuwPqA4C18KXnp1MzUoXcvS2AYpj5uJKnbYQeAUta20lqCnk35LZRE 2owoxLZDL98ERyrsykvabTFcye5XRlCAyfUD6yC6GeQhdXWIzGgAfI0u7eZDLg== 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 4PvxnD1Nvrzcpq; Mon, 10 Apr 2023 05:08:00 +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 33A580Ln022173; Mon, 10 Apr 2023 05:08:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33A580Tl022172; Mon, 10 Apr 2023 05:08:00 GMT (envelope-from git) Date: Mon, 10 Apr 2023 05:08:00 GMT Message-Id: <202304100508.33A580Tl022172@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: cb7a77b8ba80 - stable/12 - lagg(4): Refactor out some lagg protocol input routines into a default one List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/12 X-Git-Reftype: branch X-Git-Commit: cb7a77b8ba80b93f3c07937752e68a26e31451c3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=cb7a77b8ba80b93f3c07937752e68a26e31451c3 commit cb7a77b8ba80b93f3c07937752e68a26e31451c3 Author: Zhenlei Huang AuthorDate: 2023-03-29 16:16:21 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-10 05:06:21 +0000 lagg(4): Refactor out some lagg protocol input routines into a default one Those input routines are identical. Also inline two fast paths. No functional change intended. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39251 (cherry picked from commit dbe86dd5de18fdf61e1300f6575e0f50785bf6b3) (cherry picked from commit eeb96a7b9178aa55d855203b977564b287d6d108) --- sys/net/if_lagg.c | 63 ++++++++++++++++++------------------------------------- 1 file changed, 20 insertions(+), 43 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index c4ea1e9e7637..6a6f08b9696e 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -164,8 +164,6 @@ static struct lagg_port *lagg_link_active(struct lagg_softc *, /* Simple round robin */ static void lagg_rr_attach(struct lagg_softc *); static int lagg_rr_start(struct lagg_softc *, struct mbuf *); -static struct mbuf *lagg_rr_input(struct lagg_softc *, struct lagg_port *, - struct mbuf *); /* Active failover */ static int lagg_fail_start(struct lagg_softc *, struct mbuf *); @@ -178,14 +176,10 @@ static void lagg_lb_detach(struct lagg_softc *); static int lagg_lb_port_create(struct lagg_port *); static void lagg_lb_port_destroy(struct lagg_port *); static int lagg_lb_start(struct lagg_softc *, struct mbuf *); -static struct mbuf *lagg_lb_input(struct lagg_softc *, struct lagg_port *, - struct mbuf *); static int lagg_lb_porttable(struct lagg_softc *, struct lagg_port *); /* Broadcast */ static int lagg_bcast_start(struct lagg_softc *, struct mbuf *); -static struct mbuf *lagg_bcast_input(struct lagg_softc *, struct lagg_port *, - struct mbuf *); /* 802.3ad LACP */ static void lagg_lacp_attach(struct lagg_softc *); @@ -195,6 +189,10 @@ static struct mbuf *lagg_lacp_input(struct lagg_softc *, struct lagg_port *, struct mbuf *); static void lagg_lacp_lladdr(struct lagg_softc *); +/* Default input */ +static struct mbuf *lagg_default_input(struct lagg_softc *, struct lagg_port *, + struct mbuf *); + /* lagg protocol table */ static const struct lagg_proto { lagg_proto pr_num; @@ -219,7 +217,7 @@ static const struct lagg_proto { .pr_num = LAGG_PROTO_ROUNDROBIN, .pr_attach = lagg_rr_attach, .pr_start = lagg_rr_start, - .pr_input = lagg_rr_input, + .pr_input = lagg_default_input, }, { .pr_num = LAGG_PROTO_FAILOVER, @@ -231,7 +229,7 @@ static const struct lagg_proto { .pr_attach = lagg_lb_attach, .pr_detach = lagg_lb_detach, .pr_start = lagg_lb_start, - .pr_input = lagg_lb_input, + .pr_input = lagg_default_input, .pr_addport = lagg_lb_port_create, .pr_delport = lagg_lb_port_destroy, }, @@ -253,7 +251,7 @@ static const struct lagg_proto { { .pr_num = LAGG_PROTO_BROADCAST, .pr_start = lagg_bcast_start, - .pr_input = lagg_bcast_input, + .pr_input = lagg_default_input, }, }; @@ -369,14 +367,14 @@ lagg_proto_detach(struct lagg_softc *sc) lagg_protos[pr].pr_detach(sc); } -static int +static inline int lagg_proto_start(struct lagg_softc *sc, struct mbuf *m) { return (lagg_protos[sc->sc_proto].pr_start(sc, m)); } -static struct mbuf * +static inline struct mbuf * lagg_proto_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) { @@ -2171,17 +2169,6 @@ lagg_rr_start(struct lagg_softc *sc, struct mbuf *m) return (lagg_enqueue(lp->lp_ifp, m)); } -static struct mbuf * -lagg_rr_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) -{ - struct ifnet *ifp = sc->sc_ifp; - - /* Just pass in the packet to our lagg device */ - m->m_pkthdr.rcvif = ifp; - - return (m); -} - /* * Broadcast mode */ @@ -2232,16 +2219,6 @@ lagg_bcast_start(struct lagg_softc *sc, struct mbuf *m) return (0); } -static struct mbuf* -lagg_bcast_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) -{ - struct ifnet *ifp = sc->sc_ifp; - - /* Just pass in the packet to our lagg device */ - m->m_pkthdr.rcvif = ifp; - return (m); -} - /* * Active failover */ @@ -2383,17 +2360,6 @@ lagg_lb_start(struct lagg_softc *sc, struct mbuf *m) return (lagg_enqueue(lp->lp_ifp, m)); } -static struct mbuf * -lagg_lb_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) -{ - struct ifnet *ifp = sc->sc_ifp; - - /* Just pass in the packet to our lagg device */ - m->m_pkthdr.rcvif = ifp; - - return (m); -} - /* * 802.3ad LACP */ @@ -2484,3 +2450,14 @@ lagg_lacp_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) return (m); } +/* Default input */ +static struct mbuf * +lagg_default_input(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) +{ + struct ifnet *ifp = sc->sc_ifp; + + /* Just pass in the packet to our lagg device */ + m->m_pkthdr.rcvif = ifp; + + return (m); +}