git: bcfb4750b809 - stable/13 - dummynet: Move packet counters into dn_cfg
Kristof Provost
kp at FreeBSD.org
Wed Apr 7 15:48:08 UTC 2021
The branch stable/13 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=bcfb4750b8099c1d9d3e179385269dc63dc7dcc5
commit bcfb4750b8099c1d9d3e179385269dc63dc7dcc5
Author: Kristof Provost <kp at FreeBSD.org>
AuthorDate: 2021-03-09 15:27:31 +0000
Commit: Kristof Provost <kp at FreeBSD.org>
CommitDate: 2021-04-07 15:25:54 +0000
dummynet: Move packet counters into dn_cfg
Move the packets counters into the dn_cfg struct. This reduces the
global name space use for dummynet and will make future work for things
like vnet support and re-use in pf easier.
Reviewed by: donner
MFC after: 2 weeks
Sponsored by: Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D29245
(cherry picked from commit cd5671efc0190ba0f9eb41bba42e703277af20c3)
---
sys/netpfil/ipfw/dn_aqm.h | 5 +----
sys/netpfil/ipfw/dn_sched_fq_codel.h | 2 +-
sys/netpfil/ipfw/dn_sched_fq_pie.c | 2 +-
sys/netpfil/ipfw/ip_dn_io.c | 24 ++++++++----------------
sys/netpfil/ipfw/ip_dn_private.h | 5 +++++
5 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/sys/netpfil/ipfw/dn_aqm.h b/sys/netpfil/ipfw/dn_aqm.h
index a8a362a4bde9..8bbe9fe69e86 100644
--- a/sys/netpfil/ipfw/dn_aqm.h
+++ b/sys/netpfil/ipfw/dn_aqm.h
@@ -53,9 +53,6 @@ typedef int32_t aqm_stime_t;
/* Macro for variable bounding */
#define BOUND_VAR(x,l,h) ((x) > (h)? (h) : ((x) > (l)? (x) : (l)))
-/* sysctl variable to count number of dropped packets */
-extern unsigned long io_pkt_drop;
-
/*
* Structure for holding data and function pointers that together represent a
* AQM algorithm.
@@ -137,7 +134,7 @@ update_stats(struct dn_queue *q, int len, int drop)
if (drop) {
qni->drops++;
sni->drops++;
- io_pkt_drop++;
+ dn_cfg.io_pkt_drop++;
} else {
/*update queue stats */
qni->length += inc;
diff --git a/sys/netpfil/ipfw/dn_sched_fq_codel.h b/sys/netpfil/ipfw/dn_sched_fq_codel.h
index 725189483ba2..a8369ac83129 100644
--- a/sys/netpfil/ipfw/dn_sched_fq_codel.h
+++ b/sys/netpfil/ipfw/dn_sched_fq_codel.h
@@ -104,7 +104,7 @@ fq_update_stats(struct fq_codel_flow *q, struct fq_codel_si *si, int len,
si->main_q.ni.drops ++;
q->stats.drops ++;
si->_si.ni.drops ++;
- io_pkt_drop ++;
+ dn_cfg.io_pkt_drop ++;
}
if (!drop || (drop && len < 0)) {
diff --git a/sys/netpfil/ipfw/dn_sched_fq_pie.c b/sys/netpfil/ipfw/dn_sched_fq_pie.c
index 2f21ca77e33a..257dada44345 100644
--- a/sys/netpfil/ipfw/dn_sched_fq_pie.c
+++ b/sys/netpfil/ipfw/dn_sched_fq_pie.c
@@ -299,7 +299,7 @@ fq_update_stats(struct fq_pie_flow *q, struct fq_pie_si *si, int len,
si->main_q.ni.drops ++;
q->stats.drops ++;
si->_si.ni.drops ++;
- io_pkt_drop ++;
+ dn_cfg.io_pkt_drop ++;
}
if (!drop || (drop && len < 0)) {
diff --git a/sys/netpfil/ipfw/ip_dn_io.c b/sys/netpfil/ipfw/ip_dn_io.c
index 1b39fcb0359f..f71d07ae1140 100644
--- a/sys/netpfil/ipfw/ip_dn_io.c
+++ b/sys/netpfil/ipfw/ip_dn_io.c
@@ -88,14 +88,6 @@ static long tick_lost; /* Lost(coalesced) ticks number. */
/* Adjusted vs non-adjusted curr_time difference (ticks). */
static long tick_diff;
-static unsigned long io_pkt;
-static unsigned long io_pkt_fast;
-
-#ifdef NEW_AQM
-unsigned long io_pkt_drop;
-#else
-static unsigned long io_pkt_drop;
-#endif
/*
* We use a heap to store entities for which we have pending timer events.
* The heap is checked at every tick and all entities with expired events
@@ -228,13 +220,13 @@ SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, fsk_count,
SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, queue_count,
CTLFLAG_RD, DC(queue_count), 0, "Number of queues");
SYSCTL_ULONG(_net_inet_ip_dummynet, OID_AUTO, io_pkt,
- CTLFLAG_RD, &io_pkt, 0,
+ CTLFLAG_RD, DC(io_pkt), 0,
"Number of packets passed to dummynet.");
SYSCTL_ULONG(_net_inet_ip_dummynet, OID_AUTO, io_pkt_fast,
- CTLFLAG_RD, &io_pkt_fast, 0,
+ CTLFLAG_RD, DC(io_pkt_fast), 0,
"Number of packets bypassed dummynet scheduler.");
SYSCTL_ULONG(_net_inet_ip_dummynet, OID_AUTO, io_pkt_drop,
- CTLFLAG_RD, &io_pkt_drop, 0,
+ CTLFLAG_RD, DC(io_pkt_drop), 0,
"Number of packets dropped by dummynet.");
#undef DC
SYSEND
@@ -540,7 +532,7 @@ dn_enqueue(struct dn_queue *q, struct mbuf* m, int drop)
return (0);
drop:
- io_pkt_drop++;
+ dn_cfg.io_pkt_drop++;
q->ni.drops++;
ni->drops++;
FREE_PKT(m);
@@ -882,7 +874,7 @@ dummynet_io(struct mbuf **m0, struct ip_fw_args *fwa)
else if (fwa->flags & IPFW_ARGS_IP6)
dir |= PROTO_IPV6;
DN_BH_WLOCK();
- io_pkt++;
+ dn_cfg.io_pkt++;
/* we could actually tag outside the lock, but who cares... */
if (tag_mbuf(m, dir, fwa))
goto dropit;
@@ -918,7 +910,7 @@ dummynet_io(struct mbuf **m0, struct ip_fw_args *fwa)
m = *m0 = NULL;
/* dn_enqueue already increases io_pkt_drop */
- io_pkt_drop--;
+ dn_cfg.io_pkt_drop--;
goto dropit;
}
@@ -956,7 +948,7 @@ dummynet_io(struct mbuf **m0, struct ip_fw_args *fwa)
tag->m_tag_cookie = MTAG_IPFW_RULE;
tag->m_tag_id = 0;
- io_pkt_fast++;
+ dn_cfg.io_pkt_fast++;
if (m->m_nextpkt != NULL) {
printf("dummynet: fast io: pkt chain detected!\n");
m->m_nextpkt = NULL;
@@ -972,7 +964,7 @@ done:
return 0;
dropit:
- io_pkt_drop++;
+ dn_cfg.io_pkt_drop++;
DN_BH_WUNLOCK();
if (m)
FREE_PKT(m);
diff --git a/sys/netpfil/ipfw/ip_dn_private.h b/sys/netpfil/ipfw/ip_dn_private.h
index 24765bc09b0e..38c6ff1201d5 100644
--- a/sys/netpfil/ipfw/ip_dn_private.h
+++ b/sys/netpfil/ipfw/ip_dn_private.h
@@ -131,6 +131,11 @@ struct dn_parms {
int fsk_count;
int queue_count;
+ /* packet counters */
+ unsigned long io_pkt;
+ unsigned long io_pkt_fast;
+ unsigned long io_pkt_drop;
+
/* ticks and other stuff */
uint64_t curr_time;
/* flowsets and schedulers are in hash tables, with 'hash_size'
More information about the dev-commits-src-all
mailing list