[IPV4] fib_trie: macro cleanup

[linux-2.6-omap-h63xx.git] / net / ipv4 / fib_trie.c

diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 9be7da7c3a8fa8ed474031e2375aa53586d81f12..52b2891c63b7b6e28637369007a5758cc3bfe390 100644 (file)
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -85,23 +85,14 @@
 #define MAX_STAT_DEPTH 32
 
 #define KEYLENGTH (8*sizeof(t_key))
-#define MASK_PFX(k, l) (((l)==0)?0:(k >> (KEYLENGTH-l)) << (KEYLENGTH-l))
-#define TKEY_GET_MASK(offset, bits) (((bits)==0)?0:((t_key)(-1) << (KEYLENGTH - bits) >> offset))
 
 typedef unsigned int t_key;
 
 #define T_TNODE 0
 #define T_LEAF  1
 #define NODE_TYPE_MASK 0x1UL
-#define NODE_PARENT(node) \
-       ((struct tnode *)rcu_dereference(((node)->parent & ~NODE_TYPE_MASK)))
-
 #define NODE_TYPE(node) ((node)->parent & NODE_TYPE_MASK)
 
-#define NODE_SET_PARENT(node, ptr)             \
-       rcu_assign_pointer((node)->parent,      \
-                          ((unsigned long)(ptr)) | NODE_TYPE(node))
-
 #define IS_TNODE(n) (!(n->parent & T_LEAF))
 #define IS_LEAF(n) (n->parent & T_LEAF)
 
@@ -174,6 +165,19 @@ static void tnode_free(struct tnode *tn);
 static struct kmem_cache *fn_alias_kmem __read_mostly;
 static struct trie *trie_local = NULL, *trie_main = NULL;
 
+static inline struct tnode *node_parent(struct node *node)
+{
+       struct tnode *ret;
+
+       ret = (struct tnode *)(node->parent & ~NODE_TYPE_MASK);
+       return rcu_dereference(ret);
+}
+
+static inline void node_set_parent(struct node *node, struct tnode *ptr)
+{
+       rcu_assign_pointer(node->parent,
+                          (unsigned long)ptr | NODE_TYPE(node));
+}
 
 /* rcu_read_lock needs to be hold by caller from readside */
 
@@ -189,6 +193,11 @@ static inline int tnode_child_length(const struct tnode *tn)
        return 1 << tn->bits;
 }
 
+static inline t_key mask_pfx(t_key k, unsigned short l)
+{
+       return (l == 0) ? 0 : k >> (KEYLENGTH-l) << (KEYLENGTH-l);
+}
+
 static inline t_key tkey_extract_bits(t_key a, int offset, int bits)
 {
        if (offset < KEYLENGTH)
@@ -446,7 +455,7 @@ static void tnode_put_child_reorg(struct tnode *tn, int i, struct node *n, int w
                tn->full_children++;
 
        if (n)
-               NODE_SET_PARENT(n, tn);
+               node_set_parent(n, tn);
 
        rcu_assign_pointer(tn->child[i], n);
 }
@@ -481,7 +490,7 @@ static struct node *resize(struct trie *t, struct tnode *tn)
                                continue;
 
                        /* compress one level */
-                       NODE_SET_PARENT(n, NULL);
+                       node_set_parent(n, NULL);
                        tnode_free(tn);
                        return n;
                }
@@ -636,7 +645,7 @@ static struct node *resize(struct trie *t, struct tnode *tn)
 
                        /* compress one level */
 
-                       NODE_SET_PARENT(n, NULL);
+                       node_set_parent(n, NULL);
                        tnode_free(tn);
                        return n;
                }
@@ -673,7 +682,7 @@ static struct tnode *inflate(struct trie *t, struct tnode *tn)
                    inode->pos == oldtnode->pos + oldtnode->bits &&
                    inode->bits > 1) {
                        struct tnode *left, *right;
-                       t_key m = TKEY_GET_MASK(inode->pos, 1);
+                       t_key m = ~0U << (KEYLENGTH - 1) >> inode->pos;
 
                        left = tnode_new(inode->key&(~m), inode->pos + 1,
                                         inode->bits - 1);
@@ -961,24 +970,21 @@ fib_find_node(struct trie *t, u32 key)
 static struct node *trie_rebalance(struct trie *t, struct tnode *tn)
 {
        int wasfull;
-       t_key cindex, key;
-       struct tnode *tp = NULL;
+       t_key cindex, key = tn->key;
+       struct tnode *tp;
 
-       key = tn->key;
-
-       while (tn != NULL && NODE_PARENT(tn) != NULL) {
-
-               tp = NODE_PARENT(tn);
+       while (tn != NULL && (tp = node_parent((struct node *)tn)) != NULL) {
                cindex = tkey_extract_bits(key, tp->pos, tp->bits);
                wasfull = tnode_full(tp, tnode_get_child(tp, cindex));
                tn = (struct tnode *) resize (t, (struct tnode *)tn);
                tnode_put_child_reorg((struct tnode *)tp, cindex,(struct node*)tn, wasfull);
 
-               if (!NODE_PARENT(tn))
+               tp = node_parent((struct node *) tn);
+               if (!tp)
                        break;
-
-               tn = NODE_PARENT(tn);
+               tn = tp;
        }
+
        /* Handle last (top) tnode */
        if (IS_TNODE(tn))
                tn = (struct tnode*) resize(t, (struct tnode *)tn);
@@ -1031,7 +1037,7 @@ fib_insert_node(struct trie *t, int *err, u32 key, int plen)
                        pos = tn->pos + tn->bits;
                        n = tnode_get_child(tn, tkey_extract_bits(key, tn->pos, tn->bits));
 
-                       BUG_ON(n && NODE_PARENT(n) != tn);
+                       BUG_ON(n && node_parent(n) != tn);
                } else
                        break;
        }
@@ -1083,7 +1089,7 @@ fib_insert_node(struct trie *t, int *err, u32 key, int plen)
        if (t->trie && n == NULL) {
                /* Case 2: n is NULL, and will just insert a new leaf */
 
-               NODE_SET_PARENT(l, tp);
+               node_set_parent((struct node *)l, tp);
 
                cindex = tkey_extract_bits(key, tp->pos, tp->bits);
                put_child(t, (struct tnode *)tp, cindex, (struct node *)l);
@@ -1114,7 +1120,7 @@ fib_insert_node(struct trie *t, int *err, u32 key, int plen)
                        goto err;
                }
 
-               NODE_SET_PARENT(tn, tp);
+               node_set_parent((struct node *)tn, tp);
 
                missbit = tkey_extract_bits(key, newpos, 1);
                put_child(t, tn, missbit, (struct node *)l);
@@ -1226,6 +1232,8 @@ static int fn_trie_insert(struct fib_table *tb, struct fib_config *cfg)
                        fib_release_info(fi_drop);
                        if (state & FA_S_ACCESSED)
                                rt_cache_flush(-1);
+                       rtmsg_fib(RTM_NEWROUTE, htonl(key), new_fa, plen,
+                               tb->tb_id, &cfg->fc_nlinfo, NLM_F_REPLACE);
 
                        goto succeeded;
                }
@@ -1278,7 +1286,7 @@ static int fn_trie_insert(struct fib_table *tb, struct fib_config *cfg)
 
        rt_cache_flush(-1);
        rtmsg_fib(RTM_NEWROUTE, htonl(key), new_fa, plen, tb->tb_id,
-                 &cfg->fc_nlinfo);
+                 &cfg->fc_nlinfo, 0);
 succeeded:
        return 0;
 
@@ -1362,7 +1370,8 @@ fn_trie_lookup(struct fib_table *tb, const struct flowi *flp, struct fib_result
                bits = pn->bits;
 
                if (!chopped_off)
-                       cindex = tkey_extract_bits(MASK_PFX(key, current_prefix_length), pos, bits);
+                       cindex = tkey_extract_bits(mask_pfx(key, current_prefix_length),
+                                                  pos, bits);
 
                n = tnode_get_child(pn, cindex);
 
@@ -1448,8 +1457,8 @@ fn_trie_lookup(struct fib_table *tb, const struct flowi *flp, struct fib_result
                 * to find a matching prefix.
                 */
 
-               node_prefix = MASK_PFX(cn->key, cn->pos);
-               key_prefix = MASK_PFX(key, cn->pos);
+               node_prefix = mask_pfx(cn->key, cn->pos);
+               key_prefix = mask_pfx(key, cn->pos);
                pref_mismatch = key_prefix^node_prefix;
                mp = 0;
 
@@ -1493,12 +1502,13 @@ backtrace:
                if (chopped_off <= pn->bits) {
                        cindex &= ~(1 << (chopped_off-1));
                } else {
-                       if (NODE_PARENT(pn) == NULL)
+                       struct tnode *parent = node_parent((struct node *) pn);
+                       if (!parent)
                                goto failed;
 
                        /* Get Child's index */
-                       cindex = tkey_extract_bits(pn->key, NODE_PARENT(pn)->pos, NODE_PARENT(pn)->bits);
-                       pn = NODE_PARENT(pn);
+                       cindex = tkey_extract_bits(pn->key, parent->pos, parent->bits);
+                       pn = parent;
                        chopped_off = 0;
 
 #ifdef CONFIG_IP_FIB_TRIE_STATS
@@ -1534,7 +1544,7 @@ static int trie_leaf_remove(struct trie *t, t_key key)
                check_tnode(tn);
                n = tnode_get_child(tn ,tkey_extract_bits(key, tn->pos, tn->bits));
 
-               BUG_ON(n && NODE_PARENT(n) != tn);
+               BUG_ON(n && node_parent(n) != tn);
        }
        l = (struct leaf *) n;
 
@@ -1549,7 +1559,7 @@ static int trie_leaf_remove(struct trie *t, t_key key)
        t->revision++;
        t->size--;
 
-       tp = NODE_PARENT(n);
+       tp = node_parent(n);
        tnode_free((struct tnode *) n);
 
        if (tp) {
@@ -1624,7 +1634,7 @@ static int fn_trie_delete(struct fib_table *tb, struct fib_config *cfg)
 
        fa = fa_to_delete;
        rtmsg_fib(RTM_DELROUTE, htonl(key), fa, plen, tb->tb_id,
-                 &cfg->fc_nlinfo);
+                 &cfg->fc_nlinfo, 0);
 
        l = fib_find_node(t, key);
        li = find_leaf_info(l, plen);
@@ -1701,7 +1711,7 @@ static struct leaf *nextleaf(struct trie *t, struct leaf *thisleaf)
 
                p = (struct tnode*) trie;  /* Start */
        } else
-               p = (struct tnode *) NODE_PARENT(c);
+               p = node_parent(c);
 
        while (p) {
                int pos, last;
@@ -1738,7 +1748,7 @@ static struct leaf *nextleaf(struct trie *t, struct leaf *thisleaf)
 up:
                /* No more children go up one step  */
                c = (struct node *) p;
-               p = (struct tnode *) NODE_PARENT(p);
+               p = node_parent(c);
        }
        return NULL; /* Ready. Root of trie */
 }
@@ -1968,7 +1978,7 @@ struct fib_table * __init fib_hash_init(u32 id)
                fn_alias_kmem = kmem_cache_create("ip_fib_alias",
                                                  sizeof(struct fib_alias),
                                                  0, SLAB_HWCACHE_ALIGN,
-                                                 NULL, NULL);
+                                                 NULL);
 
        tb = kmalloc(sizeof(struct fib_table) + sizeof(struct trie),
                     GFP_KERNEL);
@@ -2041,7 +2051,7 @@ rescan:
        }
 
        /* Current node exhausted, pop back up */
-       p = NODE_PARENT(tn);
+       p = node_parent((struct node *)tn);
        if (p) {
                cindex = tkey_extract_bits(tn->key, p->pos, p->bits)+1;
                tn = p;
@@ -2315,7 +2325,7 @@ static int fib_trie_seq_show(struct seq_file *seq, void *v)
        if (v == SEQ_START_TOKEN)
                return 0;
 
-       if (!NODE_PARENT(n)) {
+       if (!node_parent(n)) {
                if (iter->trie == trie_local)
                        seq_puts(seq, "<local>:\n");
                else
@@ -2324,7 +2334,7 @@ static int fib_trie_seq_show(struct seq_file *seq, void *v)
 
        if (IS_TNODE(n)) {
                struct tnode *tn = (struct tnode *) n;
-               __be32 prf = htonl(MASK_PFX(tn->key, tn->pos));
+               __be32 prf = htonl(mask_pfx(tn->key, tn->pos));
 
                seq_indent(seq, iter->depth-1);
                seq_printf(seq, "  +-- %d.%d.%d.%d/%d %d %d %d\n",