From nobody Mon Oct 05 14:06: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 4hz1Ql0SLxz6jtvk for ; Mon, 05 Oct 2026 14:06:39 +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 4hz1Ql00H8z3CJ2 for ; Mon, 05 Oct 2026 14:06:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791209199; 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=Xi+zEEicwuF3d1XjCN99c83ZelMf8cBpnXeNC351nT0=; b=Z5ateZf5UPWYHEYny5XiX25g/3KcyQimvtH554nC4wttBIU8jfR7fyhw8AQIeUzhAbdRAh MdqHCoWbUmgfAoXP8/Tm6n0dp59+SNWGIfG1DCV1jIbRQOQUXzX2QiWCuWRnpujH9g3+3n pTAlD0GcJpd6Wgc/vvl6B9ZYeSZzuqcsg0zb061mCWm3PfhusjfVvQ2po2I5v3tIoNg7bg V6lVkBh1wj6xO64QHjLHf/aqwqOepAHPACsLcB0XrKVtE2ihEP6mGuRmrvGOh9QhtYrdn+ pPP+KBEWR+aFZrQD+7dIIoQZoeTu2LN5FwNUc8nXMHAPv999VpulxuIvCEJViQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791209199; b=SVWAS9xm6Sioz3iKDjRyVljrH6S0G33oAmn8Ah/EBHVQO+BaCVwG81N9mkwza0oWWYgIUv hKVV0ekVY0thFM+OtPT+lYaRcSEsrwMzgT9I/rY9npD0UUiQLPEetn/tnzehe39ViAVxwX qRl760MAWJ3goMdAxfX+MQaSmf3DdLfPyH9r7yzrDKX6riCN+mEZcD3+lbU34hWmjsbxY7 4bi2lz07q9skGpVJDyzZjNe6+HFeslSmWQSDLOWXzW9UHKRALtgdDddZdCjvYOxzkJJiaC /wX64Hgev8FqMeV4XhYvDTJeCvMIMayx6sJWZEfJMJzMM5EMnIYrlwy3y2e/rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791209199; 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=Xi+zEEicwuF3d1XjCN99c83ZelMf8cBpnXeNC351nT0=; b=HdRnr5R1UOlqkVcVdNadwzyAfz9n68vqtHwIilXxKXTDCUHy7ipO/vTUlRmLYV1opTvQc6 YkF48aM5YYQ3nE2mY4ZGNG0hCY4Ok8QxYzR7ymcfNQMzPe9zm1PNkIniJWKuqdLUE0tR+V eiIyGS6fZ/tYI+h+QkqkXi5nivD7nTTAP5VVN4fCSRvicEx/pXC4Pb/JDcO7U3BrKe7RXO sTS8ephbeAItNyzWh1wMaeC5so9PLpgcKKbW+AKCmX98V0zUbmtOs7bJjIP6MdTUUhwSp4 DlXFdF8vA4NHo1dBNFu+py56pDibT22FkfHXjDMS6gblODRu226iLh8+GZ++Dw== 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 4hz1Qk5dd7zLw1 for ; Mon, 05 Oct 2026 14:06:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4598a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 05 Oct 2026 14:06:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: R. Christian McDonald Subject: git: 68386f6b551e - main - igc: Fix the flow control sysctl 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: rcm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68386f6b551e64c956c9623b9973be9e462ce1de Auto-Submitted: auto-generated Date: Mon, 05 Oct 2026 14:06:38 +0000 Message-Id: <6ac3aeee.4598a.54ce795c@gitrepo.freebsd.org> The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=68386f6b551e64c956c9623b9973be9e462ce1de commit 68386f6b551e64c956c9623b9973be9e462ce1de Author: R. Christian McDonald AuthorDate: 2026-10-05 14:01:54 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-05 14:01:54 +0000 igc: Fix the flow control sysctl dev.igc.N.fc read and wrote a function-static variable shared by every igc device, so a read returned the last value written to any of them (3 until the first write), not the state of the device. The softc value started as 0, which is also the value of "no flow control", while the hardware was set up for full flow control. As a result: - Writing 0 was taken for no change and did nothing, unless another value had been written to that device before. - igc_reset() took a softc value of 0 for "not set", so a device set to 0 went back to full flow control on the next init. - With more than one receive queue the driver enabled per-queue drop (SRRCTL.DROP_EN), which is meant for a MAC that does not send pause frames, although the MAC was told to send them. - Values out of range were accepted and ignored. A write only forced the MAC's flow control bits. The pause bits advertised to the link partner, the pause thresholds and DROP_EN stayed as the last init had set them, and the next link event resolved flow control from the stale advertisement again: a port set to 0 came back honoring pause frames, for example. Start the softc value as full, report it, use it as it is in igc_reset(), reject invalid values, and apply a change by reinitializing the interface, as the dmac and eee_control sysctls do. Two things behave differently now. Changing the mode of a running interface takes the link down to renegotiate. And with the default mode and more than one receive queue DROP_EN is no longer set: a full receive ring makes the MAC send pause frames, and holds up the other queues, where it used to drop that queue's packets. Setting fc to 0 or 1 selects per-queue drop. Tested on I226-V ports with four receive queues: for each mode, the flow control bits in CTRL, the pause thresholds and DROP_EN were read back, and the mode the link partner resolved, also after a down/up. Reviewed by: gallatin Fixes: 517904de5cca ("igc(4): Introduce new driver for the Intel I225 Ethernet controller.") MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D60363 --- sys/dev/igc/if_igc.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index bc24849693e1..7bfbf1c9d1a7 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -181,6 +181,7 @@ static int igc_if_msix_intr_assign(if_ctx_t, int); static int igc_msix_link(void *); static void igc_handle_link(void *context); +static void igc_sysctl_request_reinit(struct igc_softc *); static int igc_set_flowcntl(SYSCTL_HANDLER_ARGS); static int igc_sysctl_dmac(SYSCTL_HANDLER_ARGS); static int igc_sysctl_eee(SYSCTL_HANDLER_ARGS); @@ -533,6 +534,7 @@ igc_if_attach_pre(if_ctx_t ctx) OID_AUTO, "debug", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, sc, 0, igc_sysctl_debug_info, "I", "Debug Information"); + sc->fc = igc_fc_full; SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "fc", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, @@ -2190,10 +2192,7 @@ igc_reset(if_ctx_t ctx) /* 16-byte granularity */ hw->fc.low_water = hw->fc.high_water - 16; - if (sc->fc) /* locally set flow control value? */ - hw->fc.requested_mode = sc->fc; - else - hw->fc.requested_mode = igc_fc_full; + hw->fc.requested_mode = sc->fc; hw->fc.pause_time = IGC_FC_PAUSE_TIME; @@ -3736,34 +3735,35 @@ igc_sysctl_tso_tcp_flags_mask(SYSCTL_HANDLER_ARGS) static int igc_set_flowcntl(SYSCTL_HANDLER_ARGS) { - int error; - static int input = 3; /* default is full */ + int error, input; struct igc_softc *sc = (struct igc_softc *) arg1; + input = sc->fc; error = sysctl_handle_int(oidp, &input, 0, req); if ((error) || (req->newptr == NULL)) return (error); - if (input == sc->fc) /* no change? */ - return (error); - switch (input) { case igc_fc_rx_pause: case igc_fc_tx_pause: case igc_fc_full: case igc_fc_none: - sc->hw.fc.requested_mode = input; - sc->fc = input; break; default: - /* Do nothing */ - return (error); + return (EINVAL); } - sc->hw.fc.current_mode = sc->hw.fc.requested_mode; - igc_force_mac_fc(&sc->hw); - return (error); + if (input == sc->fc) /* no change? */ + return (0); + + /* + * The mode is advertised to the link partner and also decides the + * pause thresholds and per-queue drop, so it takes a reinit to apply. + */ + sc->fc = input; + igc_sysctl_request_reinit(sc); + return (0); } static void