From nobody Tue Mar 17 08:13:11 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 4fZl880M70z6Vtmd for ; Tue, 17 Mar 2026 08:13:12 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fZl876wn3z42V6 for ; Tue, 17 Mar 2026 08:13:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773735192; 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=wffxTzVPpCptcl0HeE5C0ZAX7C5vXNpc1Q/jbBYOPLc=; b=buglIWO1/AQ+FXNK78jAC9LHzjPozN8LCvBBpnv1qb7I8sCOUXkpdflD+Oqw4x1RPBryOp aYBZ3fkLCPh8vpWnOtZ49O2saWAsDCuHlijaNsQagCnYI4Z1yd4KLp5vPEalcpufK3CKmC zqgQXjPTlLYix0Z5NEgK70jJY5J80He5z42YwlHNG4QfPavbxWmyudm13qNhoVerMhZrCd SpEF+h/Fc9yzGTRqn9EQSaaDB3UbhhSZPMtu7PG4sFw2xXb06Vg6Zzd/sjvnZyJi4mCwdj IeRiposhE47PDi+6FiSYcK48xVVRvsAaYg9n1yOCD6MuKYTdLmj+m3JPIvio0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773735192; a=rsa-sha256; cv=none; b=I0ctOWwHD9+weKQn+K1UKf6Kho4o+m9A1Tm2n60QKn0n3LWKvBl37i200onwTL/0bLkWLU jZD60VJ0gNg1PM0ZLcL9U8h/useG36KleeLXaftirep+vFOD/bzEDZFDprJtbFC+xSSorS wMUSEYaztH9F8M7np1T8q+LqsVsnkUbQet/8C0sGO3Kyu8s9PCv2VHag+v9yskeYxmGdnr 5it20h3CF+06HHLXQPDqr29KXOZAp4QXB5aig3I1BOHxtUpOEfIUS46P4tzY1H1QZhEkYB W5vsigk6gn+ozlprJgVyUqOmUziWcewt7gzrkvY7CGPHGolK+wnmFRutWJQQPA== 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=1773735192; 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=wffxTzVPpCptcl0HeE5C0ZAX7C5vXNpc1Q/jbBYOPLc=; b=FCTPik+2Wdf0RRR7GkRfM/3SaylnBgWZtYo8Mc2FisrBgt7f2Ya0iqI6qwASZahoEONbix SDJxchoySHNQYy2njSy5qibDgDyot+e28szv4tCfHXKfIv+kuXMyDmYKP0c1SDS9Kit0Kl YoYNXu8gd845/gSd1oeLbIPP6JFuume7cHEMP1vFIDBV1/BDvESM8BqOdRWaJEf0Sc+zFa NGDhn+C4N+XWv2/FrwNNwTmUyZpdRQLzCU9bCLfIEPslh1GHrJV8fem5tWtXRwAm76pkfR OFTs5ELCMlxaWsN49b2pWN9jzr07N8KrHN+egMHmXnU5EZ9/PMn0tvXhFmgI6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fZl876LfGz1CW0 for ; Tue, 17 Mar 2026 08:13:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41812 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Mar 2026 08:13:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: a8b9a05d3cad - main - if_bridge(4): don't sleep under epoch(9) in destruction 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: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8b9a05d3cad3bdcb9008232c9172a1aeffbe9fd Auto-Submitted: auto-generated Date: Tue, 17 Mar 2026 08:13:11 +0000 Message-Id: <69b90d17.41812.3ab41f4a@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=a8b9a05d3cad3bdcb9008232c9172a1aeffbe9fd commit a8b9a05d3cad3bdcb9008232c9172a1aeffbe9fd Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-03-16 12:53:45 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-03-17 08:11:29 +0000 if_bridge(4): don't sleep under epoch(9) in destruction bridge tries to run callout_drain(9) twice under epoch during destruction. once for bridge_timer, which is not required to be under epoch. second time for the BSTP callout, which is already disabled earlier inside bridge_delete_member. Reviewed by: glebius, zlei MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D55876 --- sys/net/if_bridge.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 0cd71a20fa35..d69fe85453f9 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -953,8 +953,6 @@ bridge_clone_destroy(struct if_clone *ifc, struct ifnet *ifp, uint32_t flags) BRIDGE_UNLOCK(sc); - NET_EPOCH_ENTER(et); - callout_drain(&sc->sc_brcallout); BRIDGE_LIST_LOCK(); @@ -962,6 +960,8 @@ bridge_clone_destroy(struct if_clone *ifc, struct ifnet *ifp, uint32_t flags) BRIDGE_LIST_UNLOCK(); bstp_detach(&sc->sc_stp); + + NET_EPOCH_ENTER(et); #ifdef ALTQ IFQ_PURGE(&ifp->if_snd); #endif