From nobody Tue Apr 14 09:14:19 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 4fvz9l47Djz6ZTZZ for ; Tue, 14 Apr 2026 09:14:19 +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 4fvz9l39tvz3Fm0 for ; Tue, 14 Apr 2026 09:14:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776158059; 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=OfUGp0IhMKCMrpHYImcvA5l8n+7EvgW93kDWOS183RA=; b=eMIQH9JgEKQD3WxQeEh7rSlKSJBMwe2E9li8GudXKIaJa3uRsz/e+cqL1ZEfQjmpMA6YyX gHUIJbXQtwoH1AbeO3ZupBHMAeShpDMNyRDFI8L91vOaJSUdM3aEJlbh9evIymhfsy8pIV 5iVh2WzFpQ0PMunZZU2N8sEqFeDyg0lfekwFSCX3Q4LFYSxRMAP2nFOyLPR2fbx8a624OK IHv85gU5Sz2Pnoy9HqHB/FLbQMq7+7C3DF47uNVapEiHBWNoa27jXXTF60/NBXP+EjP2QS c77wZZuzKbGconlPCsaK5tLWlwu84rOc2VGNy46K0wlyTydfGu9/CAXmAwgntA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776158059; a=rsa-sha256; cv=none; b=RdxtLLOvU7klIByxsb6EMHEhYT3jRIcuERgC2nBT7Y31h/X4MLTb2ovMBGWYMov7lazcHh HRNrYADEOn0HY2zaAMhKYEHc2grs7d1V32lZkWUPtv7nLbLe6KxMo1j3pcdgOlwrWAoov9 svhbpiy8PCJnm4haqXf0IYJuDIFHrc8xdMwKyRkZpZiA3qcdr4sHsj5NdgjNeyxpFAU+bg 1o89jmTlPq7FSn51QJWle18OJjoZsrMxhMHnwjjvXaRz4rBsgppPPHdbldtHXcJMbtioYn KmcpPdtukI+MYr+M+NAQ2VHRj/NSIE7oBVq2GVxjyd67aoUfnfF2JI2PDmbAUw== 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=1776158059; 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=OfUGp0IhMKCMrpHYImcvA5l8n+7EvgW93kDWOS183RA=; b=EcDsVENQIFjxCn5BQeOWJJ3P4+UsCZwzBd//OzLqb+GY2YGq2Lu0gxljCx4g8CFvb/06hS W5DmbJL6CyPe4U98dG9/ixpaSGUws5mkeLSvtcQgPRks/Kol2hk3KtjkHpj5Znk40RBRUU WVGtgjCiVKM8AmDlsS0wo+6VDeH+WRW8G/C9M29M8a2+Kj3oFnsyZ+Vpg7cz2vJ7qK/IPQ 3PF6EpxSjjkH0OorjtUSNy7Lvk9NCBln2PZrVU45Fe3vLuFDJBIXhES8l+LZfTN0RqDcTb QSfZyvYw/yZJA6sem/oJmHtYvUOjWrazxrVoovhMLCvQzPNFWEB0rudS0AotTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvz9l2l86zl8s for ; Tue, 14 Apr 2026 09:14:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eb43 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 09:14:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: 439132310ae1 - main - 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 439132310ae1f623f6c0a3dc241d0a34e98e040b Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 09:14:19 +0000 Message-Id: <69de056b.1eb43.38d63c8a@gitrepo.freebsd.org> The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=439132310ae1f623f6c0a3dc241d0a34e98e040b commit 439132310ae1f623f6c0a3dc241d0a34e98e040b Author: Sumit Saxena AuthorDate: 2026-04-13 06:33:46 +0000 Commit: Sumit Saxena CommitDate: 2026-04-14 09:13:53 +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. MFC after: 2 weeks Reviewed by: gallatin, kgalazka, #iflib Differential Revision: https://reviews.freebsd.org/D56316 --- 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 186c41d9f839..b58544255efd 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -5292,16 +5292,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: