From nobody Wed Aug 26 00:57:07 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 4hV5pD2nLMz6qKxq for ; Wed, 26 Aug 2026 00:57:08 +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 4hV5pC6GKTz3vM5 for ; Wed, 26 Aug 2026 00:57:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787705828; 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=WjEi6xuVKbtLHPtjVaD5dtoVLaMtC8h4jlLb1C8oqJ8=; b=fBhj9iyv+VRqwU7KtcRXroLYlVUmdfsP/RSajfiUIxRaNys2n4fFuq5pFS9x1FT7pKHvKK p9M8u3JPgARUQovopKLOuxuVoeb99TSmH2GXGMwLixwtF2aon/lAtdbKuyKJW82p2j/6p/ oV/vHKon1tUg3KlFvUMl8DmXO6EZZTBn0f8zSoywb8Mr4vIW0BUMIZ71Q1i6iYPAQ0hqJa ljYYEimpQO3/4Eoc1IdpPvd64CmUBQ922uqGm7YB8HC1A5E7DDCTpQpkbWuGwrrACNMA8Z TPAlfDvEhkdGGbK9WdkqEcNWOZ/qtAWED1ZgGRxpP0BMQ4HlrHDhn4BQwsgljQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787705828; a=rsa-sha256; cv=none; b=Tp+dxwCXK8XoQMPJGJDSPd0b83EGG+1oyrGvho4a9ZIWMdNKG/GxdIC26Z/URj991VxilQ gbVWI+EdQjbUEAFtNrPjNFaG8xjQi2M1w8P+ivbRcfsQ7xnaELoAY3o3FmVsZGTMRO/ZmP HP47Q8CZRkhvBzVKZAO/yP2QRMNOYPb3KyhADd/4uxMaTCIauYx+u6h9yLK21fSnrjy9sX FQuzAYURgUV51bTUu51U7HW7OtO2qu7iUVHlgtLCoCYIMXTnLcHesyDy+kD4KcehgPyCXP 7zEsKf10kRamd7Tt7L5Zq3k7M7SDO4cH3ot6fvINIlVsJgKBi3NFUyCb1w4yFg== 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=1787705828; 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=WjEi6xuVKbtLHPtjVaD5dtoVLaMtC8h4jlLb1C8oqJ8=; b=ndb76nniCXvr8wXqHlCG+vy6zcK26uLgTBHkCgywoW1kEq6yGOFg5CI+dUT6zPp2I67jo+ AYk5M6RJiD3/VfHWEKixCjrnmeBJvxsvxKvTWCsatgq1p/tpZwvYqvbfFxVv/D2hxJJVd5 KaDmvT1irUb7B/rKlncom3dROasjBXGyyoQ/bewC0qoYgK1guVcHNFTk8tatZbgdIN7fyJ SmzGnDZfuscj7fuhrpb9cWWV65MLx8ZAHZ6sYZMcaK2BWn1TA5ba0jVTG2pTRyPzO73a7/ ObCshb+ZBzsyY6T0Yhyfg9CHm1JyluGFv0b4peREMX/yAFLX4M5mnsn9OE6AoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hV5pC4Rx2zh7 for ; Wed, 26 Aug 2026 00:57:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42dcc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 26 Aug 2026 00:57:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 95cf012c8da1 - stable/15 - ixgbe: Defer firmware recovery transitions to iflib 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: 95cf012c8da1c5c1a0cf3ab564edc78b24b57de4 Auto-Submitted: auto-generated Date: Wed, 26 Aug 2026 00:57:07 +0000 Message-Id: <6a8e39e3.42dcc.32fec746@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=95cf012c8da1c5c1a0cf3ab564edc78b24b57de4 commit 95cf012c8da1c5c1a0cf3ab564edc78b24b57de4 Author: Kevin Bowling AuthorDate: 2026-08-12 03:36:03 +0000 Commit: Kevin Bowling CommitDate: 2026-08-26 00:56:52 +0000 ixgbe: Defer firmware recovery transitions to iflib The firmware-mode callout invoked ixgbe_if_stop() directly. This performed a full device reset without the iflib context lock or the iflib queue lifecycle. It could also poll the E610 firmware command interface from callout context while identification was active. Request an iflib reset from the callout instead. Reject initialization while firmware recovery remains active. This leaves the interface stopped and lets iflib publish that state. Request initialization when firmware exits recovery so an administratively-up interface can recover without operator intervention. (cherry picked from commit 43aa553ef45a4345bdfabadae40d811730151144) --- sys/dev/ixgbe/if_ix.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index 78fcabc3d68b..df3435434525 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -4026,6 +4026,10 @@ ixgbe_if_init(if_ctx_t ctx) int i, j, err; INIT_DEBUGOUT("ixgbe_if_init: begin"); + if (atomic_load_acq_int(&sc->recovery_mode)) { + iflib_init_failed(ctx); + return; + } /* Preserve the largest frame requested by the PF or an active VF. */ sc->max_frame_size = if_getmtu(ifp) + IXGBE_MTU_HDR; @@ -4569,11 +4573,15 @@ ixgbe_fw_mode_timer(void *arg) " Adapters and Devices User Guide for details on" " firmware recovery mode.\n"); - if (hw->adapter_stopped == FALSE) - ixgbe_if_stop(sc->ctx); + /* Stop and publish the failure from the iflib taskqueue. */ + iflib_request_reset_if_up(sc->ctx); + iflib_admin_intr_deferred(sc->ctx); } - } else - atomic_cmpset_acq_int(&sc->recovery_mode, 1, 0); + } else if (atomic_cmpset_acq_int(&sc->recovery_mode, 1, 0)) { + /* Reinitialize an interface which was up when recovery began. */ + iflib_request_reset_if_up(sc->ctx); + iflib_admin_intr_deferred(sc->ctx); + } callout_reset(&sc->fw_mode_timer, hz,