git: 18b6283014a2 - releng/13.0 - iflib: Avoid double counting in rxeof
Mark Johnston
markj at FreeBSD.org
Sun Feb 28 20:51:32 UTC 2021
The branch releng/13.0 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=18b6283014a291f5fe546092ee16d774a0102691
commit 18b6283014a291f5fe546092ee16d774a0102691
Author: Mark Johnston <markj at FreeBSD.org>
AuthorDate: 2021-02-24 15:08:53 +0000
Commit: Mark Johnston <markj at FreeBSD.org>
CommitDate: 2021-02-28 20:51:21 +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.
Approved by: re (gjb)
PR: 253583
Reviewed by: gallatin, erj
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D28900
(cherry picked from commit b6999635b195e8c0dd5c08ac9ff268c92107cc66)
(cherry picked from commit 76294b65df64e87f29a7d7df23c5360dd9ada5aa)
---
sys/net/iflib.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/sys/net/iflib.c b/sys/net/iflib.c
index 506861b65570..70c0ec6a129f 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) {
More information about the dev-commits-src-all
mailing list