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

Merge pull request #17433 from donaldsharp/zebra_debug_assert

Browse Source 
Zebra debug assert
This commit is contained in:
Jafar Al-Gharaibeh 2024-11-14 21:52:49 -06:00 committed by GitHub
commit 076879a279
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 64 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zebra/zebra_evpn.c
View File

@ -1286,8 +1286,9 @@ int zebra_evpn_vtep_install(struct zebra_evpn *zevpn, struct zebra_vtep *zvtep)
int zebra_evpn_vtep_uninstall(struct zebra_evpn *zevpn, struct in_addr *vtep_ip) int zebra_evpn_vtep_uninstall(struct zebra_evpn *zevpn, struct in_addr *vtep_ip)
{ {
if (!zevpn->vxlan_if) { if (!zevpn->vxlan_if) {
zlog_debug("VNI %u hash %p couldn't be uninstalled - no intf", if (IS_ZEBRA_DEBUG_VXLAN)
zevpn->vni, zevpn); zlog_debug("VNI %u hash %p couldn't be uninstalled - no intf",
zevpn->vni, zevpn);
return -1; return -1;
} }

119
zebra/zebra_vxlan.c
View File

@ -172,8 +172,7 @@ static int host_rb_entry_compare(const struct host_rb_entry *hle1,
return 0; return 0;
} else { } else {
zlog_debug("%s: Unexpected family type: %d", __func__, assert(!"Received unexpected family type, dev escape");
hle1->p.family);
return 0; return 0;
} }
} }
@ -1015,9 +1014,9 @@ static int zevpn_build_vni_hash_table(struct zebra_if *zif,
} else { } else {
zevpn = zebra_evpn_add(vni); zevpn = zebra_evpn_add(vni);
if (!zevpn) { if (!zevpn) {
zlog_debug( if (IS_ZEBRA_DEBUG_VXLAN)
"Failed to add EVPN hash, IF %s(%u) L2-VNI %u", zlog_debug("Failed to add EVPN hash, IF %s(%u) L2-VNI %u",
ifp->name, ifp->ifindex, vni); ifp->name, ifp->ifindex, vni);
return 0; return 0;
} }
@ -1354,9 +1353,9 @@ static int zl3vni_remote_rmac_add(struct zebra_l3vni *zl3vni,
/* Create the RMAC entry, or update its vtep, if necessary. */ /* Create the RMAC entry, or update its vtep, if necessary. */
zrmac = zl3vni_rmac_add(zl3vni, rmac); zrmac = zl3vni_rmac_add(zl3vni, rmac);
if (!zrmac) { if (!zrmac) {
zlog_debug( if (IS_ZEBRA_DEBUG_VXLAN)
"Failed to add RMAC %pEA L3VNI %u Remote VTEP %pIA", zlog_debug("Failed to add RMAC %pEA L3VNI %u Remote VTEP %pIA",
rmac, zl3vni->vni, vtep_ip); rmac, zl3vni->vni, vtep_ip);
return -1; return -1;
} }
memset(&zrmac->fwd_info, 0, sizeof(zrmac->fwd_info)); memset(&zrmac->fwd_info, 0, sizeof(zrmac->fwd_info));
@ -1678,9 +1677,9 @@ static int zl3vni_remote_nh_add(struct zebra_l3vni *zl3vni,
if (!nh) { if (!nh) {
nh = zl3vni_nh_add(zl3vni, vtep_ip, rmac); nh = zl3vni_nh_add(zl3vni, vtep_ip, rmac);
if (!nh) { if (!nh) {
zlog_debug( if (IS_ZEBRA_DEBUG_VXLAN)
"Failed to add NH %pIA as Neigh (RMAC %pEA L3-VNI %u prefix %pFX)", zlog_debug("Failed to add NH %pIA as Neigh (RMAC %pEA L3-VNI %u prefix %pFX)",
vtep_ip, rmac, zl3vni->vni, host_prefix); vtep_ip, rmac, zl3vni->vni, host_prefix);
return -1; return -1;
} }
@ -1736,9 +1735,9 @@ static int svd_remote_nh_add(struct zebra_l3vni *zl3vni,
if (!nh) { if (!nh) {
nh = svd_nh_add(vtep_ip, rmac); nh = svd_nh_add(vtep_ip, rmac);
if (!nh) { if (!nh) {
zlog_debug( if (IS_ZEBRA_DEBUG_VXLAN)
"Failed to add NH %pIA as SVD Neigh (RMAC %pEA prefix %pFX)", zlog_debug("Failed to add NH %pIA as SVD Neigh (RMAC %pEA prefix %pFX)",
vtep_ip, rmac, host_prefix); vtep_ip, rmac, host_prefix);
return -1; return -1;
} }
@ -1784,7 +1783,8 @@ static int svd_remote_nh_del(struct zebra_l3vni *zl3vni,
nh = svd_nh_lookup(vtep_ip); nh = svd_nh_lookup(vtep_ip);
if (!nh) { if (!nh) {
zlog_debug("Failed to del NH %pIA as SVD Neigh", vtep_ip); if (IS_ZEBRA_DEBUG_VXLAN)
zlog_debug("Failed to del NH %pIA as SVD Neigh", vtep_ip);
return -1; return -1;
} }
@ -4082,9 +4082,9 @@ int zebra_vxlan_handle_kernel_neigh_del(struct interface *ifp,
} }
if (!zevpn->vxlan_if) { if (!zevpn->vxlan_if) {
zlog_debug( if (IS_ZEBRA_DEBUG_VXLAN)
"VNI %u hash %p doesn't have intf upon local neighbor DEL", zlog_debug("VNI %u hash %p doesn't have intf upon local neighbor DEL",
zevpn->vni, zevpn); zevpn->vni, zevpn);
return -1; return -1;
} }
@ -4258,7 +4258,8 @@ void zebra_vxlan_remote_macip_add(ZAPI_HANDLER_ARGS)
char esi_buf[ESI_STR_LEN]; char esi_buf[ESI_STR_LEN];
if (!EVPN_ENABLED(zvrf)) { if (!EVPN_ENABLED(zvrf)) {
zlog_debug("EVPN not enabled, ignoring remote MACIP ADD"); if (IS_ZEBRA_DEBUG_VXLAN)
zlog_debug("EVPN not enabled, ignoring remote MACIP ADD");
return; return;
} }
@ -4530,9 +4531,9 @@ int zebra_vxlan_local_mac_del(struct interface *ifp, struct interface *br_if,
if (!zevpn) if (!zevpn)
return 0; return 0;
if (!zevpn->vxlan_if) { if (!zevpn->vxlan_if) {
zlog_debug( if (IS_ZEBRA_DEBUG_VXLAN)
"VNI %u hash %p doesn't have intf upon local MAC DEL", zlog_debug("VNI %u hash %p doesn't have intf upon local MAC DEL",
zevpn->vni, zevpn); zevpn->vni, zevpn);
return -1; return -1;
} }
@ -4600,15 +4601,15 @@ void zebra_vxlan_remote_vtep_del_zapi(ZAPI_HANDLER_ARGS)
struct in_addr vtep_ip; struct in_addr vtep_ip;
if (!is_evpn_enabled()) { if (!is_evpn_enabled()) {
zlog_debug( if (IS_ZEBRA_DEBUG_VXLAN)
"%s: EVPN is not enabled yet we have received a VTEP DEL msg", zlog_debug("%s: EVPN is not enabled yet we have received a VTEP DEL msg",
__func__); __func__);
return; return;
} }
if (!EVPN_ENABLED(zvrf)) { if (!EVPN_ENABLED(zvrf)) {
zlog_debug("Recv VTEP DEL zapi for non-EVPN VRF %u", if (IS_ZEBRA_DEBUG_VXLAN)
zvrf_id(zvrf)); zlog_debug("Recv VTEP DEL zapi for non-EVPN VRF %u", zvrf_id(zvrf));
return; return;
} }
@ -4653,8 +4654,8 @@ void zebra_vxlan_remote_vtep_del(vrf_id_t vrf_id, vni_t vni,
struct zebra_vrf *zvrf; struct zebra_vrf *zvrf;
if (!is_evpn_enabled()) { if (!is_evpn_enabled()) {
zlog_debug("%s: Can't process vtep del: EVPN is not enabled", if (IS_ZEBRA_DEBUG_VXLAN)
__func__); zlog_debug("%s: Can't process vtep del: EVPN is not enabled", __func__);
return; return;
} }
@ -4663,8 +4664,8 @@ void zebra_vxlan_remote_vtep_del(vrf_id_t vrf_id, vni_t vni,
return; return;
if (!EVPN_ENABLED(zvrf)) { if (!EVPN_ENABLED(zvrf)) {
zlog_debug("Can't process VTEP DEL for non-EVPN VRF %u", if (IS_ZEBRA_DEBUG_VXLAN)
zvrf_id(zvrf)); zlog_debug("Can't process VTEP DEL for non-EVPN VRF %u", zvrf_id(zvrf));
return; return;
} }
@ -4680,9 +4681,9 @@ void zebra_vxlan_remote_vtep_del(vrf_id_t vrf_id, vni_t vni,
ifp = zevpn->vxlan_if; ifp = zevpn->vxlan_if;
if (!ifp) { if (!ifp) {
zlog_debug( if (IS_ZEBRA_DEBUG_VXLAN)
"VNI %u hash %p doesn't have intf upon remote VTEP DEL", zlog_debug("VNI %u hash %p doesn't have intf upon remote VTEP DEL",
zevpn->vni, zevpn); zevpn->vni, zevpn);
return; return;
} }
zif = ifp->info; zif = ifp->info;
@ -4717,8 +4718,8 @@ void zebra_vxlan_remote_vtep_add(vrf_id_t vrf_id, vni_t vni,
struct zebra_vrf *zvrf; struct zebra_vrf *zvrf;
if (!is_evpn_enabled()) { if (!is_evpn_enabled()) {
zlog_debug("%s: EVPN not enabled: can't process a VTEP ADD", if (IS_ZEBRA_DEBUG_VXLAN)
__func__); zlog_debug("%s: EVPN not enabled: can't process a VTEP ADD", __func__);
return; return;
} }
@ -4727,8 +4728,8 @@ void zebra_vxlan_remote_vtep_add(vrf_id_t vrf_id, vni_t vni,
return; return;
if (!EVPN_ENABLED(zvrf)) { if (!EVPN_ENABLED(zvrf)) {
zlog_debug("Can't process VTEP ADD for non-EVPN VRF %u", if (IS_ZEBRA_DEBUG_VXLAN)
zvrf_id(zvrf)); zlog_debug("Can't process VTEP ADD for non-EVPN VRF %u", zvrf_id(zvrf));
return; return;
} }
@ -4795,15 +4796,15 @@ void zebra_vxlan_remote_vtep_add_zapi(ZAPI_HANDLER_ARGS)
int flood_control; int flood_control;
if (!is_evpn_enabled()) { if (!is_evpn_enabled()) {
zlog_debug( if (IS_ZEBRA_DEBUG_VXLAN)
"%s: EVPN not enabled yet we received a VTEP ADD zapi msg", zlog_debug("%s: EVPN not enabled yet we received a VTEP ADD zapi msg",
__func__); __func__);
return; return;
} }
if (!EVPN_ENABLED(zvrf)) { if (!EVPN_ENABLED(zvrf)) {
zlog_debug("Recv VTEP ADD zapi for non-EVPN VRF %u", if (IS_ZEBRA_DEBUG_VXLAN)
zvrf_id(zvrf)); zlog_debug("Recv VTEP ADD zapi for non-EVPN VRF %u", zvrf_id(zvrf));
return; return;
} }
@ -4871,8 +4872,9 @@ int zebra_vxlan_add_del_gw_macip(struct interface *ifp, const struct prefix *p,
svi_if = if_lookup_by_index_per_ns(zebra_ns_lookup(NS_DEFAULT), svi_if = if_lookup_by_index_per_ns(zebra_ns_lookup(NS_DEFAULT),
ifp_zif->link_ifindex); ifp_zif->link_ifindex);
if (!svi_if) { if (!svi_if) {
zlog_debug("MACVLAN %s(%u) without link information", if (IS_ZEBRA_DEBUG_VXLAN)
ifp->name, ifp->ifindex); zlog_debug("MACVLAN %s(%u) without link information", ifp->name,
ifp->ifindex);
return -1; return -1;
} }
@ -4920,8 +4922,9 @@ int zebra_vxlan_add_del_gw_macip(struct interface *ifp, const struct prefix *p,
return 0; return 0;
if (!zevpn->vxlan_if) { if (!zevpn->vxlan_if) {
zlog_debug("VNI %u hash %p doesn't have intf upon MACVLAN up", if (IS_ZEBRA_DEBUG_VXLAN)
zevpn->vni, zevpn); zlog_debug("VNI %u hash %p doesn't have intf upon MACVLAN up", zevpn->vni,
zevpn);
return -1; return -1;
} }
@ -5038,9 +5041,9 @@ int zebra_vxlan_svi_up(struct interface *ifp, struct interface *link_if)
return 0; return 0;
if (!zevpn->vxlan_if) { if (!zevpn->vxlan_if) {
zlog_debug( if (IS_ZEBRA_DEBUG_VXLAN)
"VNI %u hash %p doesn't have intf upon SVI up", zlog_debug("VNI %u hash %p doesn't have intf upon SVI up",
zevpn->vni, zevpn); zevpn->vni, zevpn);
return -1; return -1;
} }
@ -5350,8 +5353,8 @@ void zebra_vxlan_advertise_svi_macip(ZAPI_HANDLER_ARGS)
struct interface *ifp = NULL; struct interface *ifp = NULL;
if (!EVPN_ENABLED(zvrf)) { if (!EVPN_ENABLED(zvrf)) {
zlog_debug("EVPN SVI-MACIP Adv for non-EVPN VRF %u", if (IS_ZEBRA_DEBUG_VXLAN)
zvrf_id(zvrf)); zlog_debug("EVPN SVI-MACIP Adv for non-EVPN VRF %u", zvrf_id(zvrf));
return; return;
} }
@ -5458,8 +5461,8 @@ void zebra_vxlan_advertise_subnet(ZAPI_HANDLER_ARGS)
struct zebra_vxlan_vni *zl2_info_vni = NULL; struct zebra_vxlan_vni *zl2_info_vni = NULL;
if (!EVPN_ENABLED(zvrf)) { if (!EVPN_ENABLED(zvrf)) {
zlog_debug("EVPN GW-MACIP Adv for non-EVPN VRF %u", if (IS_ZEBRA_DEBUG_VXLAN)
zvrf_id(zvrf)); zlog_debug("EVPN GW-MACIP Adv for non-EVPN VRF %u", zvrf_id(zvrf));
return; return;
} }
@ -5523,8 +5526,8 @@ void zebra_vxlan_advertise_gw_macip(ZAPI_HANDLER_ARGS)
struct interface *ifp = NULL; struct interface *ifp = NULL;
if (!EVPN_ENABLED(zvrf)) { if (!EVPN_ENABLED(zvrf)) {
zlog_debug("EVPN GW-MACIP Adv for non-EVPN VRF %u", if (IS_ZEBRA_DEBUG_VXLAN)
zvrf_id(zvrf)); zlog_debug("EVPN GW-MACIP Adv for non-EVPN VRF %u", zvrf_id(zvrf));
return; return;
} }
@ -6296,8 +6299,8 @@ void zebra_vlan_dplane_result(struct zebra_dplane_ctx *ctx)
ifp = if_lookup_by_index_per_ns(zebra_ns_lookup(ns_id), ifindex); ifp = if_lookup_by_index_per_ns(zebra_ns_lookup(ns_id), ifindex);
if (!ifp) { if (!ifp) {
zlog_debug("Cannot find bridge-vlan IF (%u) for vlan update", if (IS_ZEBRA_DEBUG_VXLAN)
ifindex); zlog_debug("Cannot find bridge-vlan IF (%u) for vlan update", ifindex);
return; return;
} }