From nobody Sat Aug 1 00:25:32 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 4hBkHK1mc4z6mPws for ; Sat, 01 Aug 2026 00:25:33 +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 4hBkHJ60Pzz3wtt for ; Sat, 01 Aug 2026 00:25:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785543932; 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=7czG4VRmJUulExxWk0KgapPamZFw/iGGJLpDF8jExE8=; b=hs3zaLmPuY+rQLaivyhu6LbtZNERAO96dgHeMPKioo6x0zN/7G0Ry9154Djftxh5hGP8Zi vTe1IgrN779617cF9qbFtaZ11yy7O+DQccy4hFyQ/4P9JpEohNy/xt8rSNfZ7CXgOVciig hi6PsN4Yj43Byq3YpgD88N1e+kHWchs84OVkPk5fasttNN1Hj6j/RIfYpfUSe5qZyF9PRp AeCc6qvFvbkmQdsbt5zo/KEhRslwarIZYAFdqbE3s8VPHnIhQX1n6lbUxSzNid95o7BSAe +Z+SmYkXw2UGKhWPTuTXcIb/soxFNQ2mq3ma6bdnL7xZdonhE7NkfsO1iRRfnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785543932; a=rsa-sha256; cv=none; b=MTCxwivMgISBRNci/1J7dWGnv7+AQfEUFpoECsi4xB9G1VuV+0pDaZUrY977E0O54KQ6SX IM5XNU8ecdAkwKxipOuJ07c3iyza5RREDpO4AAKbNjzwjqq4mDV2s9Z2SoyZ0m1B7zCrXg rBFR7iXLbdJmztfw5kSg9uUK4SqD5MektJD1fYQpQYmZWbz8FfeP7rvMEqt/sXQ+R9XLQr Nk5l6Gv6sRyDu6c9VqTm3DQ7/BJGgrrsqSQIMxLQK00C23C4zOJx7o8QmI6QU9+9tfZsUK aihQZ4v+gSxiVc75H0DJxM/7kQlS8KswaNA4KiyCaONh7COs4hhYA6Z/BXIvmA== 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=1785543932; 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=7czG4VRmJUulExxWk0KgapPamZFw/iGGJLpDF8jExE8=; b=MdMgHK+FbOhaEzThXFdxscCTLAmLZUKI+CYAQngstkqNU6NQ6fjOM7WqXaCzAMv/dLo/0r aNFvuMWLvHsiRkSav20lm1+CXVZgIqCS/yWQn/3bk7MLvgPwJdQyjwi2boCOUiUUkyHoVC Pni91KTFb/H521NK8DagRcM90UNwkQo++sAwxu+QqoDxwOLPr/uf56N6tWJPUBng0gAvk/ +EATmNxtbA86pQkwOOv262xvkPwg+LvzN/vzBdqbhoij+fQ47OahSPtGASQRPCuz1yr0VF JP76w3xDFtY9PDxnnGfEY4//eEVUEKZmvMvfvH5ELxg0f0mchZmXY+Ex11wjwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hBkHJ4nZqz72m for ; Sat, 01 Aug 2026 00:25:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1850e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 01 Aug 2026 00:25:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 3a3937507af5 - stable/14 - e1000: fix rx accounting for multi-descriptor packets 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/14 X-Git-Reftype: branch X-Git-Commit: 3a3937507af534413ff1a6422661e6d112c74579 Auto-Submitted: auto-generated Date: Sat, 01 Aug 2026 00:25:32 +0000 Message-Id: <6a6d3cfc.1850e.9a574e2@gitrepo.freebsd.org> The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=3a3937507af534413ff1a6422661e6d112c74579 commit 3a3937507af534413ff1a6422661e6d112c74579 Author: Kevin Bowling AuthorDate: 2026-07-25 11:02:36 +0000 Commit: Kevin Bowling CommitDate: 2026-08-01 00:25:17 +0000 e1000: fix rx accounting for multi-descriptor packets The receive paths accumulate ri->iri_len across the descriptors making up a packet, then add that running total to rxr->rx_bytes on every iteration of the loop. A packet spanning descriptors of length l1, l2 and l3 thus contributes 3*l1 + 2*l2 + l3 instead of l1 + l2 + l3. Single descriptor packets, the common case, are accounted correctly, so this only shows up on jumbo frames. Add the per descriptor length instead. iflib memsets the if_rxd_info before each isc_rxd_pkt_get() call, so summing len gives the same total as the final iri_len, and the frame error path that returns without incrementing rx_packets keeps counting bytes exactly as before. (cherry picked from commit 41a46c2d46aa4078c597ce3a0d19323cab988277) --- sys/dev/e1000/em_txrx.c | 4 ++-- sys/dev/e1000/igb_txrx.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index ced8d0f41d14..cfeb43036563 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -681,7 +681,7 @@ lem_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri) len = le16toh(rxd->length); ri->iri_len += len; - rxr->rx_bytes += ri->iri_len; + rxr->rx_bytes += len; eop = (status & E1000_RXD_STAT_EOP) != 0; @@ -747,7 +747,7 @@ em_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri) len = le16toh(rxd->wb.upper.length); ri->iri_len += len; - rxr->rx_bytes += ri->iri_len; + rxr->rx_bytes += len; eop = (staterr & E1000_RXD_STAT_EOP) != 0; diff --git a/sys/dev/e1000/igb_txrx.c b/sys/dev/e1000/igb_txrx.c index 568d84807173..19b365bf020a 100644 --- a/sys/dev/e1000/igb_txrx.c +++ b/sys/dev/e1000/igb_txrx.c @@ -460,7 +460,7 @@ igb_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri) le32toh(rxd->wb.lower.lo_dword.data) & IGB_PKTTYPE_MASK; ri->iri_len += len; - rxr->rx_bytes += ri->iri_len; + rxr->rx_bytes += len; rxd->wb.upper.status_error = 0; eop = ((staterr & E1000_RXD_STAT_EOP) == E1000_RXD_STAT_EOP);