* [PATCH] net_sched: always reset qdisc backlog in qdisc_reset()
@ 2017-09-20 12:45 Konstantin Khlebnikov
2017-09-20 23:26 ` Cong Wang
2017-09-21 18:57 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Konstantin Khlebnikov @ 2017-09-20 12:45 UTC (permalink / raw)
To: netdev, David S. Miller; +Cc: Cong Wang, Jiri Pirko, Jamal Hadi Salim
SKB stored in qdisc->gso_skb also counted into backlog.
Some qdiscs don't reset backlog to zero in ->reset(),
for example sfq just dequeue and free all queued skb.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Fixes: 2ccccf5fb43f ("net_sched: update hierarchical backlog too")
---
net/sched/sch_generic.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 92237e75dbbc..bf8c81e07c70 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -685,6 +685,7 @@ void qdisc_reset(struct Qdisc *qdisc)
qdisc->gso_skb = NULL;
}
qdisc->q.qlen = 0;
+ qdisc->qstats.backlog = 0;
}
EXPORT_SYMBOL(qdisc_reset);
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] net_sched: always reset qdisc backlog in qdisc_reset()
2017-09-20 12:45 [PATCH] net_sched: always reset qdisc backlog in qdisc_reset() Konstantin Khlebnikov
@ 2017-09-20 23:26 ` Cong Wang
2017-09-21 18:57 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Cong Wang @ 2017-09-20 23:26 UTC (permalink / raw)
To: Konstantin Khlebnikov
Cc: Linux Kernel Network Developers, David S. Miller, Jiri Pirko,
Jamal Hadi Salim
On Wed, Sep 20, 2017 at 5:45 AM, Konstantin Khlebnikov
<khlebnikov@yandex-team.ru> wrote:
> SKB stored in qdisc->gso_skb also counted into backlog.
>
> Some qdiscs don't reset backlog to zero in ->reset(),
> for example sfq just dequeue and free all queued skb.
>
> Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
> Fixes: 2ccccf5fb43f ("net_sched: update hierarchical backlog too")
Looks good.
sch->qstats.backlog = 0 can be removed from each ->reset()
after this patch.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] net_sched: always reset qdisc backlog in qdisc_reset()
2017-09-20 12:45 [PATCH] net_sched: always reset qdisc backlog in qdisc_reset() Konstantin Khlebnikov
2017-09-20 23:26 ` Cong Wang
@ 2017-09-21 18:57 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2017-09-21 18:57 UTC (permalink / raw)
To: khlebnikov; +Cc: netdev, xiyou.wangcong, jiri, jhs
From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Date: Wed, 20 Sep 2017 15:45:36 +0300
> SKB stored in qdisc->gso_skb also counted into backlog.
>
> Some qdiscs don't reset backlog to zero in ->reset(),
> for example sfq just dequeue and free all queued skb.
>
> Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
> Fixes: 2ccccf5fb43f ("net_sched: update hierarchical backlog too")
Applied and queued up for -stable.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-09-21 18:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-20 12:45 [PATCH] net_sched: always reset qdisc backlog in qdisc_reset() Konstantin Khlebnikov
2017-09-20 23:26 ` Cong Wang
2017-09-21 18:57 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).