From nobody Thu Oct 29 06:36:50 2026 X-Original-To: dev-commits-src-branches@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 4jFZJf2WsKz6xtml for ; Thu, 29 Oct 2026 06:36:50 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jFZJf1XBXz3CDZ for ; Thu, 29 Oct 2026 06:36:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793255810; 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=p831OQzD4Yo9V4W6K8nWTXYS4JSmm9/Wz4lN7QAZRTo=; b=XDRTGn+Lw37ilT16xtMTc3NVyO/nBHJCa28/HxZx+X525Spat3v8SgRNFj2kQgpZHkA9Tw WBQHvCUHACl8xt+D1OSL2oBZD8c0XDranrzHqd63XtSLipFPfc04TtjmbnAM9+z1rP5DD8 VKQDlXwk5rhb4qJbkaz1igD5q6ilyEBFMyUg9OsFbKZ191MVa5K9HzU8k3JK8cYM0sq2D0 YpGBe/AOkPcHGOQtEsTIPGLu6MHCMuqb+mwrPwdGI7KLsp6yxtHa05iwnFt/xHCW/CUwN0 OXDltsQjQmFKS3bOBgh4k8Bu35E9OjrkLEFLjnqSzeZ8Q2rTkvSEHwg4jZRQfQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793255810; b=yqUm8cAG75sbyzbM5rsJtl5PLALNK39ruiq+SYKnEBQ5P9vgnomqYguX5caynqRSJEbP88 qEaGPa/GzZXxIrBmTv9VSfA/jTfWkA1AYlYRRh327EE1cQaxqyrx/BDuvPOTkvbG01XHGC WXmLsRDgZIwLn2vocYt7wZXJwScSmLRT4mn/o0N8jw2MhjnDqTxRzX5MiUiciXttDx2A0V Agkf1KWgNzl7S02b7j8F+IwkmW0+xHPfiPnpmqcsQ56+OrhynClXeJwXfKmcj0NGbPq8f9 ghrOp2Lk3e9Io5kNPqKMBweMLkJ2Dtdjkdb/uZ0pgV4p5g6kU4xDoHqajyzXgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793255810; 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=p831OQzD4Yo9V4W6K8nWTXYS4JSmm9/Wz4lN7QAZRTo=; b=F+g68wRQQwgJPHpFGZmjXhidUbPyLlT8cZ7x3DK9iQtsWPOMPIONppKg0fVbeu4YagCn5I YUTg0rePE3B0NwAAVyjavpYLg0yki7RYpdWkxuip/96S1PDKSYOkR21E0a6puIxfugBeb/ +lwU3T+h3AL2fwDUsxybtiHLlQBnahhPWRS286dW/bdGGemK2lN4i8ux2oT51ZsPksDD75 XnaqAJDefsDo+Wh7e7vJ86xYPkD9gkqSEgRdsSKWimg/YVMn5PQqVJqYyZpk3pKGhRqPmd 5tRXLhytkxYBKJpWAsy6hMkEWt8KdDasWF3F8QmSNzLu2fXX7TU5M0uEulSNyw== 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 4jFZJf19BVzRhY for ; Thu, 29 Oct 2026 06:36:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d422 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 06:36:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: b5f07a56dbbd - stable/15 - enic: Report device enable failures to iflib List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b5f07a56dbbd3aa9fd022ec77c9511b50ba2ef90 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 06:36:50 +0000 Message-Id: <6ae2e982.3d422.1dd3820e@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=b5f07a56dbbd3aa9fd022ec77c9511b50ba2ef90 commit b5f07a56dbbd3aa9fd022ec77c9511b50ba2ef90 Author: Kevin Bowling AuthorDate: 2026-09-07 11:13:26 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 06:36:41 +0000 enic: Report device enable failures to iflib Do not publish a running interface after vnic_dev_enable_wait() fails. Run the existing stop cleanup for the queues configured before the enable request, then report initialization failure to iflib. Mark those queues as needing cleanup before submitting the enable request so the stopped-state shortcut cannot skip the unwind. Sponsored by: BBOX.io (cherry picked from commit 24f8c4e852d69189a1de1ff51c351ae8ee603dfa) --- sys/dev/enic/if_enic.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/dev/enic/if_enic.c b/sys/dev/enic/if_enic.c index aa80ee6bafde..afdc39685aee 100644 --- a/sys/dev/enic/if_enic.c +++ b/sys/dev/enic/if_enic.c @@ -984,6 +984,7 @@ enic_init(if_ctx_t ctx) struct enic *enic; if_softc_ctx_t scctx; unsigned int index; + int error; softc = iflib_get_softc(ctx); scctx = softc->scctx; @@ -1005,11 +1006,17 @@ enic_init(if_ctx_t ctx) bcopy(if_getlladdr(softc->ifp), softc->lladdr, ETHER_ADDR_LEN); enic_set_lladdr(softc); + /* Queue setup above needs normal stop cleanup even if enable fails. */ + softc->stopped = 0; ENIC_LOCK(softc); - vnic_dev_enable_wait(enic->vdev); + error = vnic_dev_enable_wait(enic->vdev); ENIC_UNLOCK(softc); - - softc->stopped = 0; + if (error != 0) { + device_printf(softc->dev, "Device enable failed: %d\n", error); + enic_stop(ctx); + iflib_init_failed(ctx); + return; + } enic_link_status(softc); }