From nobody Thu Sep 03 03:28:16 2026 X-Original-To: dev-commits-src-main@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 4hb4mx0HCPz6qSs4 for ; Thu, 03 Sep 2026 03:28: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 4hb4mw647kz3gFc for ; Thu, 03 Sep 2026 03:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788406096; 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=rfneDUYz8ANbpEdl53e/hAVNFcw97nlVamZYVNsE0i4=; b=p8iVcqOES3nHVNGBPK94eQwUccRTtrVr42gLEOI9pNkiqdhJFLazsaULv4qq409hyHKaIt a3W7Tns4cOZijxa1Uf+nG8gwYQG4/3tKwR8SktF20Nj6OCeYq4rS6EEnIuyCTq8vGUxjW/ EdHUXc3gS+8vVd41SI/6hxqPg4oUPRt+t0aqAOW8MgXIzDM3wDYa+I4ZAPTYeR6CYVofq7 kEAsyVZCiu4ie9OqMCHRQCFvoabqNe2S3kX4idZ1DyRcXb17ARNHf0hjr6Rwe9fTXqPqj5 Yi45juo4FB+FvZeaHsVJDzYbz89PruRgJMrpZc7ibKD526KDbpBslXaol1MmHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788406096; a=rsa-sha256; cv=none; b=VV9C/yy3m3gRwQX+uQqD2jiiFJq1+U9/i+DOKgECxHQGCDNFKX17IOZZ1DTpLKrqDXGS6q zHchHS+oWUvuVc+4kzSa2JXv9Qh84UkDLj3rFL06ujqZOpnOIIt5jM5gWL2ND6KGqALtw1 +dAsLYvm/fl3urlVUkbPNjZIpIDkVyrlW5z2oCPKv5HbnsScsW+K5L21y8tGOD4VAfjRRC RabeaNxTYSsdsytqU2gsbcmIzdh/2q8fJzlFYsEL1w3Ec2WBoaGx8vy9nLdzyoAjEoIITX CL20p86AZbAwseEYD9vkVjfDLtsIT9ICVkzvQmO8mMtEc3kYICOJA8XE7NnWpQ== 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=1788406096; 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=rfneDUYz8ANbpEdl53e/hAVNFcw97nlVamZYVNsE0i4=; b=obRfNfcy33rwxqIJ+Jm5BuL4WVk4vyuAquBqAtkxr9MXPqVT75XoobvHrxpLwqTTqk0+i8 RYo7nMyv/ZlCmaixj13qDikgLT8wl/QJE0cKnh71kA3FaTXKNN1gTs8ROh8b67EwLOXR9f t8CK/CIXE/mnjFOmoJ+k5VRC2qNDNxyOn+YNT//OwB+o9leYlsCdyRu66k6vI+uu/t6wsa pJ6uJS7srqXKXiKuFl+De9fZw18eBDYLhTQlWowC/iuJp4j172NyouFiscMy+IfkrdhHgb qpkF2CX0/xTqrQygIuYEEYb6s+80uxv1t9wg5uv5zBYZ8ke202SrPj3R6PhD8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hb4mw4zV8z1BLV for ; Thu, 03 Sep 2026 03:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 366cc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 03 Sep 2026 03:28:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 58f985559ee6 - main - enic: Route resets through iflib lifecycle List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 58f985559ee689e50233b9113df4f37375b48c2d Auto-Submitted: auto-generated Date: Thu, 03 Sep 2026 03:28:16 +0000 Message-Id: <6a98e950.366cc.806f235@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=58f985559ee689e50233b9113df4f37375b48c2d commit 58f985559ee689e50233b9113df4f37375b48c2d Author: Kevin Bowling AuthorDate: 2026-08-26 09:21:55 +0000 Commit: Kevin Bowling CommitDate: 2026-09-03 03:28:09 +0000 enic: Route resets through iflib lifecycle Mark the driver stopped after attach so its first IFDI_STOP() call does not repeat hardware shutdown. Defer error interrupt recovery through iflib instead of calling driver stop and init methods from interrupt context. Let iflib own the stop and restart around MTU changes as well, avoiding duplicate lifecycle operations. MFC after: 2 weeks Sponsored by: BBOX.io --- sys/dev/enic/if_enic.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/enic/if_enic.c b/sys/dev/enic/if_enic.c index 74e3ff6f8721..8d8f75d4611d 100644 --- a/sys/dev/enic/if_enic.c +++ b/sys/dev/enic/if_enic.c @@ -449,6 +449,8 @@ enic_attach_pre(if_ctx_t ctx) dev_err(enic, "Device initialization failed, aborting\n"); goto err_out_dev_close; } + /* Queue DMA has not been enabled; the first iflib stop may be skipped. */ + softc->stopped = 1; ENIC_UNLOCK(softc); enic->port_mtu = vnic_dev_mtu(enic->vdev); @@ -912,8 +914,8 @@ enic_err_intr(void *vsc) softc = vsc; - enic_stop(softc->ctx); - enic_init(softc->ctx); + iflib_request_reset_if_up(softc->ctx); + iflib_admin_intr_deferred(softc->ctx); return (FILTER_HANDLED); } @@ -1091,14 +1093,12 @@ enic_mtu_set(if_ctx_t ctx, uint32_t mtu) softc = iflib_get_softc(ctx); enic = &softc->enic; - enic_stop(softc->ctx); if (mtu > enic->port_mtu){ return (EINVAL); } enic->config.mtu = mtu; scctx->isc_max_frame_size = mtu + ETHER_HDR_LEN + ETHER_CRC_LEN; - enic_init(softc->ctx); return (0); }