All of lore.kernel.org
 help / color / mirror / Atom feed
* [Patch net] sch_qfq: keep backlog updated with qlen
@ 2016-09-18 23:22 Cong Wang
  2016-09-18 23:22 ` [Patch net] sch_sfb: " Cong Wang
  2016-09-22 23:27 ` [Patch net] sch_qfq: " Jamal Hadi Salim
  0 siblings, 2 replies; 4+ messages in thread
From: Cong Wang @ 2016-09-18 23:22 UTC (permalink / raw)
  To: netdev; +Cc: Cong Wang, Jamal Hadi Salim

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>
---
 net/sched/sch_qfq.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c
index f27ffee..ca0516e 100644
--- a/net/sched/sch_qfq.c
+++ b/net/sched/sch_qfq.c
@@ -1153,6 +1153,7 @@ static struct sk_buff *qfq_dequeue(struct Qdisc *sch)
 	if (!skb)
 		return NULL;
 
+	qdisc_qstats_backlog_dec(sch, skb);
 	sch->q.qlen--;
 	qdisc_bstats_update(sch, skb);
 
@@ -1256,6 +1257,7 @@ static int qfq_enqueue(struct sk_buff *skb, struct Qdisc *sch,
 	}
 
 	bstats_update(&cl->bstats, skb);
+	qdisc_qstats_backlog_inc(sch, skb);
 	++sch->q.qlen;
 
 	agg = cl->agg;
@@ -1476,6 +1478,7 @@ static void qfq_reset_qdisc(struct Qdisc *sch)
 			qdisc_reset(cl->qdisc);
 		}
 	}
+	sch->qstats.backlog = 0;
 	sch->q.qlen = 0;
 }
 
-- 
2.1.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [Patch net] sch_sfb: keep backlog updated with qlen
  2016-09-18 23:22 [Patch net] sch_qfq: keep backlog updated with qlen Cong Wang
@ 2016-09-18 23:22 ` Cong Wang
  2016-09-22 23:28   ` Jamal Hadi Salim
  2016-09-22 23:27 ` [Patch net] sch_qfq: " Jamal Hadi Salim
  1 sibling, 1 reply; 4+ messages in thread
From: Cong Wang @ 2016-09-18 23:22 UTC (permalink / raw)
  To: netdev; +Cc: Cong Wang, Jamal Hadi Salim

Fixes: 2ccccf5fb43f ("net_sched: update hierarchical backlog too")
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
---
 net/sched/sch_sfb.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net/sched/sch_sfb.c b/net/sched/sch_sfb.c
index add3cc7..20a350b 100644
--- a/net/sched/sch_sfb.c
+++ b/net/sched/sch_sfb.c
@@ -400,6 +400,7 @@ static int sfb_enqueue(struct sk_buff *skb, struct Qdisc *sch,
 enqueue:
 	ret = qdisc_enqueue(skb, child, to_free);
 	if (likely(ret == NET_XMIT_SUCCESS)) {
+		qdisc_qstats_backlog_inc(sch, skb);
 		sch->q.qlen++;
 		increment_qlen(skb, q);
 	} else if (net_xmit_drop_count(ret)) {
@@ -428,6 +429,7 @@ static struct sk_buff *sfb_dequeue(struct Qdisc *sch)
 
 	if (skb) {
 		qdisc_bstats_update(sch, skb);
+		qdisc_qstats_backlog_dec(sch, skb);
 		sch->q.qlen--;
 		decrement_qlen(skb, q);
 	}
@@ -450,6 +452,7 @@ static void sfb_reset(struct Qdisc *sch)
 	struct sfb_sched_data *q = qdisc_priv(sch);
 
 	qdisc_reset(q->qdisc);
+	sch->qstats.backlog = 0;
 	sch->q.qlen = 0;
 	q->slot = 0;
 	q->double_buffering = false;
-- 
2.1.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [Patch net] sch_qfq: keep backlog updated with qlen
  2016-09-18 23:22 [Patch net] sch_qfq: keep backlog updated with qlen Cong Wang
  2016-09-18 23:22 ` [Patch net] sch_sfb: " Cong Wang
@ 2016-09-22 23:27 ` Jamal Hadi Salim
  1 sibling, 0 replies; 4+ messages in thread
From: Jamal Hadi Salim @ 2016-09-22 23:27 UTC (permalink / raw)
  To: Cong Wang, netdev

On 16-09-18 07:22 PM, Cong Wang wrote:
> 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>

Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>


cheers,
jamal

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Patch net] sch_sfb: keep backlog updated with qlen
  2016-09-18 23:22 ` [Patch net] sch_sfb: " Cong Wang
@ 2016-09-22 23:28   ` Jamal Hadi Salim
  0 siblings, 0 replies; 4+ messages in thread
From: Jamal Hadi Salim @ 2016-09-22 23:28 UTC (permalink / raw)
  To: Cong Wang, netdev

On 16-09-18 07:22 PM, Cong Wang wrote:
> Fixes: 2ccccf5fb43f ("net_sched: update hierarchical backlog too")
> Cc: Jamal Hadi Salim <jhs@mojatatu.com>
> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>

Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>

cheers,
jamal

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-09-22 23:28 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-18 23:22 [Patch net] sch_qfq: keep backlog updated with qlen Cong Wang
2016-09-18 23:22 ` [Patch net] sch_sfb: " Cong Wang
2016-09-22 23:28   ` Jamal Hadi Salim
2016-09-22 23:27 ` [Patch net] sch_qfq: " Jamal Hadi Salim

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.