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

Merge pull request #17437 from FRRouting/mergify/bp/stable/10.2/pr-17432

Browse Source 
bgpd : backpressure - Fix to pop items off zebra_announce FIFO for few EVPN triggers (backport #17432)
This commit is contained in:
Donatas Abraitis 2024-11-19 22:47:55 +01:00 committed by GitHub
commit 91f482a854
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
bgpd/bgp_evpn.c
View File

@ -5111,6 +5111,33 @@ static void evpn_mpattr_encode_type5(struct stream *s, const struct prefix *p,
stream_put3(s, 0); stream_put3(s, 0);
} }
/*
* In cases such as 'no advertise-all-vni' and L2 VNI DELETE, we need to
* pop all the VPN routes present in the bgp_zebra_announce FIFO yet to
* be processed regardless of VNI is configured or not.
*
* NOTE: NO need to pop the VPN routes in two cases
* 1) In free_vni_entry
* - Called by bgp_free()->bgp_evpn_cleanup().
* - Since bgp_delete is called before bgp_free and we pop all the dest
* pertaining to bgp under delete.
* 2) evpn_delete_vni() when user configures "no vni" since the withdraw
* of all routes happen in normal cycle.
*/
void bgp_zebra_evpn_pop_items_from_announce_fifo(struct bgpevpn *vpn)
{
struct bgp_dest *dest = NULL;
struct bgp_dest *dest_next = NULL;
for (dest = zebra_announce_first(&bm->zebra_announce_head); dest; dest = dest_next) {
dest_next = zebra_announce_next(&bm->zebra_announce_head, dest);
if (dest->za_vpn == vpn) {
zebra_announce_del(&bm->zebra_announce_head, dest);
bgp_path_info_unlock(dest->za_bgp_pi);
bgp_dest_unlock_node(dest);
}
}
}
/* /*
* Cleanup specific VNI upon EVPN (advertise-all-vni) being disabled. * Cleanup specific VNI upon EVPN (advertise-all-vni) being disabled.
*/ */
@ -5123,6 +5150,8 @@ static void cleanup_vni_on_disable(struct hash_bucket *bucket, struct bgp *bgp)
/* Clear "live" flag and see if hash needs to be freed. */ /* Clear "live" flag and see if hash needs to be freed. */
UNSET_FLAG(vpn->flags, VNI_FLAG_LIVE); UNSET_FLAG(vpn->flags, VNI_FLAG_LIVE);
/* Pop items from bgp_zebra_announce FIFO for any VPN routes pending*/
bgp_zebra_evpn_pop_items_from_announce_fifo(vpn);
if (!is_vni_configured(vpn)) if (!is_vni_configured(vpn))
bgp_evpn_free(bgp, vpn); bgp_evpn_free(bgp, vpn);
} }
@ -6354,19 +6383,6 @@ struct bgpevpn *bgp_evpn_new(struct bgp *bgp, vni_t vni,
*/ */
void bgp_evpn_free(struct bgp *bgp, struct bgpevpn *vpn) void bgp_evpn_free(struct bgp *bgp, struct bgpevpn *vpn)
{ {
struct bgp_dest *dest = NULL;
struct bgp_dest *dest_next = NULL;
for (dest = zebra_announce_first(&bm->zebra_announce_head); dest;
dest = dest_next) {
dest_next = zebra_announce_next(&bm->zebra_announce_head, dest);
if (dest->za_vpn == vpn) {
zebra_announce_del(&bm->zebra_announce_head, dest);
bgp_path_info_unlock(dest->za_bgp_pi);
bgp_dest_unlock_node(dest);
}
}
bgp_evpn_remote_ip_hash_destroy(vpn); bgp_evpn_remote_ip_hash_destroy(vpn);
bgp_evpn_vni_es_cleanup(vpn); bgp_evpn_vni_es_cleanup(vpn);
bgpevpn_unlink_from_l3vni(vpn); bgpevpn_unlink_from_l3vni(vpn);
@ -7047,6 +7063,8 @@ int bgp_evpn_local_vni_del(struct bgp *bgp, vni_t vni)
/* Clear "live" flag and see if hash needs to be freed. */ /* Clear "live" flag and see if hash needs to be freed. */
UNSET_FLAG(vpn->flags, VNI_FLAG_LIVE); UNSET_FLAG(vpn->flags, VNI_FLAG_LIVE);
/* Pop items from bgp_zebra_announce FIFO for any VPN routes pending*/
bgp_zebra_evpn_pop_items_from_announce_fifo(vpn);
if (!is_vni_configured(vpn)) if (!is_vni_configured(vpn))
bgp_evpn_free(bgp, vpn); bgp_evpn_free(bgp, vpn);

1
bgpd/bgp_evpn.h
View File

@ -199,4 +199,5 @@ bool bgp_evpn_skip_vrf_import_of_local_es(struct bgp *bgp_vrf, const struct pref
struct bgp_path_info *pi, int install); struct bgp_path_info *pi, int install);
int uninstall_evpn_route_entry_in_vrf(struct bgp *bgp_vrf, const struct prefix_evpn *evp, int uninstall_evpn_route_entry_in_vrf(struct bgp *bgp_vrf, const struct prefix_evpn *evp,
struct bgp_path_info *parent_pi); struct bgp_path_info *parent_pi);
extern void bgp_zebra_evpn_pop_items_from_announce_fifo(struct bgpevpn *vpn);
#endif /* _QUAGGA_BGP_EVPN_H */ #endif /* _QUAGGA_BGP_EVPN_H */