From nobody Sun Jul 26 01:01:11 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 4h73MD5Y2Mz6mQ3r for ; Sun, 26 Jul 2026 01:01:12 +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 4h73MD3Fgmz3LWW for ; Sun, 26 Jul 2026 01:01:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785027672; 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=BCzzaBHPEf7IUHvlOz9Xyyk122g+WP6kwaj5tfgPHiE=; b=jsdsUmsbLl3NXhZCjJkUIogbOID2ziz4Y6jFGBUaW3jAWDwFxajLA48kKen5XOEnXXqIx4 0HL/ai1RdssTVlmUd7hx9tqgghHHSVx8kZZdE4SECADLy1av6pwoJ7DAB+P6Ah9QlkZMHa ddLWqPqJnDjDMFo5FCc8ApfcdgUHM12JXcxJUt3w5jhsvAYltJrpncu6Xzwl4nOXKdlBHO l7r7QPfY99vF2OwQdrKinzCnSbYNshbaJMczxoRM1dMbMlD3qAukxR26OdWYpgaQOdf8Z4 nP56tob6Zs0Py9FE0ulHpDHwP5sDb0DmcWrsfgxN0eksLHdajOdi7Ny2dP+rew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785027672; a=rsa-sha256; cv=none; b=QebCVEir60L9Mp3p0UvjVMrpLCLWYPGrDS6MlXxaVa/o2DxPbQgLKBMTup9728dZXpjnKG OE02PeJDnzIvrBjPFBYqVvuD2DSEawCsUTW4+/eHgPIP+tnASND+qTeo/1s1KMbEISOhUF ahL2/XXy6cC+VrzyKVyk8vYp8nkHdVJzBA4cE5bsWk2fh0Gh99Vbayot3YSqaFvz87FFjJ cd003mlL35owRq/J+x8Sa1pjiMlGzxNdWgOXyIcylQhfcK9rpvOi2bvD6XftbSotZN0tz1 8fR3Lg2NLD1116FSg/4QB5J50W4I4+EOMkC6K0cHFI/TiuBp3SWilaI5+Yoauw== 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=1785027672; 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=BCzzaBHPEf7IUHvlOz9Xyyk122g+WP6kwaj5tfgPHiE=; b=kyKLjBXMIFWt9z584ZqDhOkTJhrfcmlyS3xEaVAulUyy52aQIxOttlC86CIkCOsDC2GGnT Xbyfn6wE5hO13AkqcmZAoxL6v/ILPOr5/Ve6mz7HjLus6DV+A34Ujm4GJ3v9wBJNbqJ2DG 4I7m+NahRHqghzG6rEtseD+ERAYIqELRTOxZqGN1+6iwvDD5n9VitmD6jLOYBwPxDHrFSV vwTU1PtOP1Fdeznm7z3WpSgilwRLQZMqWNzBs0HuxeLNLfu4ryT+4kKlymIy6zt3ynWcal XwbAN2vi+JXSG6QtZp5VYSGSe1Nw2i8rIdD1Fyt45KdAjK4ydrL8gXMdc6nDXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h73MC6DvdzyvG for ; Sun, 26 Jul 2026 01:01:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32e3a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 26 Jul 2026 01:01:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 072e0983d7bc - main - e1000: count TSO wire segments in the AIM counters 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: 072e0983d7bce80356740324973993393e77023a Auto-Submitted: auto-generated Date: Sun, 26 Jul 2026 01:01:11 +0000 Message-Id: <6a655c57.32e3a.4118efce@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=072e0983d7bce80356740324973993393e77023a commit 072e0983d7bce80356740324973993393e77023a Author: Kevin Bowling AuthorDate: 2026-07-25 12:33:38 +0000 Commit: Kevin Bowling CommitDate: 2026-07-26 01:00:02 +0000 e1000: count TSO wire segments in the AIM counters The transmit paths billed one packet of ipi_len bytes per request. For TSO that is the whole unsegmented payload, up to 64KB, so the average size the moderation calculation sees is not a size that appears on the wire. Count the segments the hardware will put on the wire and the header each of them carries. Non-TSO accounting is unchanged. MFC after: 1 week --- sys/dev/e1000/em_txrx.c | 21 +++++++++++++++++++-- sys/dev/e1000/igb_txrx.c | 21 +++++++++++++++++++-- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index 6ac41816b043..b2a515027479 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -461,10 +461,27 @@ em_isc_txd_encap(void *arg, if_pkt_info_t pi) first, pidx_last, i); pi->ipi_new_pidx = i; - /* Sent data accounting for AIM */ + /* + * Sent data accounting for AIM. For TSO, ipi_len is the whole + * unsegmented payload, which is not a size the moderation + * calculation can use. Count the segments the hardware will put on + * the wire and the header each of them carries, so that the average + * it sees is a wire packet. + */ + if (do_tso && pi->ipi_tso_segsz != 0) { + u32 hdrlen, segs; + + hdrlen = pi->ipi_ehdrlen + pi->ipi_ip_hlen + pi->ipi_tcp_hlen; + if (pi->ipi_len > hdrlen) { + segs = howmany(pi->ipi_len - hdrlen, pi->ipi_tso_segsz); + txr->tx_bytes += pi->ipi_len + (segs - 1) * hdrlen; + txr->tx_packets += segs; + return (0); + } + } + txr->tx_bytes += pi->ipi_len; ++txr->tx_packets; - return (0); } diff --git a/sys/dev/e1000/igb_txrx.c b/sys/dev/e1000/igb_txrx.c index f6f462cfd577..57f098d2266d 100644 --- a/sys/dev/e1000/igb_txrx.c +++ b/sys/dev/e1000/igb_txrx.c @@ -289,10 +289,27 @@ igb_isc_txd_encap(void *arg, if_pkt_info_t pi) txd->read.cmd_type_len |= htole32(E1000_TXD_CMD_EOP | txd_flags); pi->ipi_new_pidx = i; - /* Sent data accounting for AIM */ + /* + * Sent data accounting for AIM. For TSO, ipi_len is the whole + * unsegmented payload, which is not a size the moderation calculation + * can use. Count the segments the hardware will put on the wire and + * the header each of them carries, so that the average it sees is a + * wire packet. + */ + if ((pi->ipi_csum_flags & CSUM_TSO) && pi->ipi_tso_segsz != 0) { + u32 hdrlen, segs; + + hdrlen = pi->ipi_ehdrlen + pi->ipi_ip_hlen + pi->ipi_tcp_hlen; + if (pi->ipi_len > hdrlen) { + segs = howmany(pi->ipi_len - hdrlen, pi->ipi_tso_segsz); + txr->tx_bytes += pi->ipi_len + (segs - 1) * hdrlen; + txr->tx_packets += segs; + return (0); + } + } + txr->tx_bytes += pi->ipi_len; ++txr->tx_packets; - return (0); }