From nobody Thu Oct 29 06:03:04 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 4jFYYj1gzFz6xrC3 for ; Thu, 29 Oct 2026 06:03:05 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jFYYh6KPSz4sRY for ; Thu, 29 Oct 2026 06:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793253784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A9TaeDnP6Mx7G6yNMcxkx6mV3Cjuo+3IuGk8jjHF5AM=; b=MmhgMZEFnapgq3fchVDRc4yGgzfVhFUj8OPLhAPqA3RaA4yY7bGnjcg19Bm/kpuu71OxxB W7ZApuqwK2QszkW9fntCQzD2GJJvsXNSCoKtp3q/bg0LRyglz6ygJgJ1D7eDacNgfkX4Ex vpPFJm3TPn3a0famJYlJQ6Q23+0Xo3KK9YlAFwmiHEN1jBYtfqrThCfb931fMKRgh/+Qd/ Dlyyq6VtpWhRQCyV8z9Lfd8zIm0CJUqSZdJ+Es2QTQ2blcmuOnFlOEJmQMYhXv5UYnMxSs o5D/JkNtV6hiSFtsuocRCghfUoQijjH51bsAWcCxa4XTH1KYkFBiXQ/ee88Skw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793253784; b=FIKN9L8/rXsKGs13SHIE9J7VCgTtpw0wPwb0EMNgRKd7BKZwy0KcYQJUFwckzIHoXyGylL KBC5tdzfNyKXz7xfXpsMUHUJJuOoZIvBIFciBmQCDS2nVr/TPmIMQEXRqnp1vBdvmCR9CK HlnmNkOqOl53hNt8ANuD5LhXJkv5h0vx9qs1aB2+S6ussEIp0ZJ2KK1v4PvyB6WTMal8pf AOCzw1EMJAV/zbdx3gwXh6ein+ndnwsOlK5A+eaiaj/WhcMkyN4HhCmSSkv9EQt9QC/U4Z o5a7sPz6oAGFp8cdLB0MhALgtVGUgW2pgPrbTtobLY8K3upJW3eBeREcqX9/rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793253784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A9TaeDnP6Mx7G6yNMcxkx6mV3Cjuo+3IuGk8jjHF5AM=; b=Y+hVQa2J2f62C2RslyjiSaFgMeithKkTlzOzctdtqlgKkOOwJJrUrb3GSiaC2dlloyrSyo rNEtrR7Wfj3PVEAggC+ahr5OIqN2h+YT2lFM3/ogbefK28sfcGx9sKwkF9Hs/y1cV//Swn hFygKBkXnk3SzG1wEwjB2YNv206n38GU4HAkH/65cDL1ej7gl8HE70kt7vKG3vIaxHZ7kn Zjq9RVzbBKe7vq08DiliQb/c7MAqbhd3G4dPU0L5ncppX7D4sMGj9rJM2ESzUTG9l9NJG4 uNsIOvMN5HkkgniAHbQ5JMPIWshb2UjLGngE1JdSjI0ndapE7qml7bDDmR1dqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jFYYh5j1FzR7p for ; Thu, 29 Oct 2026 06:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a706 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 06:03:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Michael Tuexen From: Kevin Bowling Subject: git: 2f533ca9b758 - stable/15 - iflib: fix book keeping List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository 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: 2f533ca9b7588710ac69d1408d9b2541ccfe0443 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 06:03:04 +0000 Message-Id: <6ae2e198.3a706.3b194b07@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=2f533ca9b7588710ac69d1408d9b2541ccfe0443 commit 2f533ca9b7588710ac69d1408d9b2541ccfe0443 Author: Michael Tuexen AuthorDate: 2026-04-18 19:57:40 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 05:28:16 +0000 iflib: fix book keeping iflib_txq_drain() returns the number of consumed entries. In the case of TSO, a single entry can contain multiple TCP packets. Reported by: Ricardo Branco, David Wolfskill Reviewed by: gallatin Fixes: 3fade68cfdf9 ("iflib: accurately count bytes/segments for TSO") Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D56509 (cherry picked from commit cca22c36c306dfabe13b1d1de10e8d27ef3c3bce) --- sys/net/iflib.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index efd3b1b154d2..3f7b1b84b514 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -4005,7 +4005,7 @@ iflib_txq_drain(struct ifmp_ring *r, uint32_t cidx, uint32_t pidx) if_ctx_t ctx = txq->ift_ctx; if_t ifp = ctx->ifc_ifp; struct mbuf *m, **mp; - int avail, bytes_sent, skipped, count, err, i; + int avail, bytes_sent, consumed, count, err, i; int mcast_sent, pkt_sent, reclaimed; bool do_prefetch, rang, ring; @@ -4045,7 +4045,7 @@ iflib_txq_drain(struct ifmp_ring *r, uint32_t cidx, uint32_t pidx) */ if (reclaimed) txq->ift_qstatus = IFLIB_QUEUE_IDLE; - skipped = mcast_sent = bytes_sent = pkt_sent = 0; + consumed = mcast_sent = bytes_sent = pkt_sent = 0; count = MIN(avail, TX_BATCH_SIZE); #ifdef INVARIANTS if (iflib_verbose_debug) @@ -4068,7 +4068,7 @@ iflib_txq_drain(struct ifmp_ring *r, uint32_t cidx, uint32_t pidx) * and skip them. */ if (__predict_false(*mp == (struct mbuf *)txq)) { - skipped++; + consumed++; continue; } err = iflib_encap(txq, mp, &bytes_sent, &pkt_sent); @@ -4076,10 +4076,11 @@ iflib_txq_drain(struct ifmp_ring *r, uint32_t cidx, uint32_t pidx) /* no room - bail out */ if (err == ENOBUFS) break; - skipped++; + consumed++; /* we can't send this packet - skip it */ continue; } + consumed++; m = *mp; DBG_COUNTER_INC(tx_sent); mcast_sent += !!(m->m_flags & M_MCAST); @@ -4099,9 +4100,9 @@ iflib_txq_drain(struct ifmp_ring *r, uint32_t cidx, uint32_t pidx) if_inc_counter(ifp, IFCOUNTER_OMCASTS, mcast_sent); #ifdef INVARIANTS if (iflib_verbose_debug) - printf("consumed=%d\n", skipped + pkt_sent); + printf("consumed=%d\n", consumed); #endif - return (skipped + pkt_sent); + return (consumed); } static uint32_t