lkml.org 
[lkml]   [2020]   [May]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 093/312] sch_tbf: update backlog as well
    Date
    From: WANG Cong <xiyou.wangcong@gmail.com>

    commit 8d5958f424b62060a8696b12c17dad198d5d386f upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/sched/sch_tbf.c | 4 ++++
    1 file changed, 4 insertions(+)

    --- a/net/sched/sch_tbf.c
    +++ b/net/sched/sch_tbf.c
    @@ -197,6 +197,7 @@ static int tbf_enqueue(struct sk_buff *s
    return ret;
    }

    + qdisc_qstats_backlog_inc(sch, skb);
    sch->q.qlen++;
    return NET_XMIT_SUCCESS;
    }
    @@ -207,6 +208,7 @@ static unsigned int tbf_drop(struct Qdis
    unsigned int len = 0;

    if (q->qdisc->ops->drop && (len = q->qdisc->ops->drop(q->qdisc)) != 0) {
    + sch->qstats.backlog -= len;
    sch->q.qlen--;
    qdisc_qstats_drop(sch);
    }
    @@ -253,6 +255,7 @@ static struct sk_buff *tbf_dequeue(struc
    q->t_c = now;
    q->tokens = toks;
    q->ptokens = ptoks;
    + qdisc_qstats_backlog_dec(sch, skb);
    sch->q.qlen--;
    qdisc_unthrottled(sch);
    qdisc_bstats_update(sch, skb);
    @@ -284,6 +287,7 @@ static void tbf_reset(struct Qdisc *sch)
    struct tbf_sched_data *q = qdisc_priv(sch);

    qdisc_reset(q->qdisc);
    + sch->qstats.backlog = 0;
    sch->q.qlen = 0;
    q->t_c = ktime_get_ns();
    q->tokens = q->buffer;

    \
     
     \ /
      Last update: 2020-05-08 14:41    [W:2.090 / U:0.404 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site