1 files changed, 35 insertions, 16 deletions

diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 214c34732e84..9be7da7c3a8f 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -50,7 +50,7 @@
  *              Patrick McHardy <kaber@trash.net>
  */
 
-#define VERSION "0.407"
+#define VERSION "0.408"
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -292,8 +292,8 @@ static inline void check_tnode(const struct tnode *tn)
 
 static int halve_threshold = 25;
 static int inflate_threshold = 50;
-static int halve_threshold_root = 15;
-static int inflate_threshold_root = 25;
+static int halve_threshold_root = 8;
+static int inflate_threshold_root = 15;
 
 
 static void __alias_free_mem(struct rcu_head *head)
@@ -350,11 +350,10 @@ static void __tnode_free_rcu(struct rcu_head *head)
 
 static inline void tnode_free(struct tnode *tn)
 {
-        if(IS_LEAF(tn)) {
+        if (IS_LEAF(tn)) {
                 struct leaf *l = (struct leaf *) tn;
                 call_rcu_bh(&l->rcu, __leaf_free_rcu);
-        }
-        else
+        } else
                 call_rcu(&tn->rcu, __tnode_free_rcu);
 }
 
@@ -459,6 +458,7 @@ static struct node *resize(struct trie *t, struct tnode *tn)
         struct tnode *old_tn;
         int inflate_threshold_use;
         int halve_threshold_use;
+        int max_resize;
 
         if (!tn)
                 return NULL;
@@ -553,13 +553,14 @@ static struct node *resize(struct trie *t, struct tnode *tn)
 
         /* Keep root node larger  */
 
-        if(!tn->parent)
+        if (!tn->parent)
                 inflate_threshold_use = inflate_threshold_root;
         else
                 inflate_threshold_use = inflate_threshold;
 
         err = 0;
-        while ((tn->full_children > 0 &&
+        max_resize = 10;
+        while ((tn->full_children > 0 &&  max_resize-- &&
                50 * (tn->full_children + tnode_child_length(tn) - tn->empty_children) >=
                                 inflate_threshold_use * tnode_child_length(tn))) {
 
@@ -574,6 +575,15 @@ static struct node *resize(struct trie *t, struct tnode *tn)
                 }
         }
 
+        if (max_resize < 0) {
+                if (!tn->parent)
+                        printk(KERN_WARNING "Fix inflate_threshold_root. Now=%d size=%d bits\n",
+                               inflate_threshold_root, tn->bits);
+                else
+                        printk(KERN_WARNING "Fix inflate_threshold. Now=%d size=%d bits\n",
+                               inflate_threshold, tn->bits);
+        }
+
         check_tnode(tn);
 
         /*
@@ -584,13 +594,14 @@ static struct node *resize(struct trie *t, struct tnode *tn)
 
         /* Keep root node larger  */
 
-        if(!tn->parent)
+        if (!tn->parent)
                 halve_threshold_use = halve_threshold_root;
         else
                 halve_threshold_use = halve_threshold;
 
         err = 0;
-        while (tn->bits > 1 &&
+        max_resize = 10;
+        while (tn->bits > 1 &&  max_resize-- &&
                100 * (tnode_child_length(tn) - tn->empty_children) <
                halve_threshold_use * tnode_child_length(tn)) {
 
@@ -605,6 +616,14 @@ static struct node *resize(struct trie *t, struct tnode *tn)
                 }
         }
 
+        if (max_resize < 0) {
+                if (!tn->parent)
+                        printk(KERN_WARNING "Fix halve_threshold_root. Now=%d size=%d bits\n",
+                               halve_threshold_root, tn->bits);
+                else
+                        printk(KERN_WARNING "Fix halve_threshold. Now=%d size=%d bits\n",
+                               halve_threshold, tn->bits);
+        }
 
         /* Only one child remains */
         if (tn->empty_children == tnode_child_length(tn) - 1)
@@ -2039,12 +2058,12 @@ static struct node *fib_trie_get_first(struct fib_trie_iter *iter,
 {
         struct node *n ;
 
-        if(!t)
+        if (!t)
                 return NULL;
 
         n = rcu_dereference(t->trie);
 
-        if(!iter)
+        if (!iter)
                 return NULL;
 
         if (n) {
@@ -2084,7 +2103,7 @@ static void trie_collect_stats(struct trie *t, struct trie_stat *s)
                         int i;
 
                         s->tnodes++;
-                        if(tn->bits < MAX_STAT_DEPTH)
+                        if (tn->bits < MAX_STAT_DEPTH)
                                 s->nodesizes[tn->bits]++;
 
                         for (i = 0; i < (1<<tn->bits); i++)
@@ -2250,7 +2269,7 @@ static inline const char *rtn_scope(enum rt_scope_t s)
 {
         static char buf[32];
 
-        switch(s) {
+        switch (s) {
         case RT_SCOPE_UNIVERSE: return "universe";
         case RT_SCOPE_SITE:     return "site";
         case RT_SCOPE_LINK:     return "link";
@@ -2340,7 +2359,7 @@ static int fib_trie_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static struct seq_operations fib_trie_seq_ops = {
+static const struct seq_operations fib_trie_seq_ops = {
         .start  = fib_trie_seq_start,
         .next   = fib_trie_seq_next,
         .stop   = fib_trie_seq_stop,
@@ -2461,7 +2480,7 @@ static int fib_route_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static struct seq_operations fib_route_seq_ops = {
+static const struct seq_operations fib_route_seq_ops = {
         .start  = fib_trie_seq_start,
         .next   = fib_trie_seq_next,
         .stop   = fib_trie_seq_stop,