From nobody Mon Jun 15 18:01:51 2026 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 4gfHxr0sDhz6hhJL for ; Mon, 15 Jun 2026 18:01:52 +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 4gfHxq48sMz4F9V for ; Mon, 15 Jun 2026 18:01:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781546511; 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=2yYPxmsM93b52y7vAxHNjHIvOezyO7zp0ZCwlgaLkgU=; b=i+gItgvGuV7j5igxOVjp8p7M833HhgHhN5TizNi1WvKdBksRRRp8QQ/7tuUAaH7ghl8+bT CmJwIJbCZs4hyELlmYaWY3jb2m6QSwkrPEVs/3kOhCp/jaWE2GcJ/cN6wJ+htHTpUP4K/O Q/3rLF0cheUCISlqFIvJWIdF32E98QaScWEvNEfDBSmIGq6YE/HhJU+9f0s479+6AetORU zuN6bmZGD5T2myo91sFULMpIxWJ8GsEqd7MuP24oDaBIiwVfx2crR612d3HpQ1hjPEnnQW wQh8730hTwhhywRDmdqLnjqcl3J43GGlePG9dI8Q7ucpZNXviiLZn3/+8Jc4Zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781546511; a=rsa-sha256; cv=none; b=lDIdT0Nts/JvD0/Cd0kq45FF5x0+1ZZlKRFXkSIcmCWU9JrHMwvt45V5vP1mv4uXO7D6UI fGFii174bdRWbMB5n1UYF8PRHxqeDVrETZW6aqJYbQZ6opgw1Bti38/YkNg3aXJuqaQXGx OadZzMgQZkgnl5FDuelFIIJZjnmou/7fgX+oX+h14Sf13aBd7teZ74/uOZBaM6c8hOL+/Z xGlF8d4fCPlqGQt2aQZjwBQHdwT8fpWtUiyJAlb3pmkG926x9f0NDCr55I7XAID6j8QtLB 5bB5g487gGaulgvkAfcGNlmx3dcLpR+pvq1LkkfLZRxAV3E6T8Br250tblyReg== 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=1781546511; 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=2yYPxmsM93b52y7vAxHNjHIvOezyO7zp0ZCwlgaLkgU=; b=ZNlZ/u9XgaexF1AoJKYmYmvzO2TAHPKG/HDoCTq0ljimox/vxdHMLbxbuDi64KpXJ+SKmW VJqaD+rQtfDzTghtisjnEW6q1liwDAuhVOBVTlEqZ7RGIERVCss8BIQtHndHLXXG4tRTFV U9LS8PP2Ia2digI/H1tsCwgiMVQcyBD0RoFDSI/EHh0lJJpLaZ5u/GuwFgClPWhrUxvizo oKQcKKd7U/rlct6TdJ1F5u7RJvpz/tr4IdnbXwswch7LNcN8gS87Rkcp3VFMeTaxnlDfbk aRciWTc5UsAlZb6bMEhpe9ik+04yfOQD/NGXq8Uwh5QNkZn/74W9AVfgsWEC4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gfHxq3dh1z15W5 for ; Mon, 15 Jun 2026 18:01:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ddf3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Jun 2026 18:01:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c511c9eee2a1 - stable/15 - lagg: Handle a port count of zero 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: c511c9eee2a1dbdbf83ca8ea92193766ddb640ff Auto-Submitted: auto-generated Date: Mon, 15 Jun 2026 18:01:51 +0000 Message-Id: <6a303e0f.1ddf3.5c2b70c@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c511c9eee2a1dbdbf83ca8ea92193766ddb640ff commit c511c9eee2a1dbdbf83ca8ea92193766ddb640ff Author: Mark Johnston AuthorDate: 2026-06-01 16:40:43 +0000 Commit: Mark Johnston CommitDate: 2026-06-15 16:00:04 +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 (cherry picked from commit 49d90d9ddfc1ecda9ad9b6cb5565e5fbdcc14964) --- 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 23ad4f72d255..5a2ec97e4aa4 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -1831,6 +1831,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; @@ -1842,8 +1843,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)); @@ -2131,12 +2135,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); @@ -2153,12 +2151,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); @@ -2424,13 +2416,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); /* @@ -2614,13 +2613,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]; /*