Commit 7b85576d authored by Jarek Poplawski's avatar Jarek Poplawski Committed by David S. Miller

ipv4: Fix fib_trie rebalancing, part 2

My previous patch, which explicitly delays freeing of tnodes by adding
them to the list to flush them after the update is finished, isn't
strict enough. It treats exceptionally tnodes without parent, assuming
they are newly created, so "invisible" for the read side yet.

But the top tnode doesn't have parent as well, so we have to exclude
all exceptions (at least until a better way is found). Additionally we
need to move rcu assignment of this node before flushing, so the
return type of the trie_rebalance() function is changed.
Reported-by: default avatarYan Zheng <zheng.yan@oracle.com>
Signed-off-by: default avatarJarek Poplawski <jarkao2@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b9647580
...@@ -391,13 +391,8 @@ static inline void tnode_free(struct tnode *tn) ...@@ -391,13 +391,8 @@ static inline void tnode_free(struct tnode *tn)
static void tnode_free_safe(struct tnode *tn) static void tnode_free_safe(struct tnode *tn)
{ {
BUG_ON(IS_LEAF(tn)); BUG_ON(IS_LEAF(tn));
tn->tnode_free = tnode_free_head;
if (node_parent((struct node *) tn)) { tnode_free_head = tn;
tn->tnode_free = tnode_free_head;
tnode_free_head = tn;
} else {
tnode_free(tn);
}
} }
static void tnode_free_flush(void) static void tnode_free_flush(void)
...@@ -1009,7 +1004,7 @@ fib_find_node(struct trie *t, u32 key) ...@@ -1009,7 +1004,7 @@ fib_find_node(struct trie *t, u32 key)
return NULL; return NULL;
} }
static struct node *trie_rebalance(struct trie *t, struct tnode *tn) static void trie_rebalance(struct trie *t, struct tnode *tn)
{ {
int wasfull; int wasfull;
t_key cindex, key; t_key cindex, key;
...@@ -1033,12 +1028,13 @@ static struct node *trie_rebalance(struct trie *t, struct tnode *tn) ...@@ -1033,12 +1028,13 @@ static struct node *trie_rebalance(struct trie *t, struct tnode *tn)
} }
/* Handle last (top) tnode */ /* Handle last (top) tnode */
if (IS_TNODE(tn)) { if (IS_TNODE(tn))
tn = (struct tnode *)resize(t, (struct tnode *)tn); tn = (struct tnode *)resize(t, (struct tnode *)tn);
tnode_free_flush();
}
return (struct node *)tn; rcu_assign_pointer(t->trie, (struct node *)tn);
tnode_free_flush();
return;
} }
/* only used from updater-side */ /* only used from updater-side */
...@@ -1186,7 +1182,7 @@ static struct list_head *fib_insert_node(struct trie *t, u32 key, int plen) ...@@ -1186,7 +1182,7 @@ static struct list_head *fib_insert_node(struct trie *t, u32 key, int plen)
/* Rebalance the trie */ /* Rebalance the trie */
rcu_assign_pointer(t->trie, trie_rebalance(t, tp)); trie_rebalance(t, tp);
done: done:
return fa_head; return fa_head;
} }
...@@ -1605,7 +1601,7 @@ static void trie_leaf_remove(struct trie *t, struct leaf *l) ...@@ -1605,7 +1601,7 @@ static void trie_leaf_remove(struct trie *t, struct leaf *l)
if (tp) { if (tp) {
t_key cindex = tkey_extract_bits(l->key, tp->pos, tp->bits); t_key cindex = tkey_extract_bits(l->key, tp->pos, tp->bits);
put_child(t, (struct tnode *)tp, cindex, NULL); put_child(t, (struct tnode *)tp, cindex, NULL);
rcu_assign_pointer(t->trie, trie_rebalance(t, tp)); trie_rebalance(t, tp);
} else } else
rcu_assign_pointer(t->trie, NULL); rcu_assign_pointer(t->trie, NULL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment