| Message ID | 150330315167.155003.1998024290510727078.stgit@buzz |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, Aug 21, 2017 at 1:12 AM, Konstantin Khlebnikov <khlebnikov@yandex-team.ru> wrote: > When hhf_enqueue() drops packet from another bucket it > have to update backlog at upper qdiscs too. > > Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru> > Fixes: 2ccccf5fb43f ("net_sched: update hierarchical backlog too") > --- > net/sched/sch_hhf.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/net/sched/sch_hhf.c b/net/sched/sch_hhf.c > index 51d3ba682af9..c8d84436e427 100644 > --- a/net/sched/sch_hhf.c > +++ b/net/sched/sch_hhf.c > @@ -406,8 +406,11 @@ static int hhf_enqueue(struct sk_buff *skb, struct Qdisc *sch, > /* Return Congestion Notification only if we dropped a packet from this > * bucket. > */ > - if (hhf_drop(sch, to_free) == idx) > + if (hhf_drop(sch, to_free) == idx) { > + qdisc_tree_reduce_backlog(sch, 0, It should be 1 here instead of 0, because one packet is dropped even if hhf_drop() == idx. > + prev_backlog - sch->qstats.backlog); > return NET_XMIT_CN; > + } > > /* As we dropped a packet, better let upper stack know this. */ > qdisc_tree_reduce_backlog(sch, 1, prev_backlog - sch->qstats.backlog); >
Emails encoded in HTML will be blocked by the list server, and quite frankly I just outright delete all emails which I receive which are HTML encoded as well. Just FYI...
On Mon, Aug 21, 2017 at 9:56 AM, Konstantin Khlebnikov <khlebnikov@yandex-team.ru> wrote: > Current packet wouldn't be counted by parent either. So queue length isn't > changed. > But the qdisc_tree_reduce_backlog() right below uses 1 too: /* As we dropped a packet, better let upper stack know this. */ qdisc_tree_reduce_backlog(sch, 1, prev_backlog - sch->qstats.backlog); return NET_XMIT_SUCCESS;
diff --git a/net/sched/sch_hhf.c b/net/sched/sch_hhf.c index 51d3ba682af9..c8d84436e427 100644 --- a/net/sched/sch_hhf.c +++ b/net/sched/sch_hhf.c @@ -406,8 +406,11 @@ static int hhf_enqueue(struct sk_buff *skb, struct Qdisc *sch, /* Return Congestion Notification only if we dropped a packet from this * bucket. */ - if (hhf_drop(sch, to_free) == idx) + if (hhf_drop(sch, to_free) == idx) { + qdisc_tree_reduce_backlog(sch, 0, + prev_backlog - sch->qstats.backlog); return NET_XMIT_CN; + } /* As we dropped a packet, better let upper stack know this. */ qdisc_tree_reduce_backlog(sch, 1, prev_backlog - sch->qstats.backlog);
When hhf_enqueue() drops packet from another bucket it have to update backlog at upper qdiscs too. Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru> Fixes: 2ccccf5fb43f ("net_sched: update hierarchical backlog too") --- net/sched/sch_hhf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)