proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 18:37:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12461 from donaldsharp/evpn_mh_crash

Browse Source 
bgpd: Prevent crash in evpn when using default vrf
This commit is contained in:
Donatas Abraitis 2022-12-08 16:35:11 +02:00 committed by GitHub
commit ff1163a3b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
bgpd/bgp_evpn_mh.c
View File

@ -1692,7 +1692,7 @@ bgp_evpn_es_path_update_on_es_vrf_chg(struct bgp_evpn_es_vrf *es_vrf,
if (BGP_DEBUG(evpn_mh, EVPN_MH_RT)) if (BGP_DEBUG(evpn_mh, EVPN_MH_RT))
zlog_debug("update paths linked to es %s on es-vrf %s %s", zlog_debug("update paths linked to es %s on es-vrf %s %s",
es->esi_str, es_vrf->bgp_vrf->name, reason); es->esi_str, es_vrf->bgp_vrf->name_pretty, reason);
for (ALL_LIST_ELEMENTS_RO(es->macip_global_path_list, node, es_info)) { for (ALL_LIST_ELEMENTS_RO(es->macip_global_path_list, node, es_info)) {
pi = es_info->pi; pi = es_info->pi;
@ -3230,7 +3230,7 @@ static void bgp_evpn_es_vrf_show_entry(struct vty *vty,
json_object *json_types; json_object *json_types;
json_object_string_add(json, "esi", es->esi_str); json_object_string_add(json, "esi", es->esi_str);
json_object_string_add(json, "vrf", bgp_vrf->name); json_object_string_add(json, "vrf", bgp_vrf->name_pretty);
if (es_vrf->flags & (BGP_EVPNES_VRF_NHG_ACTIVE)) { if (es_vrf->flags & (BGP_EVPNES_VRF_NHG_ACTIVE)) {
json_types = json_object_new_array(); json_types = json_object_new_array();
@ -3250,7 +3250,7 @@ static void bgp_evpn_es_vrf_show_entry(struct vty *vty,
strlcat(flags_str, "A", sizeof(flags_str)); strlcat(flags_str, "A", sizeof(flags_str));
vty_out(vty, "%-30s %-15s %-5s %-8u %-8u %u\n", es->esi_str, vty_out(vty, "%-30s %-15s %-5s %-8u %-8u %u\n", es->esi_str,
bgp_vrf->name, flags_str, es_vrf->nhg_id, bgp_vrf->name_pretty, flags_str, es_vrf->nhg_id,
es_vrf->v6_nhg_id, es_vrf->ref_cnt); es_vrf->v6_nhg_id, es_vrf->ref_cnt);
} }
} }
@ -4425,10 +4425,11 @@ static void bgp_evpn_nh_zebra_update_send(struct bgp_evpn_nh *nh, bool add)
if (BGP_DEBUG(evpn_mh, EVPN_MH_ES)) { if (BGP_DEBUG(evpn_mh, EVPN_MH_ES)) {
if (add) if (add)
zlog_debug("evpn vrf %s nh %s rmac %pEA add to zebra", zlog_debug("evpn vrf %s nh %s rmac %pEA add to zebra",
nh->bgp_vrf->name, nh->nh_str, &nh->rmac); nh->bgp_vrf->name_pretty, nh->nh_str,
&nh->rmac);
else if (BGP_DEBUG(evpn_mh, EVPN_MH_ES)) else if (BGP_DEBUG(evpn_mh, EVPN_MH_ES))
zlog_debug("evpn vrf %s nh %s del to zebra", zlog_debug("evpn vrf %s nh %s del to zebra",
nh->bgp_vrf->name, nh->nh_str); nh->bgp_vrf->name_pretty, nh->nh_str);
} }
frrtrace(2, frr_bgp, evpn_mh_nh_rmac_zsend, add, nh); frrtrace(2, frr_bgp, evpn_mh_nh_rmac_zsend, add, nh);
@ -4497,8 +4498,8 @@ static struct bgp_evpn_nh *bgp_evpn_nh_add(struct bgp *bgp_vrf,
} }
if (BGP_DEBUG(evpn_mh, EVPN_MH_ES)) if (BGP_DEBUG(evpn_mh, EVPN_MH_ES))
zlog_debug("evpn vrf %s nh %s rmac %pEA add", n->bgp_vrf->name, zlog_debug("evpn vrf %s nh %s rmac %pEA add",
n->nh_str, &n->rmac); n->bgp_vrf->name_pretty, n->nh_str, &n->rmac);
bgp_evpn_nh_zebra_update(n, true); bgp_evpn_nh_zebra_update(n, true);
return n; return n;
} }
@ -4513,8 +4514,8 @@ static void bgp_evpn_nh_del(struct bgp_evpn_nh *n)
return; return;
if (BGP_DEBUG(evpn_mh, EVPN_MH_ES)) if (BGP_DEBUG(evpn_mh, EVPN_MH_ES))
zlog_debug("evpn vrf %s nh %s del to zebra", bgp_vrf->name, zlog_debug("evpn vrf %s nh %s del to zebra",
n->nh_str); bgp_vrf->name_pretty, n->nh_str);
bgp_evpn_nh_zebra_update(n, false); bgp_evpn_nh_zebra_update(n, false);
list_delete(&n->pi_list); list_delete(&n->pi_list);
@ -4556,7 +4557,7 @@ static bool bgp_evpn_nh_cmp(const void *p1, const void *p2)
void bgp_evpn_nh_init(struct bgp *bgp_vrf) void bgp_evpn_nh_init(struct bgp *bgp_vrf)
{ {
if (BGP_DEBUG(evpn_mh, EVPN_MH_ES)) if (BGP_DEBUG(evpn_mh, EVPN_MH_ES))
zlog_debug("evpn vrf %s nh init", bgp_vrf->name); zlog_debug("evpn vrf %s nh init", bgp_vrf->name_pretty);
bgp_vrf->evpn_nh_table = hash_create( bgp_vrf->evpn_nh_table = hash_create(
bgp_evpn_nh_hash_keymake, bgp_evpn_nh_cmp, "BGP EVPN NH table"); bgp_evpn_nh_hash_keymake, bgp_evpn_nh_cmp, "BGP EVPN NH table");
} }
@ -4568,7 +4569,7 @@ static void bgp_evpn_nh_flush_entry(struct bgp_evpn_nh *nh)
struct bgp_path_evpn_nh_info *nh_info; struct bgp_path_evpn_nh_info *nh_info;
if (BGP_DEBUG(evpn_mh, EVPN_MH_ES)) if (BGP_DEBUG(evpn_mh, EVPN_MH_ES))
zlog_debug("evpn vrf %s nh %s flush", nh->bgp_vrf->name, zlog_debug("evpn vrf %s nh %s flush", nh->bgp_vrf->name_pretty,
nh->nh_str); nh->nh_str);
/* force flush paths */ /* force flush paths */
@ -4586,7 +4587,7 @@ static void bgp_evpn_nh_flush_cb(struct hash_bucket *bucket, void *ctxt)
void bgp_evpn_nh_finish(struct bgp *bgp_vrf) void bgp_evpn_nh_finish(struct bgp *bgp_vrf)
{ {
if (BGP_DEBUG(evpn_mh, EVPN_MH_ES)) if (BGP_DEBUG(evpn_mh, EVPN_MH_ES))
zlog_debug("evpn vrf %s nh finish", bgp_vrf->name); zlog_debug("evpn vrf %s nh finish", bgp_vrf->name_pretty);
hash_iterate( hash_iterate(
bgp_vrf->evpn_nh_table, bgp_vrf->evpn_nh_table,
(void (*)(struct hash_bucket *, void *))bgp_evpn_nh_flush_cb, (void (*)(struct hash_bucket *, void *))bgp_evpn_nh_flush_cb,
@ -4612,7 +4613,7 @@ static void bgp_evpn_nh_update_ref_pi(struct bgp_evpn_nh *nh)
if (BGP_DEBUG(evpn_mh, EVPN_MH_ES)) if (BGP_DEBUG(evpn_mh, EVPN_MH_ES))
zlog_debug("evpn vrf %s nh %s ref_pi update", zlog_debug("evpn vrf %s nh %s ref_pi update",
nh->bgp_vrf->name, nh->nh_str); nh->bgp_vrf->name_pretty, nh->nh_str);
nh->ref_pi = pi; nh->ref_pi = pi;
/* If we have a new pi copy rmac from it and update /* If we have a new pi copy rmac from it and update
* zebra if the new rmac is different * zebra if the new rmac is different
@ -4632,8 +4633,8 @@ static void bgp_evpn_nh_clear_ref_pi(struct bgp_evpn_nh *nh,
return; return;
if (BGP_DEBUG(evpn_mh, EVPN_MH_ES)) if (BGP_DEBUG(evpn_mh, EVPN_MH_ES))
zlog_debug("evpn vrf %s nh %s ref_pi clear", nh->bgp_vrf->name, zlog_debug("evpn vrf %s nh %s ref_pi clear",
nh->nh_str); nh->bgp_vrf->name_pretty, nh->nh_str);
nh->ref_pi = NULL; nh->ref_pi = NULL;
/* try to find another ref_pi */ /* try to find another ref_pi */
bgp_evpn_nh_update_ref_pi(nh); bgp_evpn_nh_update_ref_pi(nh);
@ -4692,7 +4693,7 @@ static void bgp_evpn_path_nh_unlink(struct bgp_path_evpn_nh_info *nh_info)
pi->net ? prefix2str(&pi->net->p, prefix_buf, pi->net ? prefix2str(&pi->net->p, prefix_buf,
sizeof(prefix_buf)) sizeof(prefix_buf))
: "", : "",
nh->bgp_vrf->name, nh->nh_str); nh->bgp_vrf->name_pretty, nh->nh_str);
list_delete_node(nh->pi_list, &nh_info->nh_listnode); list_delete_node(nh->pi_list, &nh_info->nh_listnode);
@ -4724,7 +4725,7 @@ static void bgp_evpn_path_nh_link(struct bgp *bgp_vrf, struct bgp_path_info *pi)
if (!bgp_vrf->evpn_nh_table) { if (!bgp_vrf->evpn_nh_table) {
if (BGP_DEBUG(evpn_mh, EVPN_MH_RT)) if (BGP_DEBUG(evpn_mh, EVPN_MH_RT))
zlog_debug("path %pFX linked to vrf %s failed", zlog_debug("path %pFX linked to vrf %s failed",
&pi->net->p, bgp_vrf->name); &pi->net->p, bgp_vrf->name_pretty);
return; return;
} }
@ -4772,7 +4773,7 @@ static void bgp_evpn_path_nh_link(struct bgp *bgp_vrf, struct bgp_path_info *pi)
if (BGP_DEBUG(evpn_mh, EVPN_MH_RT)) if (BGP_DEBUG(evpn_mh, EVPN_MH_RT))
zlog_debug("path %pFX linked to nh %s %s", &pi->net->p, zlog_debug("path %pFX linked to nh %s %s", &pi->net->p,
nh->bgp_vrf->name, nh->nh_str); nh->bgp_vrf->name_pretty, nh->nh_str);
/* link mac-ip path to the new nh */ /* link mac-ip path to the new nh */
nh_info->nh = nh; nh_info->nh = nh;
@ -4786,7 +4787,8 @@ static void bgp_evpn_path_nh_link(struct bgp *bgp_vrf, struct bgp_path_info *pi)
if (!nh->ref_pi) if (!nh->ref_pi)
zlog_debug( zlog_debug(
"path %pFX linked to nh %s %s with no valid pi", "path %pFX linked to nh %s %s with no valid pi",
&pi->net->p, nh->bgp_vrf->name, nh->nh_str); &pi->net->p, nh->bgp_vrf->name_pretty,
nh->nh_str);
} }
} }
@ -4826,15 +4828,15 @@ static void bgp_evpn_nh_show_entry(struct bgp_evpn_nh *nh, struct vty *vty,
else else
prefix_buf[0] = '\0'; prefix_buf[0] = '\0';
if (json) { if (json) {
json_object_string_add(json, "vrf", nh->bgp_vrf->name); json_object_string_add(json, "vrf", nh->bgp_vrf->name_pretty);
json_object_string_add(json, "ip", nh->nh_str); json_object_string_add(json, "ip", nh->nh_str);
json_object_string_add(json, "rmac", mac_buf); json_object_string_add(json, "rmac", mac_buf);
json_object_string_add(json, "basePath", prefix_buf); json_object_string_add(json, "basePath", prefix_buf);
json_object_int_add(json, "pathCount", listcount(nh->pi_list)); json_object_int_add(json, "pathCount", listcount(nh->pi_list));
} else { } else {
vty_out(vty, "%-15s %-15s %-17s %-10d %s\n", nh->bgp_vrf->name, vty_out(vty, "%-15s %-15s %-17s %-10d %s\n",
nh->nh_str, mac_buf, listcount(nh->pi_list), nh->bgp_vrf->name_pretty, nh->nh_str, mac_buf,
prefix_buf); listcount(nh->pi_list), prefix_buf);
} }
/* add ES to the json array */ /* add ES to the json array */