net_sched: update bstats in dequeue()
Class bytes/packets stats can be misleading because they are updated in enqueue() while packet might be dropped later. We already fixed all qdiscs but sch_atm. This patch makes the final cleanup. class rate estimators can now match qdisc ones. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
a6700db179
commit
2dd875ff31
|
@ -423,8 +423,6 @@ drop: __maybe_unused
|
|||
}
|
||||
return ret;
|
||||
}
|
||||
qdisc_bstats_update(sch, skb);
|
||||
bstats_update(&flow->bstats, skb);
|
||||
/*
|
||||
* Okay, this may seem weird. We pretend we've dropped the packet if
|
||||
* it goes via ATM. The reason for this is that the outer qdisc
|
||||
|
@ -472,6 +470,8 @@ static void sch_atm_dequeue(unsigned long data)
|
|||
if (unlikely(!skb))
|
||||
break;
|
||||
|
||||
qdisc_bstats_update(sch, skb);
|
||||
bstats_update(&flow->bstats, skb);
|
||||
pr_debug("atm_tc_dequeue: sending on class %p\n", flow);
|
||||
/* remove any LL header somebody else has attached */
|
||||
skb_pull(skb, skb_network_offset(skb));
|
||||
|
|
|
@ -376,8 +376,6 @@ static int drr_enqueue(struct sk_buff *skb, struct Qdisc *sch)
|
|||
cl->deficit = cl->quantum;
|
||||
}
|
||||
|
||||
bstats_update(&cl->bstats, skb);
|
||||
|
||||
sch->q.qlen++;
|
||||
return err;
|
||||
}
|
||||
|
@ -403,6 +401,8 @@ static struct sk_buff *drr_dequeue(struct Qdisc *sch)
|
|||
skb = qdisc_dequeue_peeked(cl->qdisc);
|
||||
if (cl->qdisc->q.qlen == 0)
|
||||
list_del(&cl->alist);
|
||||
|
||||
bstats_update(&cl->bstats, skb);
|
||||
qdisc_bstats_update(sch, skb);
|
||||
sch->q.qlen--;
|
||||
return skb;
|
||||
|
|
|
@ -1609,7 +1609,6 @@ hfsc_enqueue(struct sk_buff *skb, struct Qdisc *sch)
|
|||
if (cl->qdisc->q.qlen == 1)
|
||||
set_active(cl, qdisc_pkt_len(skb));
|
||||
|
||||
bstats_update(&cl->bstats, skb);
|
||||
sch->q.qlen++;
|
||||
|
||||
return NET_XMIT_SUCCESS;
|
||||
|
@ -1657,6 +1656,7 @@ hfsc_dequeue(struct Qdisc *sch)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
bstats_update(&cl->bstats, skb);
|
||||
update_vf(cl, qdisc_pkt_len(skb), cur_time);
|
||||
if (realtime)
|
||||
cl->cl_cumul += qdisc_pkt_len(skb);
|
||||
|
|
|
@ -574,7 +574,6 @@ static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch)
|
|||
}
|
||||
return ret;
|
||||
} else {
|
||||
bstats_update(&cl->bstats, skb);
|
||||
htb_activate(q, cl);
|
||||
}
|
||||
|
||||
|
@ -835,6 +834,7 @@ static struct sk_buff *htb_dequeue_tree(struct htb_sched *q, int prio,
|
|||
} while (cl != start);
|
||||
|
||||
if (likely(skb != NULL)) {
|
||||
bstats_update(&cl->bstats, skb);
|
||||
cl->un.leaf.deficit[level] -= qdisc_pkt_len(skb);
|
||||
if (cl->un.leaf.deficit[level] < 0) {
|
||||
cl->un.leaf.deficit[level] += cl->quantum;
|
||||
|
|
Loading…
Reference in New Issue
Block a user