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>
This commit is contained in:
parent
7361df4606
commit
10940eb746
@ -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);
|
||||
|
@ -972,10 +972,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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user