Patchwork [6/6] pkt_sched: sch_htb: Optimize WARN_ONs in htb_dequeue_tree() etc.

login
register
mail settings
Submitter Jarek Poplawski
Date Dec. 9, 2008, 10:21 a.m.
Message ID <20081209102157.GF14862@ff.dom.local>
Download mbox | patch
Permalink /patch/12912/
State Accepted
Delegated to: David Miller
Headers show

Comments

Jarek Poplawski - Dec. 9, 2008, 10:21 a.m.
We can skip WARN_ON() in htb_dequeue_tree() because there should be
always a similar warning from htb_lookup_leaf() earlier.

The first WARN_ON() in in htb_lookup_leaf() is changed to BUG_ON()
because most likly this should end with oops anyway.

Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
---
 net/sched/sch_htb.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Patch

diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index f44a4be..9de3682 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -730,7 +730,7 @@  static struct htb_class *htb_lookup_leaf(struct rb_root *tree, int prio,
 		u32 *pid;
 	} stk[TC_HTB_MAXDEPTH], *sp = stk;
 
-	WARN_ON(!tree->rb_node);
+	BUG_ON(!tree->rb_node);
 	sp->root = tree->rb_node;
 	sp->pptr = pptr;
 	sp->pid = pid;
@@ -750,9 +750,10 @@  static struct htb_class *htb_lookup_leaf(struct rb_root *tree, int prio,
 				*sp->pptr = (*sp->pptr)->rb_left;
 			if (sp > stk) {
 				sp--;
-				WARN_ON(!*sp->pptr);
-				if (!*sp->pptr)
+				if (!*sp->pptr) {
+					WARN_ON(1);
 					return NULL;
+				}
 				htb_next_rb_node(sp->pptr);
 			}
 		} else {
@@ -783,8 +784,7 @@  static struct sk_buff *htb_dequeue_tree(struct htb_sched *q, int prio,
 
 	do {
 next:
-		WARN_ON(!cl);
-		if (!cl)
+		if (unlikely(!cl))
 			return NULL;
 
 		/* class can be empty - it is unlikely but can be true if leaf