From nobody Tue Apr 14 10:58:14 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 4fw1Tm08Kvz6ZbsX for ; Tue, 14 Apr 2026 10:58:20 +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 4fw1Tl5nvbz3XNF for ; Tue, 14 Apr 2026 10:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776164299; 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=VRpO+M4grXeW8G8vmV0LSN5Y+94eSJdrgJF+XzQxr7I=; b=UfsNlNnWGmT8JBh8zNzzwZdyRyS/Qx2j7Y4FmGi0Ns6PfZNuUAEwOijiGlDaVuuNCKhnZ6 SWGfNlZvXQ0tRYfszozDLHk68Dd0kvT2PKAFsrZfplYH6n1oqHVWe1m0j2GZlYP6BWy5sB cAnXEIwgHAzXASTM4F2vDJD3URZOUzmQxqy8jp8LlIdJbXPim+vpF3YKcDeBo+EUc5Vpzh 3zcX/2+Z74JE98RFQyqop55c1By7o9GcirpC1w+16v6OPMj71YUTU8lAB1dg0R4k0RLEzU OgPIXtDpCt0JvjQBlmb4z9WLbr9/2tJkYNNdSmYBb35ieWKm1UdFlJ7ape/mlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776164299; a=rsa-sha256; cv=none; b=a1k/CFOJ605XCh6BtReD3QkYzieGAPbXT+TlYpi4LNioq7zjr1/C0C+L1WnbMSZ1+qEBAq +xlPv0GGIbXlHVTbDUKmXeuRqFluaapade4BdXGKqSXjkSjR7tZoudaYrqpDVkTGfCvzsf 1NTCfLkgOCxt4CsN2nsnDbEg6ua+2toz6kLVe9NTJh3apb1BRdD47Brj6KX1+H1H8xdD0N 7Nuwc1g1OsMbnzD3gIsVl+Q+FHN6Ml4fNLlnhwFekM6hNX3/w+ARYv9ETPe8th+V+S50el DAp6YSeZ7ATbt87Mz9dFAxQiapMtE7sZ1I03H/b3VqYCO2gA/14OfFDmvkDUCA== 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=1776164299; 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=VRpO+M4grXeW8G8vmV0LSN5Y+94eSJdrgJF+XzQxr7I=; b=Rj/v2CSrawkrb6C9a/TLpcDSEdhtf7miHnuKaVRft6ghdQeHEbyrlU156GkwGvvtrPSo4E ktBOUsYganFxlXT9j4beqKl/2wbElq6/Db/z8uQApytUI3hU1+DpVBgEVDqDfKCkLxtamn IQGRBVXBgmdK4BG9YsjAVZpZfMvPb/wCJLYa3Lr/FVoyvtx9b3HHL3Hy1mQzz9gd0K5L8v 399zwwF3vZ0u25sxYxWAC3yVdXztyK+rwTN8n2q6GM1ahDKQqCzBHxo9cPnB5J30nsbrYv mLmwYdP5gCsGGx3Ac4N/6t//Z3gISxol5uaDsafuEs6Uf9ckxWwWHHA3W5+faw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fw1Tl5BZBznHs for ; Tue, 14 Apr 2026 10:58:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31341 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 10:58:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 6af0ee7423bd - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 6af0ee7423bd1bbbad64fa033be3d4d0c675e331 Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 10:58:14 +0000 Message-Id: <69de1dc6.31341.422f73e7@gitrepo.freebsd.org> The branch stable/15 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=6af0ee7423bd1bbbad64fa033be3d4d0c675e331 commit 6af0ee7423bd1bbbad64fa033be3d4d0c675e331 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-03-16 12:53:45 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-04-14 10:52: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 (cherry picked from commit a8b9a05d3cad3bdcb9008232c9172a1aeffbe9fd) --- 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 ca15deddaf7d..c9ee7d742238 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -955,8 +955,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(); @@ -964,6 +962,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