IPv4: thresholds in fib_trie.c are not modified, make them const

PATCH In review Denis V. Lunev 3 participants 3 messages Dec 12, 2007 – Dec 13, 2007

Subsystems (3)

Networking Network drivers IPv4/IPv6

lore

Share & tools

lore

Denis V. Lunev

author

2007-12-12 11:05 UTC #0 lore raw

PATCH 1/1 IPv4: thresholds in fib_trie.c are not modified, make them const

IPv4: thresholds in fib_trie.c are not modified, make them const

Signed-off-by Denis V. Lunev <[email protected]>

net/ipv4/fib_trie.c +4 -4

index 45a6e4d..57a2c46 100644
@@ -299,10 +299,10 @@ static inline void check_tnode(const struct tnode *tn)
 	WARN_ON(tn && tn->pos+tn->bits > 32);
 }
 
-static int halve_threshold = 25;
-static int inflate_threshold = 50;
-static int halve_threshold_root = 15;
-static int inflate_threshold_root = 25;
+static const int halve_threshold = 25;
+static const int inflate_threshold = 50;
+static const int halve_threshold_root = 15;
+static const int inflate_threshold_root = 25;
 
 static void __alias_free_mem(struct rcu_head *head)
 {

The threshold for root node can be more aggressive set to get better tree compression. The new setting mekes the root grow from 16 to 19 bits and substansial improvemnt in Aver depth this with the current table of 214393 prefixes

But really the dynamic resize should need more investigation both in terms convergence and performance and maybe it should be possible to change...

Maybe just for the brave to start with or we may have to back this out.

Please don't waste my time like this. Always submit patches against the current tree, even if you "think" the files you are patching haven't changed.

Denis V. Lunev

2007-12-13 07:31 UTC #2 lore raw

Quoted 10 lines · David Miller

From: "Denis V. Lunev" <[email protected]>
Date: Wed, 12 Dec 2007 14:05:55 +0300
net/ipv4/fib_trie.c static inline void check_tnode(const struct tnode *tn) · line 305
Quoted 4 lines
net/ipv4/fib_trie.c +0 -4
-static int halve_threshold = 25;
-static int inflate_threshold = 50;
-static int halve_threshold_root = 15;
-static int inflate_threshold_root = 25;
halve_threshold_root and inflate_threshold_root have different values in the net-2.6.25 tree.

oops. this was accidentally changed during porting of the code from the one old tree and committed by mistake. I'll resend correct patch in a minute

Quoted 3 lines

What tree are you patching against? These were changed way back in: