From nobody Sat Aug 22 00:32:24 2026 X-Original-To: dev-commits-src-all@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 4hRdRX4RG0z6pqb2 for ; Sat, 22 Aug 2026 00:32:24 +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 4hRdRX3R5fz3HF6 for ; Sat, 22 Aug 2026 00:32:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787358744; 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=f3NFCvboYP0U0ZuuuIZEThKhZdhiuUZbR94LI4Rzs+E=; b=wuOZaf3bYCDINxja+Udjx/FRFWI8iNJceVQ79v9fyPjo2ssjFqljT2FCFZIjdh5XrgVlOU N02jK2+cRYz2mn/VaTfMA52p+6UoCPLXA/Cc6i0G+flcgLMHOUM/yi3mOx+flISPaeyN9+ ua64pWNqMGli1ypmzI0GVK5UB3Cx8VgtuyXV+EJRIJV65QqvWrZucqSBvLiSjOGavOfLz+ i1kpaAHYd+pYIUCop5sMlQV7mLgmSXBL/2M5RhPDhes+rLaNWr9AxqH1FpLP0aALFfPqMz j9SrKzbLhCPKgKaiHhuVLDHcHsdTXEU2VeHBzpX+j2Gxoi1TkPqz2KtKh9iTdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787358744; a=rsa-sha256; cv=none; b=WyHRl2wC6ge0qIBPI76B48aAdSKeIAIRTMJXfrdVtXwjc8mDi+qw15CJQ89phgbTO9DN3R ABZkwpjrasCnY/q18D7WOS2w/QQH7vkDo5o8sTfNuZtLH3r/0A6zE0pkAUmDijG1ZJu2tD e6DuglZE2R27iJ1/7zfT/kaX2kEagySEw0LLxeSQDA/cyxSCRbm4JFu09CIiTLUd9ZrkDe LR2cBT2TU7/kvt9rhnKYMcJmA8nMDyG0eGwr52UPpZDk1GwjGH0HRXhXM+VXeOSkKU7++a kFzFu03KJsPC1Q9tgrsowRgdmQjsnRZcpYXsz4d4kSLqtyXjUkNK+iE9xyooyQ== 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=1787358744; 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=f3NFCvboYP0U0ZuuuIZEThKhZdhiuUZbR94LI4Rzs+E=; b=mv0zz/yGngC/0kn2SwwjKruuDvRYCKAC9osWMRJMf54mdk/UVXJqOgZr1VXbLruCqHpezp yXetxlRps9sNlD+V3iUt468bYD3da8ZYvfeStwhZyyKdKdU2NNYNpNZVLTnxVekYKK/swb PXOKJFEN/QSVc02FDY5d7duhFj30hMo6voCLJts8WjPv+kUR63I1F1Nz5JEgbxZwooH8vH Tw7vTbVIx+zqm0HurkPybeBZHbnw0HzAtTqZaJDlkKEOTJeQs9+Nb9lo4FM5YeF3YhfPOM PP8+VwXc2dInPbwLCdbPGry2uGkRmsPzNCLoquS9m+ALu5wl2lai64xx+nwjYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hRdRX2Hfrz9xL for ; Sat, 22 Aug 2026 00:32:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 258f7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Aug 2026 00:32:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 1dac1e0a05b3 - stable/15 - e1000: Correct Rx descriptor threshold programming List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 1dac1e0a05b313f5c4ca4ceb3c6d96bc8034a981 Auto-Submitted: auto-generated Date: Sat, 22 Aug 2026 00:32:24 +0000 Message-Id: <6a88ee18.258f7.d555c8b@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=1dac1e0a05b313f5c4ca4ceb3c6d96bc8034a981 commit 1dac1e0a05b313f5c4ca4ceb3c6d96bc8034a981 Author: Kevin Bowling AuthorDate: 2026-08-08 12:26:23 +0000 Commit: Kevin Bowling CommitDate: 2026-08-22 00:31:48 +0000 e1000: Correct Rx descriptor threshold programming Jumbo receive tuning on integrated controllers enabled PTHRESH without a nonzero HTHRESH, contrary to the hardware programming requirements. It also covered only the integrated MAC generations present when the workaround was added. Enumerate every jumbo-capable ICH and PCH type and program PTHRESH=3 with HTHRESH=1. Linux fixed the same HTHRESH omission in b701cacdbcfb. The 82574 path combined threshold values with the reset values using bitwise OR. Requesting WTHRESH=4 while the reset value was one thus programmed five. Clear the complete threshold fields before installing the established PTHRESH=32, HTHRESH=4, WTHRESH=4 descriptor-granularity policy. MFC after: 2 weeks (cherry picked from commit abe22383f1b144f0868aa0654ec4514d36f7a4f5) --- sys/dev/e1000/if_em.c | 50 ++++++++++++++++++++++++++++++++++++-------------- sys/dev/e1000/if_em.h | 13 +++++++++++++ 2 files changed, 49 insertions(+), 14 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index b9a4ceb8d6a8..0d0a2d2fe6b0 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -3906,6 +3906,27 @@ em_initialize_transmit_unit(if_ctx_t ctx) **********************************************************************/ #define BSIZEPKT_ROUNDUP ((1<mac.type) { + case e1000_ich9lan: + case e1000_ich10lan: + case e1000_pchlan: + case e1000_pch2lan: + case e1000_pch_lpt: + case e1000_pch_spt: + case e1000_pch_cnp: + case e1000_pch_tgp: + case e1000_pch_adp: + case e1000_pch_mtp: + case e1000_pch_ptp: + return (true); + default: + return (false); + } +} + static void em_initialize_receive_unit(if_ctx_t ctx) { @@ -4055,24 +4076,25 @@ em_initialize_receive_unit(if_ctx_t ctx) E1000_WRITE_REG(hw, E1000_RDT(i), 0); } - /* - * Set PTHRESH for improved jumbo performance - * According to 10.2.5.11 of Intel 82574 Datasheet, - * RXDCTL(1) is written whenever RXDCTL(0) is written. - * Only write to RXDCTL(1) if there is a need for different - * settings. - */ - if ((hw->mac.type == e1000_ich9lan || hw->mac.type == e1000_pch2lan || - hw->mac.type == e1000_ich10lan) && if_getmtu(ifp) > ETHERMTU) { + /* Increase receive-descriptor prefetching for integrated jumbo MACs. */ + if (em_integrated_jumbo_rx(hw) && if_getmtu(ifp) > ETHERMTU) { u32 rxdctl = E1000_READ_REG(hw, E1000_RXDCTL(0)); - E1000_WRITE_REG(hw, E1000_RXDCTL(0), rxdctl | 3); + + rxdctl &= ~(EM_RXDCTL_PTHRESH_MASK | + EM_RXDCTL_HTHRESH_MASK); + rxdctl |= EM_JUMBO_RX_PTHRESH | + (EM_JUMBO_RX_HTHRESH << 8); + E1000_WRITE_REG(hw, E1000_RXDCTL(0), rxdctl); } else if (hw->mac.type == e1000_82574) { + /* RXDCTL(0) writes are mirrored to RXDCTL(1) on 82574. */ for (int i = 0; i < sc->rx_num_queues; i++) { u32 rxdctl = E1000_READ_REG(hw, E1000_RXDCTL(i)); - rxdctl |= 0x20; /* PTHRESH */ - rxdctl |= 4 << 8; /* HTHRESH */ - rxdctl |= 4 << 16;/* WTHRESH */ - rxdctl |= 1 << 24; /* Switch to granularity */ + + rxdctl &= ~EM_RXDCTL_THRESH_MASK; + rxdctl |= EM_82574_RX_PTHRESH | + (EM_82574_RX_HTHRESH << 8) | + (EM_82574_RX_WTHRESH << 16) | + E1000_RXDCTL_THRESH_UNIT_DESC; E1000_WRITE_REG(hw, E1000_RXDCTL(i), rxdctl); } } else if (hw->mac.type >= igb_mac_min) { diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h index 0c61261a5af6..07a92bef1d21 100644 --- a/sys/dev/e1000/if_em.h +++ b/sys/dev/e1000/if_em.h @@ -297,6 +297,19 @@ #define EM_TX_HTHRESH 1 #define EM_TX_WTHRESH 1 +#define EM_RXDCTL_PTHRESH_MASK 0x0000003F +#define EM_RXDCTL_HTHRESH_MASK 0x00003F00 +#define EM_RXDCTL_WTHRESH_MASK 0x003F0000 +#define EM_RXDCTL_THRESH_MASK (EM_RXDCTL_PTHRESH_MASK | \ + EM_RXDCTL_HTHRESH_MASK | \ + EM_RXDCTL_WTHRESH_MASK) + +#define EM_JUMBO_RX_PTHRESH 3 +#define EM_JUMBO_RX_HTHRESH 1 +#define EM_82574_RX_PTHRESH 32 +#define EM_82574_RX_HTHRESH 4 +#define EM_82574_RX_WTHRESH 4 + #define IGB_RX_PTHRESH ((hw->mac.type == e1000_i354) ? 12 : \ ((hw->mac.type <= e1000_82576) ? 16 : 8)) #define IGB_RX_HTHRESH 8