From nobody Sat Aug 8 15:57:55 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 4hHQdw2wW6z6nrQt for ; Sat, 08 Aug 2026 15:57:56 +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 4hHQdw0kQMz3p7r for ; Sat, 08 Aug 2026 15:57:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786204676; 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=DfevRRxaqm1gELJ8zJRM128DIx2DV3oeqf6ZmepThvk=; b=h8cg05Z1BmLNTeM0lfpGktOSPT3+0ZvH0W+KUViMUZJvtVZgrnew63EBbbdyNr7iPTIE+X LmiTDrVuUdCSuI/qQbBIgwBzmiKYqBzU4QLOJ8aRSYy1RyaNeduAFpACv2Chg8GbK7nKu6 cSBCS/mh99NxGl7GEHmjv/IKpdV5kGYjP4XqfT2aGyNYiuAcvkJZSIoYMaQILkcr0DAQJM xdJws8PFUHgMS7rpr1o+LHBfsQoCH+G4N95k2A39KXgTA6hG5Z/qKwbE/pRCxMuoER6WWY CfQBeUJE93kXVkX/uOT3S/pWFvGLZF+7f9jCzd8qZjitTqBiqxqydLtw28HsnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786204676; a=rsa-sha256; cv=none; b=M84L3M7TjYRq0nGbABvFb+cZ+2DimTXTi8EqczQmt6ByxNxc4qTVV3Fi/LhRq+dx1kcgZr ghQ0V9KhInQi7lXfynZ33O/wnE8m97Iso5eiAN5vJq6StYAnZt1jrsaq+zPa+vht3vCps0 9VRILBd0WcIVyh+OJY0TQnqz9nopxldGj9dRCJcVPDZ5sdIJSX+xACodss+jgevTQ4yPLd 80ltOmiQJ0Jyz7NjgbLcsBkSrZ9BMXkbZmCCtVuKk41Uron7ko2ruAV/s0z6C64btHTIKD mU1v96t0MH1G2u70VEp/ApX/OhWzqGrVgS5EeRwrp+Ecvep8mhgOZ0zKCEuatw== 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=1786204676; 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=DfevRRxaqm1gELJ8zJRM128DIx2DV3oeqf6ZmepThvk=; b=bvMRuWwPgN7SiJgpfbC2acxxLpaY2zl0JG2VqL3/k2MtuBI18nBmdKtx+UTAg6T+axn8Zq wzTiFWQjrKIIf0PZR624qD178JvT1wEphUYhrT6LZBRD4NRshCQu0qYiItJ6/cXAhm2X8Q aLgUnIkvLN1lhFQ67oDDltRyvKY3NxlP19DJRqD7kn+MyoFGy13MYhJxtTuE5nMSc3iRpQ kxR6dfz7lYBNUwOKa5aoP1dr3A1+/B93D6j0n2XiPyUdqDEZ+OX9CsBIFyJCbjLKTmrkKo 9KQtmu1Lw2WiR3A39idqAsLyglvcDROHfGLBk8Jdb6DZ94YQy69USHGPOT89rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hHQdv6M9TzkKh for ; Sat, 08 Aug 2026 15:57:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31392 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 08 Aug 2026 15:57:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: fddc393d9316 - main - igb: Match Tx descriptor control to iflib 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/main X-Git-Reftype: branch X-Git-Commit: fddc393d93169b428fe64e9513ee463b5154b62a Auto-Submitted: auto-generated Date: Sat, 08 Aug 2026 15:57:55 +0000 Message-Id: <6a775203.31392.28342f58@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=fddc393d93169b428fe64e9513ee463b5154b62a commit fddc393d93169b428fe64e9513ee463b5154b62a Author: Kevin Bowling AuthorDate: 2026-08-08 11:29:44 +0000 Commit: Kevin Bowling CommitDate: 2026-08-08 15:46:02 +0000 igb: Match Tx descriptor control to iflib iflib requests transmit completion status only on selected descriptors. Program a zero writeback threshold so igb hardware honors those sparse RS bits instead of writing back every descriptor in threshold-sized batches. Use the existing family specific prefetch threshold: eight descriptors on most controllers and 20 on I354, with a host threshold of one. These values match the Intel-derived Linux and DPDK drivers. Their nonzero writeback settings are not appropriate here because those drivers set RS on every packet. A zero writeback threshold also avoids depending on interrupt timer flushes affected by 82576 specification update erratum 26. Remove the old IGB_TX_WTHRESH macro as well. It has had no callers since the iflib conversion, so its 82575 conditional no longer implements any policy. MFC after: 2 weeks --- sys/dev/e1000/if_em.c | 41 +++++++++++++++++++++++++++++++++-------- sys/dev/e1000/if_em.h | 7 +++---- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index b14087f2c88c..b48721a6e5fa 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -4205,6 +4205,36 @@ em_legacy_txdctl(struct e1000_hw *hw) return (txdctl); } +static u32 +igb_txdctl(struct e1000_hw *hw) +{ + u32 pthresh; + + switch (hw->mac.type) { + case e1000_i354: + pthresh = I354_TX_PTHRESH; + break; + case e1000_82575: + case e1000_82576: + case e1000_82580: + case e1000_i350: + case e1000_i210: + case e1000_i211: + case e1000_vfadapt: + case e1000_vfadapt_i350: + pthresh = IGB_TX_PTHRESH; + break; + default: + KASSERT(0, ("%s: unsupported MAC type %d", __func__, + hw->mac.type)); + pthresh = IGB_TX_PTHRESH; + break; + } + + return (pthresh | (IGB_TX_HTHRESH << 8) | + E1000_TXDCTL_QUEUE_ENABLE); +} + /********************************************************************* * * Enable transmit unit. @@ -4255,15 +4285,10 @@ em_initialize_transmit_rings(if_ctx_t ctx) E1000_READ_REG(hw, E1000_TDBAL(qid)), E1000_READ_REG(hw, E1000_TDLEN(qid))); - if (hw->mac.type < igb_mac_min) { + if (hw->mac.type < igb_mac_min) txdctl = em_legacy_txdctl(hw); - } else { - txdctl = 0; - txdctl |= 0x1f; /* PTHRESH */ - txdctl |= 1 << 8; /* HTHRESH */ - txdctl |= 1 << 16; /* WTHRESH */ - txdctl |= E1000_TXDCTL_QUEUE_ENABLE; - } + else + txdctl = igb_txdctl(hw); E1000_WRITE_REG(hw, E1000_TXDCTL(qid), txdctl); } diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h index 99d4e9d02309..de62c18fac09 100644 --- a/sys/dev/e1000/if_em.h +++ b/sys/dev/e1000/if_em.h @@ -319,10 +319,9 @@ struct igb_vf_mac_filter; #define IGB_RX_WTHRESH ((hw->mac.type == e1000_82576 && \ (sc->intr_type == IFLIB_INTR_MSIX)) ? 1 : 4) -#define IGB_TX_PTHRESH ((hw->mac.type == e1000_i354) ? 20 : 8) -#define IGB_TX_HTHRESH 1 -#define IGB_TX_WTHRESH ((hw->mac.type != e1000_82575 && \ - sc->intr_type == IFLIB_INTR_MSIX) ? 1 : 16) +#define IGB_TX_PTHRESH 8 +#define I354_TX_PTHRESH 20 +#define IGB_TX_HTHRESH 1 /* * TDBA/RDBA should be aligned on 16 byte boundary. But TDLEN/RDLEN should be