mirror/labs-bird
1
0
Fork 0
mirror of https://gitlab.labs.nic.cz/labs/bird.git synced 2024-05-11 16:54:54 +00:00
Code Releases Activity

Nest: Implement prefix trie pruning

Browse Source 
When rtable is pruned and network fib nodes are removed, we also need to
prune prefix trie. Unfortunately, rebuilding prefix trie takes long time
(got about 400 ms for 1M networks), so must not be atomic, we have to
rebuild a new trie while current one is still active. That may require
some considerable amount of temporary memory, so we do that only if
we expect significant trie size reduction.
This commit is contained in:
Ondrej Zajicek (work)
2022-02-03 06:08:51 +01:00
parent ba5aec94cd
commit de6318f70a
2 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
nest/rt-table.c
View File

@@ -134,6 +134,9 @@ net_init_with_trie(struct fib *f, void *N)
if (tab->trie)
trie_add_prefix(tab->trie, n->n.addr, n->n.addr->pxlen, n->n.addr->pxlen);
if (tab->trie_new)
trie_add_prefix(tab->trie_new, n->n.addr, n->n.addr->pxlen, n->n.addr->pxlen);
}
static inline net *
@@ -2399,6 +2402,13 @@ rt_prune_table(rtable *tab)
FIB_ITERATE_INIT(fit, &tab->fib);
tab->prune_state = 2;
if (tab->prune_trie)
{
/* Init prefix trie pruning */
tab->trie_new = f_new_trie(lp_new_default(tab->rp), 0);
tab->trie_new->ipv4 = tab->trie->ipv4;
}
}
again:
@@ -2407,17 +2417,17 @@ again:
rte *e;
rescan:
if (limit <= 0)
{
FIB_ITERATE_PUT(fit);
ev_schedule(tab->rt_event);
return;
}
for (e=n->routes; e; e=e->next)
{
if (e->sender->flush_active || (e->flags & REF_DISCARD))
{
if (limit <= 0)
{
FIB_ITERATE_PUT(fit);
ev_schedule(tab->rt_event);
return;
}
rte_discard(e);
limit--;
@@ -2426,13 +2436,6 @@ again:
if (e->flags & REF_MODIFY)
{
if (limit <= 0)
{
FIB_ITERATE_PUT(fit);
ev_schedule(tab->rt_event);
return;
}
rte_modify(e);
limit--;
@@ -2446,6 +2449,12 @@ again:
fib_delete(&tab->fib, n);
goto again;
}
if (tab->trie_new)
{
trie_add_prefix(tab->trie_new, n->n.addr, n->n.addr->pxlen, n->n.addr->pxlen);
limit--;
}
}
FIB_ITERATE_END;
@@ -2459,6 +2468,25 @@ again:
/* state change 2->0, 3->1 */
tab->prune_state &= 1;
if (tab->trie_new)
{
/* Finish prefix trie pruning */
rfree(tab->trie->lp);
tab->trie = tab->trie_new;
tab->trie_new = NULL;
tab->prune_trie = 0;
}
else
{
/* Schedule prefix trie pruning */
if (tab->trie && (tab->trie->prefix_count > (2 * tab->fib.entries)))
{
/* state change 0->1, 2->3 */
tab->prune_state |= 1;
tab->prune_trie = 1;
}
}
if (tab->prune_state > 0)
ev_schedule(tab->rt_event);