proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-16 15:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: Convert prefix_master->str to a RB Tree

Browse Source 
The prefix_master->str data structure was a sorted
list of the prefix names.  Not that big of a deal
other than insertion and deletion is insanely expensive
when you have a large number of unique prefix-lists.

In my test config file that I discovered this,
I have 587 unique prefix lists spread out acros
~26k lines of prefix-lists.  When reading
this config file into FRR the read time goes
from 690 seconds to 650 seconds.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2022-03-08 20:52:45 -05:00
parent 89ee4bbb21
commit e92508a741
2 changed files with 37 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
lib/plist.c
View File

@ -31,6 +31,7 @@
#include "lib/json.h" #include "lib/json.h"
#include "libfrr.h" #include "libfrr.h"
#include <typesafe.h>
#include "plist_int.h" #include "plist_int.h"
DEFINE_MTYPE_STATIC(LIB, PREFIX_LIST, "Prefix List"); DEFINE_MTYPE_STATIC(LIB, PREFIX_LIST, "Prefix List");
@ -58,17 +59,8 @@ struct pltrie_table {
struct pltrie_entry entries[PLC_LEN]; struct pltrie_entry entries[PLC_LEN];
}; };
/* List of struct prefix_list. */
struct prefix_list_list {
struct prefix_list *head;
struct prefix_list *tail;
};
/* Master structure of prefix_list. */ /* Master structure of prefix_list. */
struct prefix_master { struct prefix_master {
/* List of prefix_list which name is string. */
struct prefix_list_list str;
/* The latest update. */ /* The latest update. */
struct prefix_list *recent; struct prefix_list *recent;
@ -80,26 +72,32 @@ struct prefix_master {
/* number of bytes that have a trie level */ /* number of bytes that have a trie level */
size_t trie_depth; size_t trie_depth;
struct plist_head str;
}; };
static int prefix_list_compare_func(const struct prefix_list *a,
const struct prefix_list *b);
DECLARE_RBTREE_UNIQ(plist, struct prefix_list, plist_item,
prefix_list_compare_func);
/* Static structure of IPv4 prefix_list's master. */ /* Static structure of IPv4 prefix_list's master. */
static struct prefix_master prefix_master_ipv4 = { static struct prefix_master prefix_master_ipv4 = {
{NULL, NULL}, NULL, NULL, NULL, PLC_MAXLEVELV4, NULL, NULL, NULL, PLC_MAXLEVELV4,
}; };
/* Static structure of IPv6 prefix-list's master. */ /* Static structure of IPv6 prefix-list's master. */
static struct prefix_master prefix_master_ipv6 = { static struct prefix_master prefix_master_ipv6 = {
{NULL, NULL}, NULL, NULL, NULL, PLC_MAXLEVELV6, NULL, NULL, NULL, PLC_MAXLEVELV6,
}; };
/* Static structure of BGP ORF prefix_list's master. */ /* Static structure of BGP ORF prefix_list's master. */
static struct prefix_master prefix_master_orf_v4 = { static struct prefix_master prefix_master_orf_v4 = {
{NULL, NULL}, NULL, NULL, NULL, PLC_MAXLEVELV4, NULL, NULL, NULL, PLC_MAXLEVELV4,
}; };
/* Static structure of BGP ORF prefix_list's master. */ /* Static structure of BGP ORF prefix_list's master. */
static struct prefix_master prefix_master_orf_v6 = { static struct prefix_master prefix_master_orf_v6 = {
{NULL, NULL}, NULL, NULL, NULL, PLC_MAXLEVELV6, NULL, NULL, NULL, PLC_MAXLEVELV6,
}; };
static struct prefix_master *prefix_master_get(afi_t afi, int orf) static struct prefix_master *prefix_master_get(afi_t afi, int orf)
@ -124,11 +122,17 @@ afi_t prefix_list_afi(struct prefix_list *plist)
return AFI_IP6; return AFI_IP6;
} }
static int prefix_list_compare_func(const struct prefix_list *a,
const struct prefix_list *b)
{
return strcmp(a->name, b->name);
}
/* Lookup prefix_list from list of prefix_list by name. */ /* Lookup prefix_list from list of prefix_list by name. */
static struct prefix_list *prefix_list_lookup_do(afi_t afi, int orf, static struct prefix_list *prefix_list_lookup_do(afi_t afi, int orf,
const char *name) const char *name)
{ {
struct prefix_list *plist; struct prefix_list *plist, lookup;
struct prefix_master *master; struct prefix_master *master;
if (name == NULL) if (name == NULL)
@ -138,11 +142,10 @@ static struct prefix_list *prefix_list_lookup_do(afi_t afi, int orf,
if (master == NULL) if (master == NULL)
return NULL; return NULL;
for (plist = master->str.head; plist; plist = plist->next) lookup.name = XSTRDUP(MTYPE_TMP, name);
if (strcmp(plist->name, name) == 0) plist = plist_find(&master->str, &lookup);
return plist; XFREE(MTYPE_TMP, lookup.name);
return plist;
return NULL;
} }
struct prefix_list *prefix_list_lookup(afi_t afi, const char *name) struct prefix_list *prefix_list_lookup(afi_t afi, const char *name)
@ -188,8 +191,6 @@ static struct prefix_list *prefix_list_insert(afi_t afi, int orf,
const char *name) const char *name)
{ {
struct prefix_list *plist; struct prefix_list *plist;
struct prefix_list *point;
struct prefix_list_list *list;
struct prefix_master *master; struct prefix_master *master;
master = prefix_master_get(afi, orf); master = prefix_master_get(afi, orf);
@ -203,43 +204,7 @@ static struct prefix_list *prefix_list_insert(afi_t afi, int orf,
plist->trie = plist->trie =
XCALLOC(MTYPE_PREFIX_LIST_TRIE, sizeof(struct pltrie_table)); XCALLOC(MTYPE_PREFIX_LIST_TRIE, sizeof(struct pltrie_table));
/* Set prefix_list to string list. */ plist_add(&master->str, plist);
list = &master->str;
/* Set point to insertion point. */
for (point = list->head; point; point = point->next)
if (strcmp(point->name, name) >= 0)
break;
/* In case of this is the first element of master. */
if (list->head == NULL) {
list->head = list->tail = plist;
return plist;
}
/* In case of insertion is made at the tail of access_list. */
if (point == NULL) {
plist->prev = list->tail;
list->tail->next = plist;
list->tail = plist;
return plist;
}
/* In case of insertion is made at the head of access_list. */
if (point == list->head) {
plist->next = list->head;
list->head->prev = plist;
list->head = plist;
return plist;
}
/* Insertion is made at middle of the access_list. */
plist->next = point;
plist->prev = point->prev;
if (point->prev)
point->prev->next = plist;
point->prev = plist;
return plist; return plist;
} }
@ -261,7 +226,6 @@ static void prefix_list_trie_del(struct prefix_list *plist,
/* Delete prefix-list from prefix_list_master and free it. */ /* Delete prefix-list from prefix_list_master and free it. */
void prefix_list_delete(struct prefix_list *plist) void prefix_list_delete(struct prefix_list *plist)
{ {
struct prefix_list_list *list;
struct prefix_master *master; struct prefix_master *master;
struct prefix_list_entry *pentry; struct prefix_list_entry *pentry;
struct prefix_list_entry *next; struct prefix_list_entry *next;
@ -278,17 +242,7 @@ void prefix_list_delete(struct prefix_list *plist)
master = plist->master; master = plist->master;
list = &master->str; plist_del(&master->str, plist);
if (plist->next)
plist->next->prev = plist->prev;
else
list->tail = plist->prev;
if (plist->prev)
plist->prev->next = plist->next;
else
list->head = plist->next;
XFREE(MTYPE_TMP, plist->desc); XFREE(MTYPE_TMP, plist->desc);
@ -1120,7 +1074,7 @@ static int vty_show_prefix_list(struct vty *vty, afi_t afi, const char *name,
master->recent->name); master->recent->name);
} }
for (plist = master->str.head; plist; plist = plist->next) frr_each (plist, &master->str, plist)
vty_show_prefix_entry(vty, json_proto, afi, plist, vty_show_prefix_entry(vty, json_proto, afi, plist,
master, dtype, seqnum); master, dtype, seqnum);
} }
@ -1208,7 +1162,7 @@ static int vty_clear_prefix_list(struct vty *vty, afi_t afi, const char *name,
return CMD_WARNING; return CMD_WARNING;
if (name == NULL && prefix == NULL) { if (name == NULL && prefix == NULL) {
for (plist = master->str.head; plist; plist = plist->next) frr_each (plist, &master->str, plist)
for (pentry = plist->head; pentry; for (pentry = plist->head; pentry;
pentry = pentry->next) pentry = pentry->next)
pentry->hitcnt = 0; pentry->hitcnt = 0;
@ -1608,20 +1562,14 @@ int prefix_bgp_show_prefix_list(struct vty *vty, afi_t afi, char *name,
static void prefix_list_reset_afi(afi_t afi, int orf) static void prefix_list_reset_afi(afi_t afi, int orf)
{ {
struct prefix_list *plist; struct prefix_list *plist;
struct prefix_list *next;
struct prefix_master *master; struct prefix_master *master;
master = prefix_master_get(afi, orf); master = prefix_master_get(afi, orf);
if (master == NULL) if (master == NULL)
return; return;
for (plist = master->str.head; plist; plist = next) { while ((plist = plist_pop(&master->str)))
next = plist->next;
prefix_list_delete(plist); prefix_list_delete(plist);
}
assert(master->str.head == NULL);
assert(master->str.tail == NULL);
master->recent = NULL; master->recent = NULL;
} }
@ -1643,7 +1591,7 @@ static void plist_autocomplete_afi(afi_t afi, vector comps,
if (master == NULL) if (master == NULL)
return; return;
for (plist = master->str.head; plist; plist = plist->next) frr_each (plist, &master->str, plist)
vector_set(comps, XSTRDUP(MTYPE_COMPLETION, plist->name)); vector_set(comps, XSTRDUP(MTYPE_COMPLETION, plist->name));
} }
@ -1696,6 +1644,11 @@ static void prefix_list_init_ipv6(void)
void prefix_list_init(void) void prefix_list_init(void)
{ {
plist_init(&prefix_master_ipv4.str);
plist_init(&prefix_master_orf_v4.str);
plist_init(&prefix_master_ipv6.str);
plist_init(&prefix_master_orf_v6.str);
cmd_variable_handler_register(plist_var_handlers); cmd_variable_handler_register(plist_var_handlers);
prefix_list_init_ipv4(); prefix_list_init_ipv4();

7
lib/plist_int.h
View File

@ -28,6 +28,8 @@ extern "C" {
struct pltrie_table; struct pltrie_table;
PREDECL_RBTREE_UNIQ(plist);
struct prefix_list { struct prefix_list {
char *name; char *name;
char *desc; char *desc;
@ -37,13 +39,12 @@ struct prefix_list {
int count; int count;
int rangecount; int rangecount;
struct plist_item plist_item;
struct prefix_list_entry *head; struct prefix_list_entry *head;
struct prefix_list_entry *tail; struct prefix_list_entry *tail;
struct pltrie_table *trie; struct pltrie_table *trie;
struct prefix_list *next;
struct prefix_list *prev;
}; };
/* Each prefix-list's entry. */ /* Each prefix-list's entry. */