From nobody Mon Jun 1 18:30:13 2026 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 4gTjF12jX5z6gV4k for ; Mon, 01 Jun 2026 18:30:13 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gTjF11fCdz3CYC for ; Mon, 01 Jun 2026 18:30:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780338613; 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=ynGc7VignvQmJoix+aHmHCGCOkqYpryCdSJjOEtZ//c=; b=ECEsScl6ESQ0N6ukBZd7Vzyzihu8nxctCre2U4jf4aMPLjwgT9fHA92otS/p4zQWU/3rfY TI5DZsrFvqCK7FM52eUkNZv6Xd61Rfyy4OFd0s6kGkn0UB/WUII4V9I8DDY/KOvCWs6uxv iCBbqhymyE4yr16rEMq4H5aeFwX+qQC82PiJqJcLTT1e77rpq8adUo/xAKNMsPVu/aR7sL jxSB2BkPjtQi7utryfpiPGX234AO4MISXq7f8eBbS2FUfHNr/r6dpETq/uD9ZgOKl+johg 10MHp0qyCvwAkD3YxownOdYRq9Dfbu4WxunR6uivSfEARsGmDyksAZTd/RfRPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780338613; a=rsa-sha256; cv=none; b=D7oCC7bMr/FBOPWhNjS6orZQbo+3bpMq+QqzC62pCNCD4PBY1y30ouKy/F/LE+cE0LRsrL QmsAmy/Eo9eEX48DSacuF1n7It39ThtAMF0sf/5ug7XlKwdtTvXzugQ3vLO582ORtMUhpJ N1/OnB7r4WxztFqgrmp+dfWbM1i+4/2SYLdshSAwVjAPaExeXxaDtZn6GI37KgSQVYJtpJ TjmhsHG9VO6dAyVcu6UyTzXyv7P8tNH2LgRvqTqGSVjRupCl0P1Uk7oka4eBtK4vaCi6CM 1POSm6y+xaztDtdHRqZRiSzA++nXM6QcTVOnf5iTXY4Ze1tuelTN1BffitSMWA== 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=1780338613; 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=ynGc7VignvQmJoix+aHmHCGCOkqYpryCdSJjOEtZ//c=; b=RyJUpVedh6IAMIltJwYI/T+DWbS6Kv60G8B4vrZ8iYyZiq7uBkz+wMzBcmg1KinFVQaQgC 6FZSzZHYkdxWj/wnEGe7ovcnA79t2TyfGumxCZz1XWAQ44CwEtiDtl8E7iky2gWld7hGWx 27Vy2VGadc08uK6c1Vpv+y/+mFsRumhxurqxXKCKWE5Z+gmgSR6NyHwlshKmzRRtseHTmP nTP36tOF6AByJdR1NFvEbh/XW8kWjFi1762lJ96Wei8oU6FxdQYMkEu/XPGUZoZ/yfv9YA X1aPlWFbS4L847JmGDiPKNOtHmi7rwtVxImTTyTlaO3BINSWp6ZE7N++8X4c8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gTjF10vw5zqVV for ; Mon, 01 Jun 2026 18:30:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 204d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Jun 2026 18:30:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 49d90d9ddfc1 - main - lagg: Handle a port count of zero 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 49d90d9ddfc1ecda9ad9b6cb5565e5fbdcc14964 Auto-Submitted: auto-generated Date: Mon, 01 Jun 2026 18:30:13 +0000 Message-Id: <6a1dcfb5.204d2.42e2225a@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=49d90d9ddfc1ecda9ad9b6cb5565e5fbdcc14964 commit 49d90d9ddfc1ecda9ad9b6cb5565e5fbdcc14964 Author: Mark Johnston AuthorDate: 2026-06-01 16:40:43 +0000 Commit: Mark Johnston CommitDate: 2026-06-01 18:22:57 +0000 lagg: Handle a port count of zero The sc_count check in lagg_transmit_ethernet() and lagg_transmit_infiniband() is racy, as the lagg protocol handlers are only synchronized by net_epoch. Handle a count of 0 in each protocol handler where it's needed, namely in the RR and LB handlers. Reported by: Yuxiang Yang, Yizhou Zhao, Xuewei Feng, Qi Li, and Ke Xu from Tsinghua University using GLM5.1 from Z.ai Reviewed by: pouria, zlei MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D56942 --- sys/net/if_lagg.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 0333162da0d4..da08e02d50be 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -1828,6 +1828,7 @@ lookup_snd_tag_port(struct ifnet *ifp, uint32_t flowid, uint32_t flowtype, struct lagg_port *lp; struct lagg_lb *lb; uint32_t hash, p; + unsigned int count; int err; sc = ifp->if_softc; @@ -1839,8 +1840,11 @@ lookup_snd_tag_port(struct ifnet *ifp, uint32_t flowid, uint32_t flowtype, if ((sc->sc_opts & LAGG_OPT_USE_FLOWID) == 0 || flowtype == M_HASHTYPE_NONE) return (NULL); + count = atomic_load_int(&sc->sc_count); + if (count == 0) + return (NULL); p = flowid >> sc->flowid_shift; - p %= sc->sc_count; + p %= count; lb = (struct lagg_lb *)sc->sc_psc; lp = lb->lb_ports[p]; return (lagg_link_active(sc, lp)); @@ -2128,12 +2132,6 @@ lagg_transmit_ethernet(struct ifnet *ifp, struct mbuf *m) if (m->m_pkthdr.csum_flags & CSUM_SND_TAG) MPASS(m->m_pkthdr.snd_tag->ifp == ifp); #endif - /* We need at least one port */ - if (sc->sc_count == 0) { - m_freem(m); - if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); - return (ENXIO); - } ETHER_BPF_MTAP(ifp, m); @@ -2150,12 +2148,6 @@ lagg_transmit_infiniband(struct ifnet *ifp, struct mbuf *m) if (m->m_pkthdr.csum_flags & CSUM_SND_TAG) MPASS(m->m_pkthdr.snd_tag->ifp == ifp); #endif - /* We need at least one port */ - if (sc->sc_count == 0) { - m_freem(m); - if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); - return (ENXIO); - } infiniband_bpf_mtap(ifp, m); @@ -2421,13 +2413,20 @@ lagg_rr_start(struct lagg_softc *sc, struct mbuf *m) { struct lagg_port *lp; uint32_t p; + unsigned int count; + count = atomic_load_int(&sc->sc_count); + if (__predict_false(count == 0)) { + if_inc_counter(sc->sc_ifp, IFCOUNTER_OERRORS, 1); + m_freem(m); + return (ENETDOWN); + } p = atomic_fetchadd_32(&sc->sc_seq, 1); p /= sc->sc_stride; - p %= sc->sc_count; - lp = CK_SLIST_FIRST(&sc->sc_ports); + p %= count; - while (p--) + lp = CK_SLIST_FIRST(&sc->sc_ports); + while (p-- && lp != NULL) lp = CK_SLIST_NEXT(lp, lp_entries); /* @@ -2611,13 +2610,20 @@ lagg_lb_start(struct lagg_softc *sc, struct mbuf *m) struct lagg_lb *lb = (struct lagg_lb *)sc->sc_psc; struct lagg_port *lp = NULL; uint32_t p = 0; + unsigned int count; + count = atomic_load_int(&sc->sc_count); + if (__predict_false(count == 0)) { + if_inc_counter(sc->sc_ifp, IFCOUNTER_OERRORS, 1); + m_freem(m); + return (ENETDOWN); + } if ((sc->sc_opts & LAGG_OPT_USE_FLOWID) && M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) p = m->m_pkthdr.flowid >> sc->flowid_shift; else p = m_ether_tcpip_hash(sc->sc_flags, m, lb->lb_key); - p %= sc->sc_count; + p %= count; lp = lb->lb_ports[p]; /*