diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2021-10-16 11:49:05 +0300 |
|---|---|---|
| committer | Minda Chen <minda.chen@starfivetech.com> | 2023-11-06 14:24:40 +0300 |
| commit | 1eafc8ec617623c4b207c9114fd019370384b735 (patch) | |
| tree | c9012a2450838d6a713dd19c6c833d27756ab3ff /include/net | |
| parent | dfa619864bc8787d508a98b68f9e7958fbb544fa (diff) | |
| download | linux-1eafc8ec617623c4b207c9114fd019370384b735.tar.xz | |
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 'include/net')
| -rw-r--r-- | include/net/gen_stats.h | 3 | ||||
| -rw-r--r-- | include/net/sch_generic.h | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/net/gen_stats.h b/include/net/gen_stats.h index 148f0ba85f25..d47155f5db5d 100644 --- a/include/net/gen_stats.h +++ b/include/net/gen_stats.h @@ -59,9 +59,6 @@ int gnet_stats_copy_rate_est(struct gnet_dump *d, int gnet_stats_copy_queue(struct gnet_dump *d, struct gnet_stats_queue __percpu *cpu_q, struct gnet_stats_queue *q, __u32 qlen); -void __gnet_stats_copy_queue(struct gnet_stats_queue *qstats, - const struct gnet_stats_queue __percpu *cpu_q, - const struct gnet_stats_queue *q, __u32 qlen); void gnet_stats_add_queue(struct gnet_stats_queue *qstats, const struct gnet_stats_queue __percpu *cpu_q, const struct gnet_stats_queue *q); diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index c0069ac00e62..97ce9c0b1860 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -968,10 +968,9 @@ static inline void qdisc_qstats_qlen_backlog(struct Qdisc *sch, __u32 *qlen, __u32 *backlog) { struct gnet_stats_queue qstats = { 0 }; - __u32 len = qdisc_qlen_sum(sch); - __gnet_stats_copy_queue(&qstats, sch->cpu_qstats, &sch->qstats, len); - *qlen = qstats.qlen; + gnet_stats_add_queue(&qstats, sch->cpu_qstats, &sch->qstats); + *qlen = qstats.qlen + qdisc_qlen(sch); *backlog = qstats.backlog; } |