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

zebra: Combine meta_queue_free and meta_queue_vrf_free functions

Browse Source 
These functions essentially do the same thing.  Combine them
for the goodness of mankind.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2022-08-09 13:09:16 -04:00
parent 57a5524578
commit a310ebc114
4 changed files with 89 additions and 113 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;

192
zebra/zebra_rib.c
View File

@ -2958,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.
@ -3015,7 +2977,84 @@ 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)
{
struct listnode *node, *nnode;
struct wq_evpn_wrapper *w;
/* 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->vrf_id != vrf_id)
continue;
}
node->data = NULL;
XFREE(MTYPE_WQ_WRAPPER, w);
list_delete_node(l, node);
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; enum meta_queue_indexes i;
@ -3023,10 +3062,10 @@ void meta_queue_free(struct meta_queue *mq)
/* Some subqueues may need cleanup - nhgs for example */ /* Some subqueues may need cleanup - nhgs for example */
switch (i) { switch (i) {
case META_QUEUE_NHG: case META_QUEUE_NHG:
nhg_meta_queue_free(mq->subq[i]); nhg_meta_queue_free(mq, mq->subq[i], zvrf);
break; break;
case META_QUEUE_EVPN: case META_QUEUE_EVPN:
evpn_meta_queue_free(mq->subq[i]); evpn_meta_queue_free(mq, mq->subq[i], zvrf);
break; break;
case META_QUEUE_CONNECTED: case META_QUEUE_CONNECTED:
case META_QUEUE_KERNEL: case META_QUEUE_KERNEL:
@ -3034,76 +3073,15 @@ void meta_queue_free(struct meta_queue *mq)
case META_QUEUE_NOTBGP: case META_QUEUE_NOTBGP:
case META_QUEUE_BGP: case META_QUEUE_BGP:
case META_QUEUE_OTHER: case META_QUEUE_OTHER:
rib_meta_queue_free(mq, mq->subq[i], zvrf);
break; break;
} }
list_delete(&mq->subq[i]); if (!zvrf)
list_delete(&mq->subq[i]);
} }
XFREE(MTYPE_WORK_QUEUE, mq); if (!zvrf)
} 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;
enum meta_queue_indexes i;
for (i = 0; i < MQ_SIZE; i++) {
struct listnode *lnode, *nnode;
void *data;
bool del;
for (ALL_LIST_ELEMENTS(mq->subq[i], lnode, nnode, data)) {
del = false;
switch (i) {
case META_QUEUE_EVPN: {
struct wq_evpn_wrapper *w = data;
if (w->vrf_id == vrf_id) {
XFREE(MTYPE_WQ_WRAPPER, w);
del = true;
}
break;
}
case META_QUEUE_NHG: {
struct wq_nhg_wrapper *w = data;
if (w->type == WQ_NHG_WRAPPER_TYPE_CTX &&
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;
}
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: {
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;
}
break;
}
}
if (del) {
list_delete_node(mq->subq[i], lnode);
mq->size--;
}
}
}
} }
/* 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);