diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-08-25 02:21:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-08-26 12:55:18 -0400 |
commit | 363437f40a23bacdead80bb80d08d8193a20cfce (patch) | |
tree | e5dce35d8aa3ad364dafc1274b3a4c469dbcdb88 /net | |
parent | 18cf1248eca3f1fc38e12b314a6cadd286260e65 (diff) |
net_sched: sfb: optimize enqueue on full queue
In case SFB queue is full (hard limit reached), there is no point
spending time to compute hash and maximum qlen/p_mark.
We instead just early drop packet.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/sched/sch_sfb.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/net/sched/sch_sfb.c b/net/sched/sch_sfb.c index 0a833d0c1f61..e83c272c0325 100644 --- a/net/sched/sch_sfb.c +++ b/net/sched/sch_sfb.c | |||
@@ -287,6 +287,12 @@ static int sfb_enqueue(struct sk_buff *skb, struct Qdisc *sch) | |||
287 | u32 r, slot, salt, sfbhash; | 287 | u32 r, slot, salt, sfbhash; |
288 | int ret = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS; | 288 | int ret = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS; |
289 | 289 | ||
290 | if (unlikely(sch->q.qlen >= q->limit)) { | ||
291 | sch->qstats.overlimits++; | ||
292 | q->stats.queuedrop++; | ||
293 | goto drop; | ||
294 | } | ||
295 | |||
290 | if (q->rehash_interval > 0) { | 296 | if (q->rehash_interval > 0) { |
291 | unsigned long limit = q->rehash_time + q->rehash_interval; | 297 | unsigned long limit = q->rehash_time + q->rehash_interval; |
292 | 298 | ||
@@ -332,12 +338,9 @@ static int sfb_enqueue(struct sk_buff *skb, struct Qdisc *sch) | |||
332 | slot ^= 1; | 338 | slot ^= 1; |
333 | sfb_skb_cb(skb)->hashes[slot] = 0; | 339 | sfb_skb_cb(skb)->hashes[slot] = 0; |
334 | 340 | ||
335 | if (unlikely(minqlen >= q->max || sch->q.qlen >= q->limit)) { | 341 | if (unlikely(minqlen >= q->max)) { |
336 | sch->qstats.overlimits++; | 342 | sch->qstats.overlimits++; |
337 | if (minqlen >= q->max) | 343 | q->stats.bucketdrop++; |
338 | q->stats.bucketdrop++; | ||
339 | else | ||
340 | q->stats.queuedrop++; | ||
341 | goto drop; | 344 | goto drop; |
342 | } | 345 | } |
343 | 346 | ||