Reporting qlen when qlen is per cpu requires aggregating the per cpu counters. This adds a helper routine for this.
Signed-off-by: John Fastabend <john.r.fastab...@intel.com> --- include/net/sch_generic.h | 15 +++++++++++++++ net/sched/sch_api.c | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 1e8e0ad..12df73d 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -271,6 +271,21 @@ static inline int qdisc_qlen(const struct Qdisc *q) return q->q.qlen; } +static inline int qdisc_qlen_sum(const struct Qdisc *q) +{ + __u32 qlen = 0; + int i; + + if (q->flags & TCQ_F_NOLOCK) { + for_each_possible_cpu(i) + qlen += per_cpu_ptr(q->cpu_qstats, i)->qlen; + } else { + qlen = q->q.qlen; + } + + return qlen; +} + static inline struct qdisc_skb_cb *qdisc_skb_cb(const struct sk_buff *skb) { return (struct qdisc_skb_cb *)skb->cb; diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index b90a23a..6c5bf13 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -1370,7 +1370,8 @@ static int tc_fill_qdisc(struct sk_buff *skb, struct Qdisc *q, u32 clid, goto nla_put_failure; if (q->ops->dump && q->ops->dump(q, skb) < 0) goto nla_put_failure; - qlen = q->q.qlen; + + qlen = qdisc_qlen_sum(q); stab = rtnl_dereference(q->stab); if (stab && qdisc_dump_stab(skb, stab) < 0)