diff options
| author | Eric Dumazet <edumazet@google.com> | 2016-06-13 20:21:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-15 14:08:34 -0700 |
| commit | f9aed311b682ca933ca78821cce3e4f1d69d4f56 (patch) | |
| tree | 613c7da0088ae199ba917e925ce6186e43b5164e /net/sched/sch_choke.c | |
| parent | 1b5c5493e3e68181be344cb51bf9df192d05ffc2 (diff) | |
| download | linux-stable-f9aed311b682ca933ca78821cce3e4f1d69d4f56.tar.gz linux-stable-f9aed311b682ca933ca78821cce3e4f1d69d4f56.tar.bz2 linux-stable-f9aed311b682ca933ca78821cce3e4f1d69d4f56.zip | |
net_sched: sch_choke: defer skb freeing
choke_reset() and choke_change() can use rtnl_qdisc_drop()
to defer expensive skb freeing after locks are released.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_choke.c')
| -rw-r--r-- | net/sched/sch_choke.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c index 04e0b0583e00..789b69ee9e51 100644 --- a/net/sched/sch_choke.c +++ b/net/sched/sch_choke.c @@ -375,11 +375,11 @@ static void choke_reset(struct Qdisc *sch) q->head = (q->head + 1) & q->tab_mask; if (!skb) continue; - qdisc_qstats_backlog_dec(sch, skb); - --sch->q.qlen; - qdisc_drop(skb, sch); + rtnl_qdisc_drop(skb, sch); } + sch->q.qlen = 0; + sch->qstats.backlog = 0; memset(q->tab, 0, (q->tab_mask + 1) * sizeof(struct sk_buff *)); q->head = q->tail = 0; red_restart(&q->vars); @@ -455,7 +455,7 @@ static int choke_change(struct Qdisc *sch, struct nlattr *opt) dropped += qdisc_pkt_len(skb); qdisc_qstats_backlog_dec(sch, skb); --sch->q.qlen; - qdisc_drop(skb, sch); + rtnl_qdisc_drop(skb, sch); } qdisc_tree_reduce_backlog(sch, oqlen - sch->q.qlen, dropped); q->head = 0; |