From nobody Mon Oct 12 15:28:56 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 4j3LwT0k6Tz6vxhc for ; Mon, 12 Oct 2026 15:28:57 +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 4j3LwS6Z3Tz3PKS for ; Mon, 12 Oct 2026 15:28:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791818936; 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=nj3uFvjnx+T+ABMHqyw6se1K3ESzFGgkyYw/nENuS3U=; b=kxg8eoLQwh0XPa9vq/Kch5kVbAN5riG8TFleRBmQ8lTojPG/zF7RZcoHTw+WLC7TdqZ3Dj A5Yl3zkHZJImriJ5owSfZD9uCGrJkvgymzb6OjxCOpjMRQ2iPC5EQs7dTlOMH2a4Z+vzd1 TaAw/52dztZK1Cm8rGfnPJ6Lw0LMqj4i+jRIT/S4id4ROeTj7yxtwuQVfW+zUYk/XHWdAr ixyOv1f1eOtAn+P11DTIL+DLVAfRHS3rkP1AnvMz34ipNKxdcfZXzaxcRTX6GOfeVcpvQh 3ZIsMHBINnXkS4Ctc5GjpRkQrbrsrI0JqbBuWSVs6B7HcTtGLZfzjgZetBSPEg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791818936; b=nc7WgvB5N6XhdOTrLX/OIUUJklVZ6rwbMk7p3MmAPYgmlOKMexo5G9IKGN1zBAhqGuIS9P 4AuhdgbJ3VjkyXecWtRezPwTZJZYfLwLRHnVjKr65NkiblNzhwjSVAI5+Vz2hQykkkOJor Imprynzcarczqf7YRK0kxF4Ag3GTkZl+iUhCAUnNOjpXksC58lSMKHjXNtn5VIitIffg8o Xh/si7KUhKUOSWv6DTJbJ14bxHR28LECwlDqER6YVtTlbHLl26+dVuweu2WmoaPW37dw2E Mc4SkQcdf21Olng6kswptXdqvsz/tzypR/OF4AIRTUKE12psNU54ggMI4bi/UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791818936; 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=nj3uFvjnx+T+ABMHqyw6se1K3ESzFGgkyYw/nENuS3U=; b=i3m76DYBv6EKJ44q5eUw4dSMJqgvrT3xWOUEMrPxVIGOKRK81KsDkitSfew0A/stWLO/RE lPFVVlTQWfBN/7hI03ne3x6UlDEIDY3OCWKZmlFBbXSWokg9qbBDkuvzHC1AgEmt7ncmsI wHhi/Qytvi9WI/Pm3Akll0MGycQ05Jsn5pnAQqEhYxARgEtcPhk3iW2tWcnytZlhWN4yuu 2loc5+mD1Oad3EmdD28uaI0pFzGZMZC8Pe8w9+z0RivJlcf34M6L4SdrTUyrN67UsIFYPN N+Wb7V7Y108PWOXiwCD9Hw8oHXlnu4sII31aLpfIoBE2rAWrK2qM+TMfBbyTqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j3LwS5JsQzbTT for ; Mon, 12 Oct 2026 15:28:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19e25 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Oct 2026 15:28:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Kevin Bowling From: Ed Maste Subject: git: dfe2ff8fd33f - stable/15 - aq: Report partial initialization failures to iflib List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: dfe2ff8fd33f0c8d7af9319d8bea11de2e3c92db Auto-Submitted: auto-generated Date: Mon, 12 Oct 2026 15:28:56 +0000 Message-Id: <6accfcb8.19e25.18598e3f@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=dfe2ff8fd33f0c8d7af9319d8bea11de2e3c92db commit dfe2ff8fd33f0c8d7af9319d8bea11de2e3c92db Author: Kevin Bowling AuthorDate: 2026-09-07 11:50:58 +0000 Commit: Ed Maste CommitDate: 2026-10-12 15:27:45 +0000 aq: Report partial initialization failures to iflib Stop initialization when hardware setup, ring initialization/start, or datapath start fails. Run the existing best-effort stop/cache/reset cleanup and report the failure through iflib_init_failed(). Do not keep configuring later rings or publish the interface as running. Reviewed by: nprice MFC after: 2 weeks Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D59853 (cherry picked from commit 050683bb8e136981e4a1f66e845ab05c135630f4) --- sys/dev/aq/aq_main.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/sys/dev/aq/aq_main.c b/sys/dev/aq/aq_main.c index edca88f34bba..04ce3a055aa0 100644 --- a/sys/dev/aq/aq_main.c +++ b/sys/dev/aq/aq_main.c @@ -775,9 +775,7 @@ aq_if_init(if_ctx_t ctx) softc->scctx->isc_intr == IFLIB_INTR_MSIX); if (err != 0) { device_printf(softc->dev, "aq_hw_init: %d\n", err); - softc->init_failed = true; - AQ_DBG_EXIT(err); - return; + goto fail; } softc->init_failed = false; softc->init_retries = 0; @@ -800,11 +798,13 @@ aq_if_init(if_ctx_t ctx) if (err) { device_printf(softc->dev, "aq_ring_tx_init: %d\n", err); + goto fail; } err = aq_ring_tx_start(hw, ring); if (err != 0) { device_printf(softc->dev, "aq_ring_tx_start: %d\n", err); + goto fail; } } for (i = 0; i < softc->rx_rings_count; i++) { @@ -814,19 +814,23 @@ aq_if_init(if_ctx_t ctx) if (err) { device_printf(softc->dev, "aq_ring_rx_init: %d\n", err); + goto fail; } err = aq_ring_rx_start(hw, ring); if (err != 0) { device_printf(softc->dev, "aq_ring_rx_start: %d\n", err); + goto fail; } aq_if_rx_queue_intr_enable(ctx, i); } err = aq_hw_start(hw); - if (err != 0) + if (err != 0) { device_printf(softc->dev, "could not start the datapath: %d\n", err); + goto fail; + } aq_if_enable_intr(ctx); err = aq_hw_rss_hash_set(&softc->hw, softc->rss_key); if (err != 0) @@ -855,6 +859,13 @@ aq_if_init(if_ctx_t ctx) device_printf(softc->dev, "could not restore promiscuous mode\n"); AQ_DBG_EXIT(0); + return; + +fail: + aq_if_stop(ctx); + softc->init_failed = true; + iflib_init_failed(ctx); + AQ_DBG_EXIT(err); }