From nobody Fri Sep 18 00:09:49 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 4hmCg229wHz6sHKx for ; Fri, 18 Sep 2026 00:09: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 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 4hmCg162hdz4cmV for ; Fri, 18 Sep 2026 00:09:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789690189; 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=nRSJXBfSBj946zL8td6n6J4yo910Do9HUdFSPAVKrDs=; b=Tk1IXYJ3ZrzBM3WVuAL/X8EmSdkmcnr8tEHEafgZhadlBFQEmoR3YZz0upRciPiamh4DfZ zBpMdE4UiwWU77kKxLsnznojXasAqP1hX8vuaXU6tsI3xA+MpDD1CpEJrfMHVkmipT7g+p wTg9/WnS9Q5kYaATimAnokWDctav2R7yBN0h+J0e+xTIDK3FpNXac+F+hRYwFc4bY9MtYh Q0C+yIo1NGcom0d6N8TU2pxqKXVZhdnC/Es0Y/FEC/fBhXyDSyhdLV+cLWjgoQ1yvxFtSt K7TqkBptJjTux6U2IzHZCoeG9dN3k9KtpOtRxxcOtRl+1LiLiKag1s6nvfFpfA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789690189; b=hGMZ+eJHoW4pidH3wqhd/Xqkl4/Sie0npLznf376ZbTdswgEkTQ9prBKcNVe+MOGn7bGbD 6nt7PQtwu+ykYUmCV0ogURP9czoeqtuj70PWZN8iSNcrl/lFEH0mJwkPBuQJsEz0jv6LFu PeMqflaJeEv8Ujo2Nz6ik5BtHTAN/bU2knPo9mQb76z5m1XwismlgEga1DA4zq/v04Iuuu nWsoguy017dhl431cF+3VJYE38VhogfoyxJmftDp8VNTCWxjDhGD/mIprwvomZ+0GuhV7V gQJvu/4b99WnkQnbjR3ZH089Cjw9Rktvvj5EYERkCESPkFlRHiAZJ1GMjZfR9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789690189; 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=nRSJXBfSBj946zL8td6n6J4yo910Do9HUdFSPAVKrDs=; b=ArYk3gL4SPUq7FrWHPItS0AqUtMIBo8g+N9qI+en//GMQWffszg4URj6IY2sgMNjbfYC7f DebpSMQRrEruY4vAY4Rg6jHC5N+/hho779O5DOPORWWnBEQhJucgjWAfEZV5xcXXwbHmvA 9In4pUac1vk89I9U5EpOLtjZIwmuL+o/P+neq8nmj1nB1EOnXA0RiN/nVsr4pJgPLCBO8d pYowC2ZRKpecZxPfu/yFB5A4cHN9KpVYl45ZS/BRvxxo4q3e1CKlsg/lLNf6+QgK2A2Ly3 aZzpewR+DprLFXaZzolmfJ2hlDEvzsGeMdwx7rzKNsPgXSMCg1i9iPOSN2+ehA== 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 4hmCg14hJVzvw3 for ; Fri, 18 Sep 2026 00:09:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3164d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 18 Sep 2026 00:09:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 671ae2d2ed68 - stable/15 - enic: Route resets through iflib lifecycle List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 671ae2d2ed680166ddb09df5e82d2cd23fffb076 Auto-Submitted: auto-generated Date: Fri, 18 Sep 2026 00:09:49 +0000 Message-Id: <6aac814d.3164d.1efb0cf7@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=671ae2d2ed680166ddb09df5e82d2cd23fffb076 commit 671ae2d2ed680166ddb09df5e82d2cd23fffb076 Author: Kevin Bowling AuthorDate: 2026-08-26 09:21:55 +0000 Commit: Kevin Bowling CommitDate: 2026-09-18 00:09:34 +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. Sponsored by: BBOX.io (cherry picked from commit 58f985559ee689e50233b9113df4f37375b48c2d) --- 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); }