Date: Sat, 27 Feb 2021 16:09:07 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 76294b65df64 - stable/13 - iflib: Avoid double counting in rxeof Message-ID: <202102271609.11RG97Ll000656@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=76294b65df64e87f29a7d7df23c5360dd9ada5aa commit 76294b65df64e87f29a7d7df23c5360dd9ada5aa Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2021-02-24 15:08:53 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2021-02-27 16:07:46 +0000 iflib: Avoid double counting in rxeof iflib_rxeof() was counting everything twice. This was introduced when pfil hooks were added to the iflib receive path. We want to count rx packets/bytes before the pfil hooks are executed, so remove the counter adjustments that are executed after. PR: 253583 Reviewed by: gallatin, erj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D28900 (cherry picked from commit b6999635b195e8c0dd5c08ac9ff268c92107cc66) --- sys/net/iflib.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index a33ddbe5b8ae..9f3eff555728 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -2973,8 +2973,6 @@ iflib_rxeof(iflib_rxq_t rxq, qidx_t budget) if (!IP_ALIGNED(m) && (m = iflib_fixup_rx(m)) == NULL) continue; #endif - rx_bytes += m->m_pkthdr.len; - rx_pkts++; #if defined(INET6) || defined(INET) if (lro_enabled) { if (!lro_possible) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102271609.11RG97Ll000656>