From nobody Wed Feb 11 18:17:17 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 4fB68s6JPvz6RxRB for ; Wed, 11 Feb 2026 18:17:17 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB68s3601z4G1j for ; Wed, 11 Feb 2026 18:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770833837; 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=8zQ79UUkP99j7GVaIQEKB+h7/YDQlB64x9puQb8de4g=; b=Ywx8eeZQtlISDUfgY81HSdVAa8p/n5z6p7GCmzPmoS1wtrg9PTeBHfSGOztJOrcoBERgX/ jQXCQTEggQ0QEPoawpdpPJvsFOZejQ9IflUiUAvOLDbBWesgOnCjRn1DUq8NGkh/CD8wBK sdeTPxpjDX2TxdzgT2nXyDBjxSbPRHzVBWAmkpn79xJc4z9AQI0dExafybHUJbXzCF2Iom +fc6hc+gd9WdI27ROltVZ9fSKgtc6F1R3fPSbD1CHHPzi/7iXSq6zs/U3lC7ET7Ea4EcWf FykOQ8z9lG2RZVkODWTIU4kNqoA4LX0pRoOto1fsWUeCtmIC8dh8DtdZ/FzxCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770833837; a=rsa-sha256; cv=none; b=YmYqw5wG1jyL9+UPKSskuACfyYKeJjNWAOm7h4QZaFXcT4f+pnYimYf/R4YSz5PxLD77MK DfWjRmMFxOummyslhhCc2TQGC+haSecR2Z5oE7CYNxIDioXwL5zl45EB5cfGYPis5arrGw 5Y5R+/isg4dD/OOv+A5yQ6ngGpeGxg7dw3Nkez/dUfkoJyEn1tjoB+jC/kqH6kD2Qml0vA VNbOIC6zsu2G6kDz5IW8lMBebP/DyNSfSSwACKB1Dj9lZMixi6TeIRYvqgPheMxU5/LifL NgeJKaveCXmmqyqMz7r7u/G4Ib3kn7cXOXAdWp+RIpUHwwpe8VzUS2+kF+k+uw== 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=1770833837; 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=8zQ79UUkP99j7GVaIQEKB+h7/YDQlB64x9puQb8de4g=; b=U4LESoQsKjTNyvQ5mwED4Ngmh5VSExhpE4uIwon4X+qfX+W7KbTOKKlMb2Gn2mHzqbV5MW PSRQm2IrL3fuxHfbHGEaSlx5djZkcVcBtHS4zlC6Vi4pTURKe+qPFg0D7Xfuk8UjRFX3gW xWfM4/fFQQrShUrmfTGaLbgmToh/qF9yavK8zIJ0C2JD6U8aCLOvqLBXQGxPh1taMkYw9E knJgIPdovqEDN5e1IxUB6fE7YdrUKrC3cXvfOga5d//UbjIkMxpcuhdczHytLVnwXa+5Ht wcQClZiZXl9Zj9bGVBxYeAXnMDCXNuqihd03AJxxqtSEhRi0z4n8hiB9RWsBsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB68s1dDtz11BY for ; Wed, 11 Feb 2026 18:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3942c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 18:17:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: c182cf646a4f - main - lagg: Avoid dropping locks when starting the interface 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 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: c182cf646a4f995fa8506afd8afc9541c4d32905 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 18:17:17 +0000 Message-Id: <698cc7ad.3942c.4831552d@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c182cf646a4f995fa8506afd8afc9541c4d32905 commit c182cf646a4f995fa8506afd8afc9541c4d32905 Author: Zhenlei Huang AuthorDate: 2026-02-11 18:15:41 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-11 18:15:41 +0000 lagg: Avoid dropping locks when starting the interface The init routine of a lagg(4) interface will not change during the whole lifecycle. So we can call lagg_init() directly instead of through the function pointer. Well, that requires a drop and pickup lock, which unnecessarily expose a small race window. Refactor lagg_init() into lagg_init_locked() and call the later one to avoid that. Meanwhile, delay updating the driver managed status until after the interface is really ready. Reviewed by: markj MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D55198 --- sys/net/if_lagg.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 7a8f82286c02..0333162da0d4 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -139,6 +139,7 @@ static int lagg_port_checkstacking(struct lagg_softc *); static void lagg_port2req(struct lagg_port *, struct lagg_reqport *); static void lagg_if_updown(struct lagg_softc *, bool); static void lagg_init(void *); +static void lagg_init_locked(struct lagg_softc *); static void lagg_stop(struct lagg_softc *); static int lagg_ioctl(struct ifnet *, u_long, caddr_t); #if defined(KERN_TLS) || defined(RATELIMIT) @@ -1279,16 +1280,21 @@ static void lagg_init(void *xsc) { struct lagg_softc *sc = (struct lagg_softc *)xsc; + + LAGG_XLOCK(sc); + lagg_init_locked(sc); + LAGG_XUNLOCK(sc); +} + +static void +lagg_init_locked(struct lagg_softc *sc) +{ struct ifnet *ifp = sc->sc_ifp; struct lagg_port *lp; - LAGG_XLOCK(sc); - if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - LAGG_XUNLOCK(sc); + LAGG_XLOCK_ASSERT(sc); + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) return; - } - - ifp->if_drv_flags |= IFF_DRV_RUNNING; /* * Update the port lladdrs if needed. @@ -1310,8 +1316,7 @@ lagg_init(void *xsc) lagg_watchdog_infiniband(sc); mtx_unlock(&sc->sc_mtx); } - - LAGG_XUNLOCK(sc); + ifp->if_drv_flags |= IFF_DRV_RUNNING; } static void @@ -1674,24 +1679,21 @@ lagg_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) lagg_setflags(lp, 1); } - if (!(ifp->if_flags & IFF_UP) && - (ifp->if_drv_flags & IFF_DRV_RUNNING)) { + if ((ifp->if_flags & IFF_UP) == 0 && + (ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) /* * If interface is marked down and it is running, * then stop and disable it. */ lagg_stop(sc); - LAGG_XUNLOCK(sc); - } else if ((ifp->if_flags & IFF_UP) && - !(ifp->if_drv_flags & IFF_DRV_RUNNING)) { + else if ((ifp->if_flags & IFF_UP) != 0 && + (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) /* * If interface is marked up and it is stopped, then * start it. */ - LAGG_XUNLOCK(sc); - (*ifp->if_init)(sc); - } else - LAGG_XUNLOCK(sc); + lagg_init_locked(sc); + LAGG_XUNLOCK(sc); break; case SIOCADDMULTI: case SIOCDELMULTI: