matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #18614 from donaldsharp/bgp_memory_fixes_vrf_different_asn

Browse source 
bgpd: On shutdown free up memory leak found by topotest
This commit is contained in:
Jafar Al-Gharaibeh 2025-04-08 14:31:15 -05:00 committed by GitHub
parent 4281d2b2c7 b18c309015
commit 1d426d9961
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
bgpd/bgpd.c
View file

@ -3589,7 +3589,8 @@ peer_init:
bgp->vpn_policy[afi].tovpn_zebra_vrf_label_last_sent = bgp->vpn_policy[afi].tovpn_zebra_vrf_label_last_sent =
MPLS_LABEL_NONE; MPLS_LABEL_NONE;
bgp->vpn_policy[afi].import_vrf = list_new(); if (!bgp->vpn_policy[afi].import_vrf)
bgp->vpn_policy[afi].import_vrf = list_new();
bgp->vpn_policy[afi].import_vrf->del = bgp->vpn_policy[afi].import_vrf->del =
bgp_vrf_string_name_delete; bgp_vrf_string_name_delete;
if (!hidden) { if (!hidden) {
@ -3607,7 +3608,7 @@ peer_init:
bgp_mplsvpn_nh_label_bind_cache_init(&bgp->mplsvpn_nh_label_bind); bgp_mplsvpn_nh_label_bind_cache_init(&bgp->mplsvpn_nh_label_bind);
if (name) if (name && !bgp->name)
bgp->name = XSTRDUP(MTYPE_BGP_NAME, name); bgp->name = XSTRDUP(MTYPE_BGP_NAME, name);
event_add_timer(bm->master, bgp_startup_timer_expire, bgp, event_add_timer(bm->master, bgp_startup_timer_expire, bgp,
@ -4264,7 +4265,7 @@ int bgp_delete(struct bgp *bgp)
} }
} }
if (bgp->peer_self && !IS_BGP_INSTANCE_HIDDEN(bgp)) { if (bgp->peer_self && (!IS_BGP_INSTANCE_HIDDEN(bgp) || bm->terminating)) {
peer_delete(bgp->peer_self); peer_delete(bgp->peer_self);
bgp->peer_self = NULL; bgp->peer_self = NULL;
} }
@ -4281,7 +4282,7 @@ int bgp_delete(struct bgp *bgp)
/* TODO - Other memory may need to be freed - e.g., NHT */ /* TODO - Other memory may need to be freed - e.g., NHT */
#ifdef ENABLE_BGP_VNC #ifdef ENABLE_BGP_VNC
if (!IS_BGP_INSTANCE_HIDDEN(bgp)) if (!IS_BGP_INSTANCE_HIDDEN(bgp) || bm->terminating)
rfapi_delete(bgp); rfapi_delete(bgp);
#endif #endif
@ -4332,7 +4333,7 @@ int bgp_delete(struct bgp *bgp)
bgp_zebra_instance_deregister(bgp); bgp_zebra_instance_deregister(bgp);
} }
if (!IS_BGP_INSTANCE_HIDDEN(bgp)) { if (!IS_BGP_INSTANCE_HIDDEN(bgp) || bm->terminating) {
/* Remove visibility via the master list - /* Remove visibility via the master list -
* there may however still be routes to be processed * there may however still be routes to be processed
* still referencing the struct bgp. * still referencing the struct bgp.
@ -4344,7 +4345,7 @@ int bgp_delete(struct bgp *bgp)
vrf = bgp_vrf_lookup_by_instance_type(bgp); vrf = bgp_vrf_lookup_by_instance_type(bgp);
bgp_handle_socket(bgp, vrf, VRF_UNKNOWN, false); bgp_handle_socket(bgp, vrf, VRF_UNKNOWN, false);
if (vrf && !IS_BGP_INSTANCE_HIDDEN(bgp)) if (vrf && (!IS_BGP_INSTANCE_HIDDEN(bgp) || bm->terminating))
bgp_vrf_unlink(bgp, vrf); bgp_vrf_unlink(bgp, vrf);
/* Update EVPN VRF pointer */ /* Update EVPN VRF pointer */
@ -4355,7 +4356,7 @@ int bgp_delete(struct bgp *bgp)
bgp_set_evpn(bgp_get_default()); bgp_set_evpn(bgp_get_default());
} }
if (!IS_BGP_INSTANCE_HIDDEN(bgp)) { if (!IS_BGP_INSTANCE_HIDDEN(bgp) || bm->terminating) {
if (bgp->process_queue) if (bgp->process_queue)
work_queue_free_and_null(&bgp->process_queue); work_queue_free_and_null(&bgp->process_queue);
bgp_unlock(bgp); /* initial reference */ bgp_unlock(bgp); /* initial reference */