proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-19 16:34:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11774 from donaldsharp/zebra_meta_q_shakeups

Browse Source 
Zebra meta q shakeups
This commit is contained in:
Donatas Abraitis 2022-08-10 16:32:12 +03:00 committed by GitHub
commit 03efa836c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 194 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zebra/rib.h
View File

@ -454,9 +454,7 @@ int zebra_rib_queue_evpn_rem_vtep_add(vrf_id_t vrf_id, vni_t vni,
int zebra_rib_queue_evpn_rem_vtep_del(vrf_id_t vrf_id, vni_t vni, int zebra_rib_queue_evpn_rem_vtep_del(vrf_id_t vrf_id, vni_t vni,
struct in_addr vtep_ip); struct in_addr vtep_ip);
extern void meta_queue_free(struct meta_queue *mq); extern void meta_queue_free(struct meta_queue *mq, struct zebra_vrf *zvrf);
extern void rib_meta_queue_free_vrf(struct meta_queue *mq,
struct zebra_vrf *zvrf);
extern int zebra_rib_labeled_unicast(struct route_entry *re); extern int zebra_rib_labeled_unicast(struct route_entry *re);
extern struct route_table *rib_table_ipv6; extern struct route_table *rib_table_ipv6;

16
zebra/zapi_msg.c
View File

@ -2492,7 +2492,6 @@ static void zread_mpls_labels_add(ZAPI_HANDLER_ARGS)
{ {
struct stream *s; struct stream *s;
struct zapi_labels zl; struct zapi_labels zl;
int ret;
/* Get input stream. */ /* Get input stream. */
s = msg; s = msg;
@ -2510,12 +2509,7 @@ static void zread_mpls_labels_add(ZAPI_HANDLER_ARGS)
if (zapi_labels_validate(&zl) < 0) if (zapi_labels_validate(&zl) < 0)
return; return;
ret = mpls_zapi_labels_process(true, zvrf, &zl); mpls_zapi_labels_process(true, zvrf, &zl);
if (ret < 0) {
if (IS_ZEBRA_DEBUG_RECV)
zlog_debug("%s: Error processing zapi request",
__func__);
}
} }
/* /*
@ -2532,7 +2526,6 @@ static void zread_mpls_labels_delete(ZAPI_HANDLER_ARGS)
{ {
struct stream *s; struct stream *s;
struct zapi_labels zl; struct zapi_labels zl;
int ret;
/* Get input stream. */ /* Get input stream. */
s = msg; s = msg;
@ -2547,12 +2540,7 @@ static void zread_mpls_labels_delete(ZAPI_HANDLER_ARGS)
return; return;
if (zl.nexthop_num > 0) { if (zl.nexthop_num > 0) {
ret = mpls_zapi_labels_process(false /*delete*/, zvrf, &zl); mpls_zapi_labels_process(false /*delete*/, zvrf, &zl);
if (ret < 0) {
if (IS_ZEBRA_DEBUG_RECV)
zlog_debug("%s: Error processing zapi request",
__func__);
}
} else { } else {
mpls_lsp_uninstall_all_vrf(zvrf, zl.type, zl.local_label); mpls_lsp_uninstall_all_vrf(zvrf, zl.type, zl.local_label);

14
zebra/zebra_mpls.c
View File

@ -2747,7 +2747,7 @@ static bool ftn_update_nexthop(bool add_p, struct nexthop *nexthop,
return true; return true;
} }
int mpls_ftn_uninstall(struct zebra_vrf *zvrf, enum lsp_types_t type, void mpls_ftn_uninstall(struct zebra_vrf *zvrf, enum lsp_types_t type,
struct prefix *prefix, uint8_t route_type, struct prefix *prefix, uint8_t route_type,
unsigned short route_instance) unsigned short route_instance)
{ {
@ -2761,7 +2761,7 @@ int mpls_ftn_uninstall(struct zebra_vrf *zvrf, enum lsp_types_t type,
/* Lookup table. */ /* Lookup table. */
table = zebra_vrf_table(afi, SAFI_UNICAST, zvrf_id(zvrf)); table = zebra_vrf_table(afi, SAFI_UNICAST, zvrf_id(zvrf));
if (!table) if (!table)
return -1; return;
/* Lookup existing route */ /* Lookup existing route */
rn = route_node_get(table, prefix); rn = route_node_get(table, prefix);
@ -2772,7 +2772,7 @@ int mpls_ftn_uninstall(struct zebra_vrf *zvrf, enum lsp_types_t type,
break; break;
} }
if (re == NULL) if (re == NULL)
return -1; return;
/* /*
* Nexthops are now shared by multiple routes, so we have to make * Nexthops are now shared by multiple routes, so we have to make
@ -2801,8 +2801,6 @@ int mpls_ftn_uninstall(struct zebra_vrf *zvrf, enum lsp_types_t type,
zebra_nhg_free(new_nhe); zebra_nhg_free(new_nhe);
rib_queue_add(rn); rib_queue_add(rn);
return 0;
} }
/* /*
@ -2884,7 +2882,7 @@ static bool ftn_update_znh(bool add_p, enum lsp_types_t type,
* There are several changes that need to be made, in several zebra * There are several changes that need to be made, in several zebra
* data structures, so we want to do all the work required at once. * data structures, so we want to do all the work required at once.
*/ */
int mpls_zapi_labels_process(bool add_p, struct zebra_vrf *zvrf, void mpls_zapi_labels_process(bool add_p, struct zebra_vrf *zvrf,
const struct zapi_labels *zl) const struct zapi_labels *zl)
{ {
int i, counter, ret = 0; int i, counter, ret = 0;
@ -2906,7 +2904,7 @@ int mpls_zapi_labels_process(bool add_p, struct zebra_vrf *zvrf,
/* Lookup table. */ /* Lookup table. */
lsp_table = zvrf->lsp_table; lsp_table = zvrf->lsp_table;
if (!lsp_table) if (!lsp_table)
return -1; return;
/* Find or create LSP object */ /* Find or create LSP object */
tmp_ile.in_label = zl->local_label; tmp_ile.in_label = zl->local_label;
@ -3070,8 +3068,6 @@ znh_done:
if (new_nhe) if (new_nhe)
zebra_nhg_free(new_nhe); zebra_nhg_free(new_nhe);
return ret;
} }
/* /*

4
zebra/zebra_mpls.h
View File

@ -261,13 +261,13 @@ void zebra_mpls_print_fec(struct vty *vty, struct zebra_vrf *zvrf,
* Handle zapi request to install/uninstall LSP and * Handle zapi request to install/uninstall LSP and
* (optionally) FEC-To-NHLFE (FTN) bindings. * (optionally) FEC-To-NHLFE (FTN) bindings.
*/ */
int mpls_zapi_labels_process(bool add_p, struct zebra_vrf *zvrf, void mpls_zapi_labels_process(bool add_p, struct zebra_vrf *zvrf,
const struct zapi_labels *zl); const struct zapi_labels *zl);
/* /*
* Uninstall all NHLFEs bound to a single FEC. * Uninstall all NHLFEs bound to a single FEC.
*/ */
int mpls_ftn_uninstall(struct zebra_vrf *zvrf, enum lsp_types_t type, void mpls_ftn_uninstall(struct zebra_vrf *zvrf, enum lsp_types_t type,
struct prefix *prefix, uint8_t route_type, struct prefix *prefix, uint8_t route_type,
unsigned short route_instance); unsigned short route_instance);

314
zebra/zebra_rib.c
View File

@ -77,51 +77,65 @@ static struct dplane_ctx_q rib_dplane_q;
DEFINE_HOOK(rib_update, (struct route_node * rn, const char *reason), DEFINE_HOOK(rib_update, (struct route_node * rn, const char *reason),
(rn, reason)); (rn, reason));
/* Meta Q's specific names */
enum meta_queue_indexes {
META_QUEUE_NHG,
META_QUEUE_EVPN,
META_QUEUE_CONNECTED,
META_QUEUE_KERNEL,
META_QUEUE_STATIC,
META_QUEUE_NOTBGP,
META_QUEUE_BGP,
META_QUEUE_OTHER,
};
/* Each route type's string and default distance value. */ /* Each route type's string and default distance value. */
static const struct { static const struct {
int key; int key;
uint8_t distance; uint8_t distance;
uint8_t meta_q_map; enum meta_queue_indexes meta_q_map;
} route_info[ZEBRA_ROUTE_MAX] = { } route_info[ZEBRA_ROUTE_MAX] = {
[ZEBRA_ROUTE_NHG] = {ZEBRA_ROUTE_NHG, 255 /* Unneeded for nhg's */, 0}, [ZEBRA_ROUTE_NHG] = {ZEBRA_ROUTE_NHG, 255 /* Unneeded for nhg's */,
[ZEBRA_ROUTE_SYSTEM] = {ZEBRA_ROUTE_SYSTEM, 0, 7}, META_QUEUE_NHG},
[ZEBRA_ROUTE_KERNEL] = {ZEBRA_ROUTE_KERNEL, 0, 3}, [ZEBRA_ROUTE_SYSTEM] = {ZEBRA_ROUTE_SYSTEM, 0, META_QUEUE_KERNEL},
[ZEBRA_ROUTE_CONNECT] = {ZEBRA_ROUTE_CONNECT, 0, 2}, [ZEBRA_ROUTE_KERNEL] = {ZEBRA_ROUTE_KERNEL, 0, META_QUEUE_KERNEL},
[ZEBRA_ROUTE_STATIC] = {ZEBRA_ROUTE_STATIC, 1, 4}, [ZEBRA_ROUTE_CONNECT] = {ZEBRA_ROUTE_CONNECT, 0, META_QUEUE_CONNECTED},
[ZEBRA_ROUTE_RIP] = {ZEBRA_ROUTE_RIP, 120, 5}, [ZEBRA_ROUTE_STATIC] = {ZEBRA_ROUTE_STATIC, 1, META_QUEUE_STATIC},
[ZEBRA_ROUTE_RIPNG] = {ZEBRA_ROUTE_RIPNG, 120, 5}, [ZEBRA_ROUTE_RIP] = {ZEBRA_ROUTE_RIP, 120, META_QUEUE_NOTBGP},
[ZEBRA_ROUTE_OSPF] = {ZEBRA_ROUTE_OSPF, 110, 5}, [ZEBRA_ROUTE_RIPNG] = {ZEBRA_ROUTE_RIPNG, 120, META_QUEUE_NOTBGP},
[ZEBRA_ROUTE_OSPF6] = {ZEBRA_ROUTE_OSPF6, 110, 5}, [ZEBRA_ROUTE_OSPF] = {ZEBRA_ROUTE_OSPF, 110, META_QUEUE_NOTBGP},
[ZEBRA_ROUTE_ISIS] = {ZEBRA_ROUTE_ISIS, 115, 5}, [ZEBRA_ROUTE_OSPF6] = {ZEBRA_ROUTE_OSPF6, 110, META_QUEUE_NOTBGP},
[ZEBRA_ROUTE_BGP] = {ZEBRA_ROUTE_BGP, 20 /* IBGP is 200. */, 6}, [ZEBRA_ROUTE_ISIS] = {ZEBRA_ROUTE_ISIS, 115, META_QUEUE_NOTBGP},
[ZEBRA_ROUTE_PIM] = {ZEBRA_ROUTE_PIM, 255, 7}, [ZEBRA_ROUTE_BGP] = {ZEBRA_ROUTE_BGP, 20 /* IBGP is 200. */,
[ZEBRA_ROUTE_EIGRP] = {ZEBRA_ROUTE_EIGRP, 90, 5}, META_QUEUE_BGP},
[ZEBRA_ROUTE_NHRP] = {ZEBRA_ROUTE_NHRP, 10, 5}, [ZEBRA_ROUTE_PIM] = {ZEBRA_ROUTE_PIM, 255, META_QUEUE_OTHER},
[ZEBRA_ROUTE_HSLS] = {ZEBRA_ROUTE_HSLS, 255, 7}, [ZEBRA_ROUTE_EIGRP] = {ZEBRA_ROUTE_EIGRP, 90, META_QUEUE_NOTBGP},
[ZEBRA_ROUTE_OLSR] = {ZEBRA_ROUTE_OLSR, 255, 7}, [ZEBRA_ROUTE_NHRP] = {ZEBRA_ROUTE_NHRP, 10, META_QUEUE_NOTBGP},
[ZEBRA_ROUTE_TABLE] = {ZEBRA_ROUTE_TABLE, 150, 4}, [ZEBRA_ROUTE_HSLS] = {ZEBRA_ROUTE_HSLS, 255, META_QUEUE_OTHER},
[ZEBRA_ROUTE_LDP] = {ZEBRA_ROUTE_LDP, 150, 7}, [ZEBRA_ROUTE_OLSR] = {ZEBRA_ROUTE_OLSR, 255, META_QUEUE_OTHER},
[ZEBRA_ROUTE_VNC] = {ZEBRA_ROUTE_VNC, 20, 6}, [ZEBRA_ROUTE_TABLE] = {ZEBRA_ROUTE_TABLE, 150, META_QUEUE_STATIC},
[ZEBRA_ROUTE_VNC_DIRECT] = {ZEBRA_ROUTE_VNC_DIRECT, 20, 6}, [ZEBRA_ROUTE_LDP] = {ZEBRA_ROUTE_LDP, 150, META_QUEUE_OTHER},
[ZEBRA_ROUTE_VNC_DIRECT_RH] = {ZEBRA_ROUTE_VNC_DIRECT_RH, 20, 6}, [ZEBRA_ROUTE_VNC] = {ZEBRA_ROUTE_VNC, 20, META_QUEUE_BGP},
[ZEBRA_ROUTE_BGP_DIRECT] = {ZEBRA_ROUTE_BGP_DIRECT, 20, 6}, [ZEBRA_ROUTE_VNC_DIRECT] = {ZEBRA_ROUTE_VNC_DIRECT, 20, META_QUEUE_BGP},
[ZEBRA_ROUTE_BGP_DIRECT_EXT] = {ZEBRA_ROUTE_BGP_DIRECT_EXT, 20, 6}, [ZEBRA_ROUTE_VNC_DIRECT_RH] = {ZEBRA_ROUTE_VNC_DIRECT_RH, 20,
[ZEBRA_ROUTE_BABEL] = {ZEBRA_ROUTE_BABEL, 100, 5}, META_QUEUE_BGP},
[ZEBRA_ROUTE_SHARP] = {ZEBRA_ROUTE_SHARP, 150, 7}, [ZEBRA_ROUTE_BGP_DIRECT] = {ZEBRA_ROUTE_BGP_DIRECT, 20, META_QUEUE_BGP},
[ZEBRA_ROUTE_PBR] = {ZEBRA_ROUTE_PBR, 200, 7}, [ZEBRA_ROUTE_BGP_DIRECT_EXT] = {ZEBRA_ROUTE_BGP_DIRECT_EXT, 20,
[ZEBRA_ROUTE_BFD] = {ZEBRA_ROUTE_BFD, 255, 7}, META_QUEUE_BGP},
[ZEBRA_ROUTE_OPENFABRIC] = {ZEBRA_ROUTE_OPENFABRIC, 115, 5}, [ZEBRA_ROUTE_BABEL] = {ZEBRA_ROUTE_BABEL, 100, META_QUEUE_NOTBGP},
[ZEBRA_ROUTE_VRRP] = {ZEBRA_ROUTE_VRRP, 255, 7}, [ZEBRA_ROUTE_SHARP] = {ZEBRA_ROUTE_SHARP, 150, META_QUEUE_OTHER},
[ZEBRA_ROUTE_SRTE] = {ZEBRA_ROUTE_SRTE, 255, 7}, [ZEBRA_ROUTE_PBR] = {ZEBRA_ROUTE_PBR, 200, META_QUEUE_OTHER},
[ZEBRA_ROUTE_ALL] = {ZEBRA_ROUTE_ALL, 255, 7}, [ZEBRA_ROUTE_BFD] = {ZEBRA_ROUTE_BFD, 255, META_QUEUE_OTHER},
[ZEBRA_ROUTE_OPENFABRIC] = {ZEBRA_ROUTE_OPENFABRIC, 115,
META_QUEUE_NOTBGP},
[ZEBRA_ROUTE_VRRP] = {ZEBRA_ROUTE_VRRP, 255, META_QUEUE_OTHER},
[ZEBRA_ROUTE_SRTE] = {ZEBRA_ROUTE_SRTE, 255, META_QUEUE_OTHER},
[ZEBRA_ROUTE_ALL] = {ZEBRA_ROUTE_ALL, 255, META_QUEUE_OTHER},
/* Any new route type added to zebra, should be mirrored here */ /* Any new route type added to zebra, should be mirrored here */
/* no entry/default: 150 */ /* no entry/default: 150 */
}; };
/* EVPN/VXLAN subqueue is number 1 */
#define META_QUEUE_EVPN 1
/* Wrapper struct for nhg workqueue items; a 'ctx' is an incoming update /* Wrapper struct for nhg workqueue items; a 'ctx' is an incoming update
* from the OS, and an 'nhe' is a nhe update. * from the OS, and an 'nhe' is a nhe update.
*/ */
@ -164,24 +178,24 @@ struct wq_evpn_wrapper {
#pragma FRR printfrr_ext "%pZN" (struct route_node *) #pragma FRR printfrr_ext "%pZN" (struct route_node *)
#endif #endif
static const char *subqueue2str(uint8_t index) static const char *subqueue2str(enum meta_queue_indexes index)
{ {
switch (index) { switch (index) {
case 0: case META_QUEUE_NHG:
return "NHG Objects"; return "NHG Objects";
case 1: case META_QUEUE_EVPN:
return "EVPN/VxLan Objects"; return "EVPN/VxLan Objects";
case 2: case META_QUEUE_CONNECTED:
return "Connected Routes"; return "Connected Routes";
case 3: case META_QUEUE_KERNEL:
return "Kernel Routes"; return "Kernel Routes";
case 4: case META_QUEUE_STATIC:
return "Static Routes"; return "Static Routes";
case 5: case META_QUEUE_NOTBGP:
return "RIP/OSPF/ISIS/EIGRP/NHRP Routes"; return "RIP/OSPF/ISIS/EIGRP/NHRP Routes";
case 6: case META_QUEUE_BGP:
return "BGP Routes"; return "BGP Routes";
case 7: case META_QUEUE_OTHER:
return "Other Routes"; return "Other Routes";
} }
@ -2407,7 +2421,7 @@ static void process_subq_nhg(struct listnode *lnode)
struct nhg_ctx *ctx; struct nhg_ctx *ctx;
struct nhg_hash_entry *nhe, *newnhe; struct nhg_hash_entry *nhe, *newnhe;
struct wq_nhg_wrapper *w; struct wq_nhg_wrapper *w;
uint8_t qindex = route_info[ZEBRA_ROUTE_NHG].meta_q_map; uint8_t qindex = META_QUEUE_NHG;
w = listgetdata(lnode); w = listgetdata(lnode);
@ -2496,19 +2510,30 @@ static void process_subq_route(struct listnode *lnode, uint8_t qindex)
* Examine the specified subqueue; process one entry and return 1 if * Examine the specified subqueue; process one entry and return 1 if
* there is a node, return 0 otherwise. * there is a node, return 0 otherwise.
*/ */
static unsigned int process_subq(struct list *subq, uint8_t qindex) static unsigned int process_subq(struct list *subq,
enum meta_queue_indexes qindex)
{ {
struct listnode *lnode = listhead(subq); struct listnode *lnode = listhead(subq);
if (!lnode) if (!lnode)
return 0; return 0;
if (qindex == META_QUEUE_EVPN) switch (qindex) {
case META_QUEUE_EVPN:
process_subq_evpn(lnode); process_subq_evpn(lnode);
else if (qindex == route_info[ZEBRA_ROUTE_NHG].meta_q_map) break;
case META_QUEUE_NHG:
process_subq_nhg(lnode); process_subq_nhg(lnode);
else break;
case META_QUEUE_CONNECTED:
case META_QUEUE_KERNEL:
case META_QUEUE_STATIC:
case META_QUEUE_NOTBGP:
case META_QUEUE_BGP:
case META_QUEUE_OTHER:
process_subq_route(lnode, qindex); process_subq_route(lnode, qindex);
break;
}
list_delete_node(subq, lnode); list_delete_node(subq, lnode);
@ -2613,7 +2638,7 @@ static int rib_meta_queue_add(struct meta_queue *mq, void *data)
static int rib_meta_queue_nhg_ctx_add(struct meta_queue *mq, void *data) static int rib_meta_queue_nhg_ctx_add(struct meta_queue *mq, void *data)
{ {
struct nhg_ctx *ctx = NULL; struct nhg_ctx *ctx = NULL;
uint8_t qindex = route_info[ZEBRA_ROUTE_NHG].meta_q_map; uint8_t qindex = META_QUEUE_NHG;
struct wq_nhg_wrapper *w; struct wq_nhg_wrapper *w;
ctx = (struct nhg_ctx *)data; ctx = (struct nhg_ctx *)data;
@ -2639,7 +2664,7 @@ static int rib_meta_queue_nhg_ctx_add(struct meta_queue *mq, void *data)
static int rib_meta_queue_nhg_add(struct meta_queue *mq, void *data) static int rib_meta_queue_nhg_add(struct meta_queue *mq, void *data)
{ {
struct nhg_hash_entry *nhe = NULL; struct nhg_hash_entry *nhe = NULL;
uint8_t qindex = route_info[ZEBRA_ROUTE_NHG].meta_q_map; uint8_t qindex = META_QUEUE_NHG;
struct wq_nhg_wrapper *w; struct wq_nhg_wrapper *w;
nhe = (struct nhg_hash_entry *)data; nhe = (struct nhg_hash_entry *)data;
@ -2933,44 +2958,6 @@ int zebra_rib_queue_evpn_rem_vtep_del(vrf_id_t vrf_id, vni_t vni,
return mq_add_handler(w, rib_meta_queue_evpn_add); return mq_add_handler(w, rib_meta_queue_evpn_add);
} }
/* Clean up the EVPN meta-queue list */
static void evpn_meta_queue_free(struct list *l)
{
struct listnode *node;
struct wq_evpn_wrapper *w;
/* Free the node wrapper object, and the struct it wraps */
while ((node = listhead(l)) != NULL) {
w = node->data;
node->data = NULL;
XFREE(MTYPE_WQ_WRAPPER, w);
list_delete_node(l, node);
}
}
/* Clean up the nhg meta-queue list */
static void nhg_meta_queue_free(struct list *l)
{
struct wq_nhg_wrapper *w;
struct listnode *node;
/* Free the node wrapper object, and the struct it wraps */
while ((node = listhead(l)) != NULL) {
w = node->data;
node->data = NULL;
if (w->type == WQ_NHG_WRAPPER_TYPE_CTX)
nhg_ctx_free(&w->u.ctx);
else if (w->type == WQ_NHG_WRAPPER_TYPE_NHG)
zebra_nhg_free(w->u.nhe);
XFREE(MTYPE_WQ_WRAPPER, w);
list_delete_node(l, node);
}
}
/* Create new meta queue. /* Create new meta queue.
A destructor function doesn't seem to be necessary here. A destructor function doesn't seem to be necessary here.
@ -2990,74 +2977,111 @@ static struct meta_queue *meta_queue_new(void)
return new; return new;
} }
void meta_queue_free(struct meta_queue *mq) /* Clean up the EVPN meta-queue list */
static void evpn_meta_queue_free(struct meta_queue *mq, struct list *l,
struct zebra_vrf *zvrf)
{ {
unsigned i; struct listnode *node, *nnode;
struct wq_evpn_wrapper *w;
for (i = 0; i < MQ_SIZE; i++) { /* Free the node wrapper object, and the struct it wraps */
/* Some subqueues may need cleanup - nhgs for example */ for (ALL_LIST_ELEMENTS(l, node, nnode, w)) {
if (i == route_info[ZEBRA_ROUTE_NHG].meta_q_map) if (zvrf) {
nhg_meta_queue_free(mq->subq[i]);
else if (i == META_QUEUE_EVPN)
evpn_meta_queue_free(mq->subq[i]);
list_delete(&mq->subq[i]);
}
XFREE(MTYPE_WORK_QUEUE, mq);
}
void rib_meta_queue_free_vrf(struct meta_queue *mq, struct zebra_vrf *zvrf)
{
vrf_id_t vrf_id = zvrf->vrf->vrf_id; vrf_id_t vrf_id = zvrf->vrf->vrf_id;
unsigned int i;
for (i = 0; i < MQ_SIZE; i++) { if (w->vrf_id != vrf_id)
struct listnode *lnode, *nnode; continue;
void *data; }
bool del;
for (ALL_LIST_ELEMENTS(mq->subq[i], lnode, nnode, data)) { node->data = NULL;
del = false;
if (i == META_QUEUE_EVPN) {
struct wq_evpn_wrapper *w = data;
if (w->vrf_id == vrf_id) {
XFREE(MTYPE_WQ_WRAPPER, w); XFREE(MTYPE_WQ_WRAPPER, w);
del = true;
}
} else if (i ==
route_info[ZEBRA_ROUTE_NHG].meta_q_map) {
struct wq_nhg_wrapper *w = data;
if (w->type == WQ_NHG_WRAPPER_TYPE_CTX && list_delete_node(l, node);
w->u.ctx->vrf_id == vrf_id) {
nhg_ctx_free(&w->u.ctx);
XFREE(MTYPE_WQ_WRAPPER, w);
del = true;
} else if (w->type == WQ_NHG_WRAPPER_TYPE_NHG &&
w->u.nhe->vrf_id == vrf_id) {
zebra_nhg_free(w->u.nhe);
XFREE(MTYPE_WQ_WRAPPER, w);
del = true;
}
} else {
struct route_node *rnode = data;
rib_dest_t *dest = rib_dest_from_rnode(rnode);
if (dest && rib_dest_vrf(dest) == zvrf) {
route_unlock_node(rnode);
del = true;
}
}
if (del) {
list_delete_node(mq->subq[i], lnode);
mq->size--; mq->size--;
} }
} }
/* Clean up the nhg meta-queue list */
static void nhg_meta_queue_free(struct meta_queue *mq, struct list *l,
struct zebra_vrf *zvrf)
{
struct wq_nhg_wrapper *w;
struct listnode *node, *nnode;
/* Free the node wrapper object, and the struct it wraps */
for (ALL_LIST_ELEMENTS(l, node, nnode, w)) {
if (zvrf) {
vrf_id_t vrf_id = zvrf->vrf->vrf_id;
if (w->type == WQ_NHG_WRAPPER_TYPE_CTX &&
w->u.ctx->vrf_id != vrf_id)
continue;
else if (w->type == WQ_NHG_WRAPPER_TYPE_NHG &&
w->u.nhe->vrf_id != vrf_id)
continue;
} }
if (w->type == WQ_NHG_WRAPPER_TYPE_CTX)
nhg_ctx_free(&w->u.ctx);
else if (w->type == WQ_NHG_WRAPPER_TYPE_NHG)
zebra_nhg_free(w->u.nhe);
node->data = NULL;
XFREE(MTYPE_WQ_WRAPPER, w);
list_delete_node(l, node);
mq->size--;
}
}
static void rib_meta_queue_free(struct meta_queue *mq, struct list *l,
struct zebra_vrf *zvrf)
{
struct route_node *rnode;
struct listnode *node, *nnode;
for (ALL_LIST_ELEMENTS(l, node, nnode, rnode)) {
rib_dest_t *dest = rib_dest_from_rnode(rnode);
if (dest && rib_dest_vrf(dest) != zvrf)
continue;
route_unlock_node(rnode);
node->data = NULL;
list_delete_node(l, node);
mq->size--;
}
}
void meta_queue_free(struct meta_queue *mq, struct zebra_vrf *zvrf)
{
enum meta_queue_indexes i;
for (i = 0; i < MQ_SIZE; i++) {
/* Some subqueues may need cleanup - nhgs for example */
switch (i) {
case META_QUEUE_NHG:
nhg_meta_queue_free(mq, mq->subq[i], zvrf);
break;
case META_QUEUE_EVPN:
evpn_meta_queue_free(mq, mq->subq[i], zvrf);
break;
case META_QUEUE_CONNECTED:
case META_QUEUE_KERNEL:
case META_QUEUE_STATIC:
case META_QUEUE_NOTBGP:
case META_QUEUE_BGP:
case META_QUEUE_OTHER:
rib_meta_queue_free(mq, mq->subq[i], zvrf);
break;
}
if (!zvrf)
list_delete(&mq->subq[i]);
}
if (!zvrf)
XFREE(MTYPE_WORK_QUEUE, mq);
} }
/* initialise zebra rib work queue */ /* initialise zebra rib work queue */

2
zebra/zebra_router.c
View File

@ -239,7 +239,7 @@ void zebra_router_terminate(void)
zebra_router_free_table(zrt); zebra_router_free_table(zrt);
work_queue_free_and_null(&zrouter.ribq); work_queue_free_and_null(&zrouter.ribq);
meta_queue_free(zrouter.mq); meta_queue_free(zrouter.mq, NULL);
zebra_vxlan_disable(); zebra_vxlan_disable();
zebra_mlag_terminate(); zebra_mlag_terminate();

4
zebra/zebra_vrf.c
View File

@ -218,7 +218,7 @@ static int zebra_vrf_disable(struct vrf *vrf)
if_nbr_ipv6ll_to_ipv4ll_neigh_del_all(ifp); if_nbr_ipv6ll_to_ipv4ll_neigh_del_all(ifp);
/* clean-up work queues */ /* clean-up work queues */
rib_meta_queue_free_vrf(zrouter.mq, zvrf); meta_queue_free(zrouter.mq, zvrf);
/* Cleanup (free) routing tables and NHT tables. */ /* Cleanup (free) routing tables and NHT tables. */
for (afi = AFI_IP; afi <= AFI_IP6; afi++) { for (afi = AFI_IP; afi <= AFI_IP6; afi++) {
@ -253,7 +253,7 @@ static int zebra_vrf_delete(struct vrf *vrf)
table_manager_disable(zvrf); table_manager_disable(zvrf);
/* clean-up work queues */ /* clean-up work queues */
rib_meta_queue_free_vrf(zrouter.mq, zvrf); meta_queue_free(zrouter.mq, zvrf);
/* Free Vxlan and MPLS. */ /* Free Vxlan and MPLS. */
zebra_vxlan_close_tables(zvrf); zebra_vxlan_close_tables(zvrf);