From nobody Fri Aug 28 02:12:17 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 4hWMN1573dz6psly for ; Fri, 28 Aug 2026 02:12: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hWMN144ylz3GZD for ; Fri, 28 Aug 2026 02:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787883137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PL0zt97rxd9ZghoHeUnsFiecUzWrZ36lBnkHGRhdqIg=; b=p0zPEZ+WISo1ps0wvNt+5cOC1yq+z4ObK1zjDqJT7K5cw3SoUF6UMmYrNY/nDBmaKGRn7O 7GFqycDTLYKunwftCEGpK46RC58z+1dJV0bsi334KlSVUYWl9SXk/F4RR/sa2+/6IIDb9q 3Hg1IzTvS/HbhUILXds6upjAydTUZNfyRsydJpuTaLr1Ew6NWeBtjKbIEDIQETjP1NHwEj LPrQ13f3gL618lqvE1hchkw5Wa15l5Pg2VYo+cUzNOMGTM8zFN1EG6pJoN03NXoHo7o2DH /wquE8oZPOtW2dMrLM0GlDpatZUyW98gx+cmNL62ryiOZcipDD1b8P9uVv8lIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787883137; a=rsa-sha256; cv=none; b=xabweLpx4kSb66hJLCUydHL7LPbCokwupfnGEq67H8hd3HLi4rm2N/R+gWtqcJDXGmQHa+ OypwUvMKimRDRVHQcdlk/mxlZgwfiKfXh18A6ahL5vmpxZlNlG9MjSmqaUnQf22pLO6boP 9pkuufzThGLx3id2NOjgAQl1e/RKRxXFxBVu0ASRGpX0Ov6m27pTnaSkHDfuphHeEnkAK3 80/8xLxtgorL45hiL4fXb2J2m7rWL9+iy85pao9DPcSjYEFYh97vXtaElT4Hji5gOQ+SXB iVAHPMGZXDQjWtmEJnhH598JT0Nyt/KbK2PQ8XLvyxG+pPk99HPomHrbwA4FFw== 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=1787883137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PL0zt97rxd9ZghoHeUnsFiecUzWrZ36lBnkHGRhdqIg=; b=Vp99M/FeZ8/QPDaTE7ov4xOshYqSMmWIg2LOL5zlj72dWGBaOFUpGk0boMY3BVgIpisvrD 3CBD2HzzB14TZ0R6BZkFgaxaSUkklLTX1aE554R4khsHuPDWz4HERBsBE/xlo4A58oOkz6 e6Zt4d9E7mJH0bMLu4KLjph4IAjEBu0nExpvXZXaG7ob5lXTbgAAqItYD4h8aOpJ8zV4F1 Kczl4640DF7N4ittW/OENcJsnRuOX+qpdgHpMGXvOieTdz5eZFR+pnh7Cut+/BS3LX3d5x O1edlQ0vCuxnGoHsCZGUFAXoZZwbF3CYa6TWcNXJR3k7NthOSy5+40IorD/Q/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hWMN12q1Xzr8B for ; Fri, 28 Aug 2026 02:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3678a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 28 Aug 2026 02:12:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Sumit Saxena From: Kevin Bowling Subject: git: 4fba78389e5a - stable/15 - iflib: drain admin task and fix teardown order on register failure 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 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4fba78389e5a307c1060fd7785cb560397e82691 Auto-Submitted: auto-generated Date: Fri, 28 Aug 2026 02:12:17 +0000 Message-Id: <6a90ee81.3678a.647ff178@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=4fba78389e5a307c1060fd7785cb560397e82691 commit 4fba78389e5a307c1060fd7785cb560397e82691 Author: Sumit Saxena AuthorDate: 2026-04-13 06:33:46 +0000 Commit: Kevin Bowling CommitDate: 2026-08-28 02:10:52 +0000 iflib: drain admin task and fix teardown order on register failure When IFDI_ATTACH_POST() fails (or netmap attach fails), iflib tears down with ether_ifdetach(), taskqueue_free(ifc_tq), and IFDI_DETACH(). CTX_LOCK is still held after ether_ifattach. ether_ifdetach() and taskqueue_drain(admin) must not run under CTX_LOCK. Teardown ordering (match iflib_device_deregister): - Free the per-interface admin taskqueue after IFDI_DETACH / IFDI_QUEUES_FREE, not before. - Drop IFNET_WLOCK() across IFDI_DETACH / IFDI_QUEUES_FREE so driver detach can sleep in LinuxKPI workqueue drain, then retake IFNET_WLOCK() before iflib_free_intr_mem and fail_unlock. Reviewed by: gallatin, kgalazka, #iflib Differential Revision: https://reviews.freebsd.org/D56316 (cherry picked from commit 439132310ae1f623f6c0a3dc241d0a34e98e040b) --- sys/net/iflib.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index bb9191a2da31..4726ca5bfaa9 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -5299,16 +5299,33 @@ iflib_device_register(device_t dev, void *sc, if_shared_ctx_t sctx, if_ctx_t *ct return (0); fail_detach: + CTX_UNLOCK(ctx); + taskqueue_drain(ctx->ifc_tq, &ctx->ifc_admin_task); ether_ifdetach(ctx->ifc_ifp); + CTX_LOCK(ctx); fail_queues: sysctl_ctx_free(&ctx->ifc_sysctl_ctx); ctx->ifc_sysctl_node = NULL; - taskqueue_free(ctx->ifc_tq); + /* + * Drain without holding CTX_LOCK so _task_fn_admin can run to + * completion if it needs the context lock. On fail_detach we already + * drained above; a second drain is a no-op when the queue is empty. + */ + CTX_UNLOCK(ctx); + taskqueue_drain(ctx->ifc_tq, &ctx->ifc_admin_task); + CTX_LOCK(ctx); iflib_tqg_detach(ctx); iflib_tx_structures_free(ctx); iflib_rx_structures_free(ctx); + /* + * Match iflib_device_deregister: IFDI_DETACH before taskqueue_free. + * Avoid IFNET_WLOCK across driver detach (LinuxKPI workqueue drain). + */ + IFNET_WUNLOCK(); IFDI_DETACH(ctx); IFDI_QUEUES_FREE(ctx); + IFNET_WLOCK(); + taskqueue_free(ctx->ifc_tq); fail_intr_free: iflib_free_intr_mem(ctx); fail_unlock: