From nobody Sat Apr 18 20:04:48 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 4fyjQY3ST7z6ZBmK for ; Sat, 18 Apr 2026 20:04:53 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fyjQY2lscz3KKH for ; Sat, 18 Apr 2026 20:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776542693; 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=WGPb1PJmknBDWS4jXwvPedzr2zwuw9ryXeuWgd5rv84=; b=bshy2OCMjbZfh5fJL3BIYpH74VHxsMUiXbQMlvIoJlvEnPm4uO/vuXp5A/uCDT2YaFpwNB FPMwUB3UNQke3SjEv6F91wGOruMcprZO3j1/AFDlZ3/Zd7KGsidxCnn5poxGvLyav/6234 6H9zlOetO5tpxQWw/RfUD0kXiE12gfh3SGoPoqXRPXLK5OStYxiZwY4Luu3lcUin5vxpQ6 BYWK6o/EBI/dMYRNjh/QaEbLiUKW1hpNxB7Ra7iJ8TCnhCsrap4PgdWn74banbJAWA3dCC cq+gSYS/IkS36/bucCJB5Fd5EpyjT0iBwxUhwzmWjx7+Bxqz4iPSoGewGCFKqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776542693; a=rsa-sha256; cv=none; b=XBQI14/c4vY5q7IxfxvH0dXerg3mI9qjVHy8jvXRBZ/rqQISM8rdn282PW9LGojQ8wyiyC kkZg8FC3CUSFlbeceLZazqXmcinxfG5bGgVUc6f3K2PBee1VcwGklSfhpVqYYOO6AKkB9F PmYWbkWrjQCBhPP1jsXRTxQfFhiIV/RcYMmP9o/QmQVdF45ylkkaaVwul21OLfRBAaIvzn 5O4NGS/2tK3MsCG0J+x9e6ZO6djSDpzO/eNd0O2Xg+mg4/3kvixMQLZtw+AaKDc4UrmREV Grj1mFtmQAdqKX1XrwKYQYBLAols5UogmBdmRhHTN2Mbn0zDcW7TDAxEHF0YEA== 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=1776542693; 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=WGPb1PJmknBDWS4jXwvPedzr2zwuw9ryXeuWgd5rv84=; b=QHtI4cQ5ekUa8DmnnO2BwGWh03XZEyZCaSPlarSOtWdtMh0il2BwU8Gav6jRrujiPVhqc4 qBbX/9yZeYW9HA5gK1jdzKsedFmzIDEV7GFAK3EqxSfrJ1c7T4PhjGweSjPv4qYJSSYKMw cfIAaHj4fhGkdoGmcmg0ougTd5OAwdFe6Rm2YUB7NviJi34b0OqMpgPjQ8x7nhYGnTT2bg wNKDn08koTCA7QRLuhJE0W/3bedl/znFeUBMVqUnlVKdMxAFUWHWqeROgGVMThUZHdYVf8 GRWlM1cASX/Ij0P51hI8G/p3LPnzlISyYVKv6FELS+ARvl+6jIsqwjJAK1Pbeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fyjQY1LlyzvMZ for ; Sat, 18 Apr 2026 20:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1de4b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 18 Apr 2026 20:04:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: cca22c36c306 - main - iflib: fix book keeping 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cca22c36c306dfabe13b1d1de10e8d27ef3c3bce Auto-Submitted: auto-generated Date: Sat, 18 Apr 2026 20:04:48 +0000 Message-Id: <69e3e3e0.1de4b.27131961@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=cca22c36c306dfabe13b1d1de10e8d27ef3c3bce commit cca22c36c306dfabe13b1d1de10e8d27ef3c3bce Author: Michael Tuexen AuthorDate: 2026-04-18 19:57:40 +0000 Commit: Michael Tuexen CommitDate: 2026-04-18 19:57:40 +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 --- 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 1fd8d57f4ee9..f16355ab1460 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -3866,7 +3866,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; @@ -3906,7 +3906,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) @@ -3929,7 +3929,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); @@ -3937,10 +3937,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); @@ -3960,9 +3961,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