From nobody Wed Aug 5 04:43:38 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 4hFHqG6P9dz6mYKq for ; Wed, 05 Aug 2026 04:43:38 +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 4hFHqG3jyhz3RmJ for ; Wed, 05 Aug 2026 04:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785905018; 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=tjA0TxUpHrDMRCyFUp/84JDXuwHR5r7Get+2U/4E7sI=; b=gKTd6LzBN0l92ybdORBQjdZMb4+X4QgrbkeYC2ypE09+kuITHA7Wk13VpUddL48BstCYd/ YQZRHdHko8vLmn1D1Waerfrc/VhdDEqWmbHSZagCgRB+dQkJtUEeNRPpl03/PUnhb5jeau 7xsRGnDKVOh0pw4A5n96n+xLS4Ij1AyjOZyw3nQeX9Kf6yDOqdOM00XN/KorRjHt48lpBz v5gaz2K8+npkWQYl/JWqe66pABCyBkKKDvcPRA0Vt7PaSq2VBY1msDuzlM8ONFTCt5WnZG XYpHvyyM/gxJEchx8X2f+AiKA6EKi9l1vtTYvjFpbrPIV87B1tAXL6zoBuqmlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785905018; a=rsa-sha256; cv=none; b=wL8TdPday3rvYhUx79bwR5bxJGRa5U7aOPMLym4jykwo9arrqI5nL5AazdEReqtPtR+4Xj D9H36U/F7UwcXr73YSXQxICy/RVAZN/QX95p8X7bEsdci44BZjjRUL4Fgt8op9Rcqe/29y VX/ib9kCrh5CWTVYVyShCpbr8ro4wQ1/xtc/4Znb6lNVhfmZhla4eE8uLd4L54kaB9024c 0f9stm4lKYnMH02qbpR6TIZBiurkshexMJ9vk/fbOKEcd+bH6YEUpnrN3yW+Lz1vQYg0AM jHnkvrvisAruRbmbbD2HwJhG+K+STTbeDPr1WxoI/jaRLgCUhU+2JgPAQSQTQw== 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=1785905018; 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=tjA0TxUpHrDMRCyFUp/84JDXuwHR5r7Get+2U/4E7sI=; b=Jrp/TcuTd8fKCBUyAQhLPYsRFjBim65Z4+azP7jZjca0KvrYLy/mGmJS1mEZsP9WUJSerV VuxKeYRVdUAciT7wRfvj0JhGkbbzHWAlHEQjpGbehwktWdP09HmehPVy5d4TpKKABKUan0 TrtDd4eXQovC6EudNKWnQyjcsf9t+ZBNolbBGH+00oS8SdLVlg1KS1BogbQbnEO4fyGErT CTcO65qNNZcGUkkBKjHRAQZIuUD6778F+VRoo58GmqHF3vDyOIJVJxRvPhSdQEzR0XzBso UzivUPmp7RtHCfIH8Ypg1SUXTLyC0SmXue9HbEnQhkd0pwb8wd5mnS2xuVqslg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hFHqG2JTbz32T for ; Wed, 05 Aug 2026 04:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19964 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 05 Aug 2026 04:43:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Kevin Bowling Subject: git: 30ccf2f48c11 - main - igc: defer sysctl-driven reinit to the admin task 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: 30ccf2f48c11e54fc0540510dcec7cd006a2c366 Auto-Submitted: auto-generated Date: Wed, 05 Aug 2026 04:43:38 +0000 Message-Id: <6a72bf7a.19964.3eb1671b@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=30ccf2f48c11e54fc0540510dcec7cd006a2c366 commit 30ccf2f48c11e54fc0540510dcec7cd006a2c366 Author: Abdelkader Boudih AuthorDate: 2026-08-05 04:40:58 +0000 Commit: Kevin Bowling CommitDate: 2026-08-05 04:40:58 +0000 igc: defer sysctl-driven reinit to the admin task igc_sysctl_eee() and igc_sysctl_dmac() called igc_if_init() directly. Request the reset through iflib instead, and skipping while the interface is down; the new value is picked up by the next init. Unlike e1000, igc has no ASSERT_CTX_LOCK_HELD and no acquire_swflag path, so the defect is silent here rather than an assertion failure. While here also remove unnecessary igc_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. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D58629 --- sys/dev/igc/if_igc.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index 1f10d244f2dd..0900689e5f01 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -816,8 +816,6 @@ igc_if_resume(if_ctx_t ctx) */ igc_disable_broken_l1_2(ctx); - igc_if_init(ctx); - return(0); } @@ -1297,8 +1295,6 @@ igc_if_media_change(if_ctx_t ctx) device_printf(sc->dev, "Unsupported media type\n"); } - igc_if_init(ctx); - return (0); } @@ -3357,6 +3353,16 @@ igc_set_flowcntl(SYSCTL_HANDLER_ARGS) return (error); } +static void +igc_sysctl_request_reinit(struct igc_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: @@ -3402,7 +3408,7 @@ igc_sysctl_dmac(SYSCTL_HANDLER_ARGS) return (EINVAL); } /* Reinit the interface */ - igc_if_init(sc->ctx); + igc_sysctl_request_reinit(sc); return (error); } @@ -3423,7 +3429,7 @@ igc_sysctl_eee(SYSCTL_HANDLER_ARGS) return (error); sc->hw.dev_spec._i225.eee_disable = (value != 0); - igc_if_init(sc->ctx); + igc_sysctl_request_reinit(sc); return (0); }