diff options
| author |   WANG Cong <xiyou.wangcong@gmail.com> | 2016-06-03 15:05:57 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-06-06 21:14:29 -0400 |
| commit | a27758ffaf96f89002129eedb2cc172d254099f8 (patch) | |
| tree | a773e569d26b1c5b364d12cd69a76615d3090af7 /include/net/sch_generic.h | |
| parent | soreuseport: add compat case for setsockopt SO_ATTACH_REUSEPORT_CBPF (diff) | |
| download | linux-dev-a27758ffaf96f89002129eedb2cc172d254099f8.tar.xz linux-dev-a27758ffaf96f89002129eedb2cc172d254099f8.zip | |
net_sched: keep backlog updated with qlen
For gso_skb we only update qlen, backlog should be updated too.
Note, it is correct to just update these stats at one layer,
because the gso_skb is cached there.
Reported-by: Stas Nichiporovich <stasn77@gmail.com>
Fixes: 2ccccf5fb43f ("net_sched: update hierarchical backlog too")
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/sch_generic.h')
| -rw-r--r-- | include/net/sch_generic.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index a1fd76c22a59..6803af17dfcf 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -691,9 +691,11 @@ static inline struct sk_buff *qdisc_peek_dequeued(struct Qdisc *sch) /* we can reuse ->gso_skb because peek isn't called for root qdiscs */ if (!sch->gso_skb) { sch->gso_skb = sch->dequeue(sch); - if (sch->gso_skb) + if (sch->gso_skb) { /* it's still part of the queue */ + qdisc_qstats_backlog_inc(sch, sch->gso_skb); sch->q.qlen++; + } } return sch->gso_skb; @@ -706,6 +708,7 @@ static inline struct sk_buff *qdisc_dequeue_peeked(struct Qdisc *sch) if (skb) { sch->gso_skb = NULL; + qdisc_qstats_backlog_dec(sch, skb); sch->q.qlen--; } else { skb = sch->dequeue(sch); |