From nobody Sat Sep 05 00:31:20 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 4hcDls4XYKz6qZNg for ; Sat, 05 Sep 2026 00:31:21 +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 4hcDls1BLbz42Tv for ; Sat, 05 Sep 2026 00:31:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788568281; 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=+PY46//K/a1xopE8CV/rrMsxEIUMaKCL76p4rvbPTa8=; b=V/tky2LaIIS8FooL+gEAEYQQDDUVG0WBGlmG7NxNRrUaf1iYkuMM653U4DvSySj/k8FB5F F5g5WhgeigqL+W9GVXdHLsTh4B4872D+AynQRxwczINg2tm1MLs9Kb5z0lCzfbpI/4OeCT iUJKZdhxxWLW5vzVUetJXDa223mb49yuB0+SDsEe2COuwdEx/9hDmuRmkVOmp+LHcatfZI De1QVNTs0zv83aR9TpqgSx7NB4O//2Eutz8R8eJ1gApFFHyjdpWCfbXoXSj76JhAleqKeg sY9IZAj8W8rAvL5znFFuX7IrOPcou6ssr8gRWGCKwmbn75Rga485YIO0t0vc4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788568281; a=rsa-sha256; cv=none; b=mHUwF8O6gP/gys7rDyHIyNyngMaUeacoefxLENPsiyqOQA07oIzhiC26pt0/F8DaZtxcYX oQ+qfNNg/HpkpTAMaW8+PqNMLs4LxoUWuL74pg6lqbktdNnP3RMGvwZtyW74Abwl+1qL8g 02GjPAcDWgP22k0yYfn/EroZBTAl1DpJoOa53i7V+bq4YxsZIdf4RhlJDaep6Q/V+DZG1a +IYiL2kXqDgb5ObLEyCp01lEHjR9xFbBjW7JQI277ecfoU8rUqB+L9jgsw1HB4v77Dc4Sz 4y0hjQylCWfexUz08eiTq8AuEVem572gIU/REoiU9Eduu0gqWKHvfD3wiPU1Sw== 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=1788568281; 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=+PY46//K/a1xopE8CV/rrMsxEIUMaKCL76p4rvbPTa8=; b=sVB56ffjue/kV2/4rOiEuyPBnWk7ab7vEmOhvNkXqFKNPu69WRnnSCRXJBQSd+aiH7fBDz 3kk/fLxOLKyZSdb2Rz4nla1IK3f1Vml5GyWT50R5OO2AkovxdVyRktBdoHZZfa7ff0XSVl 2Kk8o7ncRYoCX1sbuV4vztrpZeZ/SXuJT/WgvSViWzEXFXNaNg+Q4VAlza+iMC1KJShhGq okHJQFQ3hbklngPAJs2zemtUCZL7m12ruAl2BohZDSyXWuCiwztt2mlL96zxvhhkM7fXM4 oEMoO5DHhX+qB+bzOcxtPP/tCv3Hjl/TEn9c/WjiWonNVSK/hF+Zb+ZT5g58tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hcDlr75ZMz7BP for ; Sat, 05 Sep 2026 00:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f2a3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 05 Sep 2026 00:31:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 7e2631981e24 - stable/14 - e1000: Limit the TSO sentinel to lem(4) controllers 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: 7e2631981e2465e44d992ca115b468cda1be7221 Auto-Submitted: auto-generated Date: Sat, 05 Sep 2026 00:31:20 +0000 Message-Id: <6a9b62d8.1f2a3.77324668@gitrepo.freebsd.org> The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=7e2631981e2465e44d992ca115b468cda1be7221 commit 7e2631981e2465e44d992ca115b468cda1be7221 Author: Kevin Bowling AuthorDate: 2026-08-22 01:24:28 +0000 Commit: Kevin Bowling CommitDate: 2026-09-05 00:30:48 +0000 e1000: Limit the TSO sentinel to lem(4) controllers The TSO workaround splits the final DMA segment to create a four byte sentinel descriptor. Intel documents the premature descriptor writeback erratum and this workaround in the 82540EP and 82545GM specification updates (erratum 3) and the 82546GB specification update (erratum 1). Limit the workaround and its preceding TSO state to the legacy PCI and PCI-X controllers so PCIe controllers retain their natural descriptor layout using one fewer descriptor per TSO packet, no split of the final segment, and one less four byte DMA. Sponsored by: BBOX.io (cherry picked from commit 2a7af8ebcf90af83f01f9523b25bfc6e58c7b809) --- sys/dev/e1000/em_txrx.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index 754f1a139065..a4f258e9d09b 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -211,7 +211,11 @@ em_tso_setup(struct e1000_softc *sc, if_pkt_info_t pi, uint32_t *txd_upper, TXD->cmd_and_length = htole32(cmd_type_len | (pi->ipi_len - hdr_len)); /* Total len */ - txr->tx_tso = true; + /* + * 82540EP and 82545GM erratum 3 and 82546GB erratum 1 require + * a second descriptor for the final four bytes of an LSO packet. + */ + txr->tx_tso = sc->hw.mac.type < e1000_82571; if (++cur == scctx->isc_ntxd[0]) { cur = 0; @@ -377,7 +381,7 @@ em_isc_txd_encap(void *arg, if_pkt_info_t pi) /* Do hardware assists */ if (do_tso) { i = em_tso_setup(sc, pi, &txd_upper, &txd_lower); - tso_desc = true; + tso_desc = txr->tx_tso; } else if (csum_flags & EM_CSUM_OFFLOAD) { i = em_transmit_checksum_setup(sc, pi, &txd_upper, &txd_lower);