diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2021-10-16 10:49:05 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-10-18 12:54:41 +0100 |
| commit | 10940eb746d417734fb9e5eba6df927e593e4f13 (patch) | |
| tree | 63e85df8de94f6d47558bc2b18bf2da95ce804e6 /net/core/gen_stats.c | |
| parent | 7361df4606ba5ab6b998f4467496b4bbf4e5526b (diff) | |
gen_stats: Move remaining users to gnet_stats_add_queue().
The gnet_stats_queue::qlen member is only used in the SMP-case.
qdisc_qstats_qlen_backlog() needs to add qdisc_qlen() to qstats.qlen to
have the same value as that provided by qdisc_qlen_sum().
gnet_stats_copy_queue() needs to overwritte the resulting qstats.qlen
field whith the caller submitted qlen value. It might be differ from the
submitted value.
Let both functions use gnet_stats_add_queue() and remove unused
__gnet_stats_copy_queue().
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/gen_stats.c')
| -rw-r--r-- | net/core/gen_stats.c | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/net/core/gen_stats.c b/net/core/gen_stats.c index 26c020a7ead4..6ec11289140b 100644 --- a/net/core/gen_stats.c +++ b/net/core/gen_stats.c @@ -285,42 +285,6 @@ gnet_stats_copy_rate_est(struct gnet_dump *d, } EXPORT_SYMBOL(gnet_stats_copy_rate_est); -static void -__gnet_stats_copy_queue_cpu(struct gnet_stats_queue *qstats, - const struct gnet_stats_queue __percpu *q) -{ - int i; - - for_each_possible_cpu(i) { - const struct gnet_stats_queue *qcpu = per_cpu_ptr(q, i); - - qstats->qlen = 0; - qstats->backlog += qcpu->backlog; - qstats->drops += qcpu->drops; - qstats->requeues += qcpu->requeues; - qstats->overlimits += qcpu->overlimits; - } -} - -void __gnet_stats_copy_queue(struct gnet_stats_queue *qstats, - const struct gnet_stats_queue __percpu *cpu, - const struct gnet_stats_queue *q, - __u32 qlen) -{ - if (cpu) { - __gnet_stats_copy_queue_cpu(qstats, cpu); - } else { - qstats->qlen = q->qlen; - qstats->backlog = q->backlog; - qstats->drops = q->drops; - qstats->requeues = q->requeues; - qstats->overlimits = q->overlimits; - } - - qstats->qlen = qlen; -} -EXPORT_SYMBOL(__gnet_stats_copy_queue); - static void gnet_stats_add_queue_cpu(struct gnet_stats_queue *qstats, const struct gnet_stats_queue __percpu *q) { @@ -374,7 +338,8 @@ gnet_stats_copy_queue(struct gnet_dump *d, { struct gnet_stats_queue qstats = {0}; - __gnet_stats_copy_queue(&qstats, cpu_q, q, qlen); + gnet_stats_add_queue(&qstats, cpu_q, q); + qstats.qlen = qlen; if (d->compat_tc_stats) { d->tc_stats.drops = qstats.drops; |