Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-18 00:53:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

net: sched: helpers to sum qlen and qlen for per cpu logic

Browse Source 
Add qdisc qlen helper routines for lockless qdiscs to use.

The qdisc qlen is no longer used in the hotpath but it is reported
via stats query on the qdisc so it still needs to be tracked. This
adds the per cpu operations needed along with a helper to return
the summation of per cpu stats.

Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
John Fastabend 2017-12-07 09:57:00 -08:00 committed by David S. Miller
parent fd8e8d1a77
commit 7e66016f2c
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/net/sch_generic.h
View File

@ -292,11 +292,31 @@ static inline void qdisc_cb_private_validate(const struct sk_buff *skb, int sz)
BUILD_BUG_ON(sizeof(qcb->data) < sz); BUILD_BUG_ON(sizeof(qcb->data) < sz);
} }
static inline int qdisc_qlen_cpu(const struct Qdisc *q)
{
return this_cpu_ptr(q->cpu_qstats)->qlen;
}
static inline int qdisc_qlen(const struct Qdisc *q) static inline int qdisc_qlen(const struct Qdisc *q)
{ {
return q->q.qlen; 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) static inline struct qdisc_skb_cb *qdisc_skb_cb(const struct sk_buff *skb)
{ {
return (struct qdisc_skb_cb *)skb->cb; return (struct qdisc_skb_cb *)skb->cb;

3
net/sched/sch_api.c
View File

@ -797,7 +797,8 @@ static int tc_fill_qdisc(struct sk_buff *skb, struct Qdisc *q, u32 clid,
goto nla_put_failure; goto nla_put_failure;
if (q->ops->dump && q->ops->dump(q, skb) < 0) if (q->ops->dump && q->ops->dump(q, skb) < 0)
goto nla_put_failure; goto nla_put_failure;
qlen = q->q.qlen;
qlen = qdisc_qlen_sum(q);
stab = rtnl_dereference(q->stab); stab = rtnl_dereference(q->stab);
if (stab && qdisc_dump_stab(skb, stab) < 0) if (stab && qdisc_dump_stab(skb, stab) < 0)