diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2019-03-28 16:53:13 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-01 14:50:13 -0700 |
| commit | e5f0e8f8e456589d56e4955154ed5d468cd6d286 (patch) | |
| tree | 394e064316a0965588c3784a36a24fca3a7b352d /net/sched/sch_qfq.c | |
| parent | 5dd431b6b92c0db324d134d2a4006dd4f87f2261 (diff) | |
| download | linux-stable-e5f0e8f8e456589d56e4955154ed5d468cd6d286.tar.gz linux-stable-e5f0e8f8e456589d56e4955154ed5d468cd6d286.tar.bz2 linux-stable-e5f0e8f8e456589d56e4955154ed5d468cd6d286.zip | |
net: sched: introduce and use qdisc tree flush/purge helpers
The same code to flush qdisc tree and purge the qdisc queue
is duplicated in many places and in most cases it does not
respect NOLOCK qdisc: the global backlog len is used and the
per CPU values are ignored.
This change addresses the above, factoring-out the relevant
code and using the helpers introduced by the previous patch
to fetch the correct backlog len.
Fixes: c5ad119fb6c0 ("net: sched: pfifo_fast use skb_array")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_qfq.c')
| -rw-r--r-- | net/sched/sch_qfq.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c index 9fbda3ec5861..1589364b54da 100644 --- a/net/sched/sch_qfq.c +++ b/net/sched/sch_qfq.c @@ -217,15 +217,6 @@ static struct qfq_class *qfq_find_class(struct Qdisc *sch, u32 classid) return container_of(clc, struct qfq_class, common); } -static void qfq_purge_queue(struct qfq_class *cl) -{ - unsigned int len = cl->qdisc->q.qlen; - unsigned int backlog = cl->qdisc->qstats.backlog; - - qdisc_reset(cl->qdisc); - qdisc_tree_reduce_backlog(cl->qdisc, len, backlog); -} - static const struct nla_policy qfq_policy[TCA_QFQ_MAX + 1] = { [TCA_QFQ_WEIGHT] = { .type = NLA_U32 }, [TCA_QFQ_LMAX] = { .type = NLA_U32 }, @@ -551,7 +542,7 @@ static int qfq_delete_class(struct Qdisc *sch, unsigned long arg) sch_tree_lock(sch); - qfq_purge_queue(cl); + qdisc_purge_queue(cl->qdisc); qdisc_class_hash_remove(&q->clhash, &cl->common); sch_tree_unlock(sch); |