From nobody Tue Mar 17 08:13:11 2026 X-Original-To: dev-commits-src-all@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 4fZl8F2PYFz6VtJn for ; Tue, 17 Mar 2026 08:13: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fZl8F1n53z42SP for ; Tue, 17 Mar 2026 08:13:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773735197; 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=npc0gAR9z0U9D+X1RXFNVxCoTjV8aCwmETGLptNgFjtSzpQo3DbrSHw+skNtQDbSYYXL9P PO2VkointBEZ6NQ1B7HtKGWQqbRl67xtCZkEEtGkAkpnM29oS6LY0CsfqXEfqnWnchxJI3 yttTGBdj9wj2jeyYmq7jnbebaJNd7Z0VcH596msFQbMtxb3AqutmIzL0XzTe+SYl9Hc9FX AG3u7ATjlmLMyD1aD2cJPkkfgHw1LlPZt+SJfmkf08pxcGykrkee6D5B0TAJPJuRIHN9W9 rvhHNLYedWB64iE17x9AIZGX7t+E8mJjIkR0qye0yM8ODmEGM21eqSTH16I9fQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773735197; a=rsa-sha256; cv=none; b=hYKEvcOJ05NExmPLXCiqI+RC+AVLiJqtlhV6IuGV19nqTX8q70T6YQmsD5Hyb39lgl/VB3 n5qTIMK0M5oNxL2din2irLcjWr7zw6OC7CyXLi7ZPGNxD+cGk/sEduP6hyiU63f64VNsdE LY7pK0dTpTNRV4Lp9pDaL5h6wTs+tr3D7UbaKWUY5uI4V05Mc0xANmL3d6DplJx5KXdRfF 7sSL+LtwHmBSZwLX35RUtAMu0XjPtmXJCQXjLBI9/oDKhBs73XOjg8pgyefS93/ZRdKjgH UN2DlbWBcWN0cF/NFh1Mt/eLxu2dnn26eVukspcJs1PB36rKBCdZuQ/b8OxbPA== 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=1773735197; 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=p1vSbri+IIjdnCv5X7nOvjiMylZFnwKmCJyAVcLD57kf7YY9YYqjykn/gt8qVhhlgZ5hER IphLuNtcZscf9oE2D9kubnEf2/aV+ZFMdE3zKTGrgD/nyzr0ZkbdnsQLlVhxkK1Wc5A6hA mGAFUQ2IqVvS1xNhleCMxKlIMbbLahlyQBCzHE0OBPhdvvaj2NKvx1HnatkorpCII+UwpP eINpreURft0uq7h+f8RzkG7z8bqnfuh5OhCJC5soknyVe3ixtgQ64WJ42i9ZsJNU311ua+ yGq4fUSBxnJtYeY1/ZMgso4NsadcPEqnpEHOUMsPwkREvo2dQ16n16WxauvGUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fZl8F1Bvbz1CW1 for ; Tue, 17 Mar 2026 08:13:17 +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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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