From nobody Wed Aug 12 20:30:56 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 4hL0W51fqGz6nw1L for ; Wed, 12 Aug 2026 20:30: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hL0W50ljwz4Fm5 for ; Wed, 12 Aug 2026 20:30:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786566657; 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=ehvvkmucpXzv2TtPBleAwSsJn2SotPgRpg4B3rkWnLw=; b=lHKcMXcc0e53xNZwNxiM/YKwec3iM46Xr6xiLj6kHDCZbtSvgOswqtSbInH7Bo67ORIrrX MQZ2hKDmLIa4nHKLokK1w05zb61sRKtkq+qm0ewJxlCdl8ISvTUB/XbfS1bVG8PsBwqBdj AmgeHZfxaHnevbY4Xaqrsfb0LWYH2xhL+vt/ppJQ5TVzTMsawTA8o0UIPw0JE3sYaJW/qL S7tKP0IAh10iZVgudh4zIrQOK4W0yGx6wSZcYbKIWfs157FmTzIadVloZfzHHK0BmXER69 50eYwxzJdwELF+it+I0rxdmGQLPvRDlFYnjFya3M/X6iYTnShLTPSdhpUD+lyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786566657; a=rsa-sha256; cv=none; b=LsuxdgVHu9TX6yT2zNrKkyBeBRmgYmVTF6t34wB9AZAC0yp3Itr7HNnOw2vO0TxNOjtH0u IEDymLNgj2c40l5akOatEBfm+BntJ6rbfLLc4HxcDc4DO3twh1ibUL5A2zFDxu+RLraBkx pDzCkXnWo/ljjOJXCBMaykRVegwpYL3C7PpkiF2RL9TqyFgArwDdpq7etHwben3tiUkVkq BEd4LKqVTGsZPQz3iNRLheIAQ1QbEScAMoOuW6JJcDSz8IKix63PEEpvtfJMgSNBn247Gp M6ArL45eZH80JK+wrzO42VS1Upu62l1YiVbgn+ThOU7MCLwrS22JBedhR/SiDQ== 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=1786566657; 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=ehvvkmucpXzv2TtPBleAwSsJn2SotPgRpg4B3rkWnLw=; b=ePWxb+sASSHLrb6gb7fdqfQoNKzvFyrMN/+NUCYTh5Nv9aonOUTXcAY6COEA2rAr44vGOv wus1mo2XqrW7k1Him/PJk7gUvg4I6HHuXevTtL3oHTm3NbKUI61DgbIT4NCfQ3DaZoXfyW JTvO+cHU5mpMnDWlpCUxNJTD9P8u6OSW8DGg6cCTbS549FUNYzAy/sUcsB5Ne4IULh8IwU GB0hlFhkzAnOUk3tzh1SBrXgSts4RJOnwPrZ05W/Ohl87ish1ki33sHrB6S1noe08cL71C vQ0PU2gJMM4lCCq2CnhkYKuM+E6sT3dg+i9VvQ1nuX5H+R8k9FTYRoJlLs4rew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hL0W46YTNzh5M for ; Wed, 12 Aug 2026 20:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3725f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 12 Aug 2026 20:30:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Abdelkader Boudih From: Kevin Bowling Subject: git: 0fa6b2c523ee - stable/14 - e1000: defer sysctl-driven reinit to the admin task 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/14 X-Git-Reftype: branch X-Git-Commit: 0fa6b2c523ee763604a842df8da16ebf30888354 Auto-Submitted: auto-generated Date: Wed, 12 Aug 2026 20:30:56 +0000 Message-Id: <6a7cd800.3725f.285644a5@gitrepo.freebsd.org> The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=0fa6b2c523ee763604a842df8da16ebf30888354 commit 0fa6b2c523ee763604a842df8da16ebf30888354 Author: Abdelkader Boudih AuthorDate: 2026-08-05 04:34:13 +0000 Commit: Kevin Bowling CommitDate: 2026-08-12 20:30:35 +0000 e1000: defer sysctl-driven reinit to the admin task Request the reset through iflib and let the admin task perform the stop/init under the context lock, matching what the VF and SR-IOV paths already do. The assertion is compiled out without INVARIANTS, where the same write instead resets the MAC and takes the ICH software flag while the queues stay live and an ioctl or the admin task may be running. While here also remove unnecessary em_if_init uses: iflib_if_init_locked() already runs after IFDI_RESUME and IFDI_MEDIA_CHANGE, so the trailing *_if_init() only added an unstopped IFDI_INIT that the following iflib_stop() undoes. Differential Revision: https://reviews.freebsd.org/D58628 (cherry picked from commit abdde8b602813753e423610b39be6806da5647e2) --- sys/dev/e1000/if_em.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 867f5cc0cd69..6c489bec5a4c 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1487,8 +1487,6 @@ em_if_resume(if_ctx_t ctx) if (sc->hw.mac.type == e1000_pch2lan) e1000_resume_workarounds_pchlan(&sc->hw); - em_if_init(ctx); - em_init_manageability(sc); return(0); } @@ -2109,8 +2107,6 @@ em_if_media_change(if_ctx_t ctx) device_printf(sc->dev, "Unsupported media type\n"); } - em_if_init(ctx); - return (0); } @@ -5622,6 +5618,16 @@ em_set_flowcntl(SYSCTL_HANDLER_ARGS) return (error); } +static void +em_sysctl_request_reinit(struct e1000_softc *sc) +{ + if ((if_getflags(iflib_get_ifp(sc->ctx)) & IFF_UP) == 0) + return; + + iflib_request_reset(sc->ctx); + iflib_admin_intr_deferred(sc->ctx); +} + /* * Manage DMA Coalesce: * Control values: @@ -5667,7 +5673,7 @@ igb_sysctl_dmac(SYSCTL_HANDLER_ARGS) return (EINVAL); } /* Reinit the interface */ - em_if_init(sc->ctx); + em_sysctl_request_reinit(sc); return (error); } @@ -5693,7 +5699,7 @@ em_sysctl_eee(SYSCTL_HANDLER_ARGS) sc->hw.dev_spec.ich8lan.eee_disable = (value != 0); else sc->hw.dev_spec._82575.eee_disable = (value != 0); - em_if_init(sc->ctx); + em_sysctl_request_reinit(sc); return (0); }