From 6288ebcf22af232a74dcca95eb377042c26381bc Mon Sep 17 00:00:00 2001 From: sarita patra Date: Wed, 27 Apr 2022 01:31:06 -0700 Subject: [PATCH] pimd: Handle rpf_addr in pim nht Signed-off-by: sarita patra --- pimd/pim_nht.c | 127 ++++++++++++++++++++++--------------------------- pimd/pim_nht.h | 10 ++-- 2 files changed, 61 insertions(+), 76 deletions(-) diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c index 564d16a60b..95ed09d227 100644 --- a/pimd/pim_nht.c +++ b/pimd/pim_nht.c @@ -52,11 +52,11 @@ void pim_sendmsg_zebra_rnh(struct pim_instance *pim, struct zclient *zclient, struct pim_nexthop_cache *pnc, int command) { - struct prefix *p; + struct prefix p; int ret; - p = &(pnc->rpf.rpf_addr); - ret = zclient_send_rnh(zclient, command, p, SAFI_UNICAST, false, false, + pim_addr_to_prefix(&p, pnc->rpf.rpf_addr); + ret = zclient_send_rnh(zclient, command, &p, SAFI_UNICAST, false, false, pim->vrf->vrf_id); if (ret == ZCLIENT_SEND_FAILURE) zlog_warn("sendmsg_nexthop: zclient_send_message() failed"); @@ -65,7 +65,7 @@ void pim_sendmsg_zebra_rnh(struct pim_instance *pim, struct zclient *zclient, zlog_debug( "%s: NHT %sregistered addr %pFX(%s) with Zebra ret:%d ", __func__, - (command == ZEBRA_NEXTHOP_REGISTER) ? " " : "de", p, + (command == ZEBRA_NEXTHOP_REGISTER) ? " " : "de", &p, pim->vrf->name, ret); return; @@ -98,7 +98,7 @@ static struct pim_nexthop_cache *pim_nexthop_cache_add(struct pim_instance *pim, pnc->rp_list = list_new(); pnc->rp_list->cmp = pim_rp_list_cmp; - snprintfrr(hash_name, sizeof(hash_name), "PNC %pFX(%s) Upstream Hash", + snprintfrr(hash_name, sizeof(hash_name), "PNC %pPA(%s) Upstream Hash", &pnc->rpf.rpf_addr, pim->vrf->name); pnc->upstream_hash = hash_create_size(8192, pim_upstream_hash_key, pim_upstream_equal, hash_name); @@ -107,7 +107,7 @@ static struct pim_nexthop_cache *pim_nexthop_cache_add(struct pim_instance *pim, } static struct pim_nexthop_cache *pim_nht_get(struct pim_instance *pim, - struct prefix *addr) + pim_addr *addr) { struct pim_nexthop_cache *pnc = NULL; struct pim_rpf rpf; @@ -124,7 +124,7 @@ static struct pim_nexthop_cache *pim_nht_get(struct pim_instance *pim, ZEBRA_NEXTHOP_REGISTER); if (PIM_DEBUG_PIM_NHT_DETAIL) zlog_debug( - "%s: NHT cache and zebra notification added for %pFX(%s)", + "%s: NHT cache and zebra notification added for %pPA(%s)", __func__, addr, pim->vrf->name); } @@ -134,7 +134,7 @@ static struct pim_nexthop_cache *pim_nht_get(struct pim_instance *pim, /* TBD: this does several distinct things and should probably be split up. * (checking state vs. returning pnc vs. adding upstream vs. adding rp) */ -int pim_find_or_track_nexthop(struct pim_instance *pim, struct prefix *addr, +int pim_find_or_track_nexthop(struct pim_instance *pim, pim_addr *addr, struct pim_upstream *up, struct rp_info *rp, struct pim_nexthop_cache *out_pnc) { @@ -143,7 +143,7 @@ int pim_find_or_track_nexthop(struct pim_instance *pim, struct prefix *addr, pnc = pim_nht_get(pim, addr); - assertf(up || rp, "addr=%pFX", addr); + assertf(up || rp, "addr=%pPA", addr); if (rp != NULL) { ch_node = listnode_lookup(pnc->rp_list, rp); @@ -167,13 +167,11 @@ int pim_find_or_track_nexthop(struct pim_instance *pim, struct prefix *addr, void pim_nht_bsr_add(struct pim_instance *pim, struct in_addr addr) { struct pim_nexthop_cache *pnc; - struct prefix pfx; + pim_addr rpf_addr; - pfx.family = AF_INET; - pfx.prefixlen = IPV4_MAX_BITLEN; - pfx.u.prefix4 = addr; + rpf_addr = addr; - pnc = pim_nht_get(pim, &pfx); + pnc = pim_nht_get(pim, &rpf_addr); pnc->bsr_count++; } @@ -184,7 +182,7 @@ static void pim_nht_drop_maybe(struct pim_instance *pim, { if (PIM_DEBUG_PIM_NHT) zlog_debug( - "%s: NHT %pFX(%s) rp_list count:%d upstream count:%ld BSR count:%u", + "%s: NHT %pPA(%s) rp_list count:%d upstream count:%ld BSR count:%u", __func__, &pnc->rpf.rpf_addr, pim->vrf->name, pnc->rp_list->count, pnc->upstream_hash->count, pnc->bsr_count); @@ -206,7 +204,7 @@ static void pim_nht_drop_maybe(struct pim_instance *pim, } } -void pim_delete_tracked_nexthop(struct pim_instance *pim, struct prefix *addr, +void pim_delete_tracked_nexthop(struct pim_instance *pim, pim_addr *addr, struct pim_upstream *up, struct rp_info *rp) { struct pim_nexthop_cache *pnc = NULL; @@ -217,7 +215,7 @@ void pim_delete_tracked_nexthop(struct pim_instance *pim, struct prefix *addr, lookup.rpf.rpf_addr = *addr; pnc = hash_lookup(pim->rpf_hash, &lookup); if (!pnc) { - zlog_warn("attempting to delete nonexistent NHT entry %pFX", + zlog_warn("attempting to delete nonexistent NHT entry %pPA", addr); return; } @@ -261,9 +259,7 @@ void pim_nht_bsr_del(struct pim_instance *pim, struct in_addr addr) if (addr.s_addr == INADDR_ANY) return; - lookup.rpf.rpf_addr.family = AF_INET; - lookup.rpf.rpf_addr.prefixlen = IPV4_MAX_BITLEN; - lookup.rpf.rpf_addr.u.prefix4 = addr; + lookup.rpf.rpf_addr = addr; pnc = hash_lookup(pim->rpf_hash, &lookup); @@ -288,9 +284,7 @@ bool pim_nht_bsr_rpf_check(struct pim_instance *pim, struct in_addr bsr_addr, struct nexthop *nh; struct interface *ifp; - lookup.rpf.rpf_addr.family = AF_INET; - lookup.rpf.rpf_addr.prefixlen = IPV4_MAX_BITLEN; - lookup.rpf.rpf_addr.u.prefix4 = bsr_addr; + lookup.rpf.rpf_addr = bsr_addr; pnc = hash_lookup(pim->rpf_hash, &lookup); if (!pnc || !CHECK_FLAG(pnc->flags, PIM_NEXTHOP_ANSWER_RECEIVED)) { @@ -497,9 +491,8 @@ uint32_t pim_compute_ecmp_hash(struct prefix *src, struct prefix *grp) static int pim_ecmp_nexthop_search(struct pim_instance *pim, struct pim_nexthop_cache *pnc, - struct pim_nexthop *nexthop, - struct prefix *src, struct prefix *grp, - int neighbor_needed) + struct pim_nexthop *nexthop, pim_addr *src, + struct prefix *grp, int neighbor_needed) { struct pim_neighbor *nbrs[router->multipath], *nbr = NULL; struct interface *ifps[router->multipath]; @@ -510,7 +503,6 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim, uint8_t nh_iter = 0, found = 0; uint32_t i, num_nbrs = 0; pim_addr nh_addr = nexthop->mrib_nexthop_addr; - pim_addr src_addr = pim_addr_from_prefix(src); pim_addr grp_addr = pim_addr_from_prefix(grp); if (!pnc || !pnc->nexthop_num || !nexthop) @@ -544,7 +536,7 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim, if (curr_route_valid && !pim_if_connected_to_source(nexthop->interface, - src_addr)) { + *src)) { nbr = pim_neighbor_find( nexthop->interface, nexthop->mrib_nexthop_addr); @@ -565,7 +557,7 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim, if (PIM_DEBUG_PIM_NHT) zlog_debug( "%s: (%pPA,%pPA)(%s) current nexthop %s is valid, skipping new path selection", - __func__, &src_addr, + __func__, src, &grp_addr, pim->vrf->name, nexthop->interface->name); @@ -591,11 +583,12 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim, #endif nbrs[i] = pim_neighbor_find(ifps[i], nhaddr); if (nbrs[i] || - pim_if_connected_to_source(ifps[i], src_addr)) + pim_if_connected_to_source(ifps[i], *src)) num_nbrs++; } } if (pim->ecmp_enable) { + struct prefix src_pfx; uint32_t consider = pnc->nexthop_num; if (neighbor_needed && num_nbrs < consider) @@ -605,7 +598,8 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim, return 0; // PIM ECMP flag is enable then choose ECMP path. - hash_val = pim_compute_ecmp_hash(src, grp); + pim_addr_to_prefix(&src_pfx, *src); + hash_val = pim_compute_ecmp_hash(&src_pfx, grp); mod_val = hash_val % consider; } @@ -617,8 +611,8 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim, if (PIM_DEBUG_PIM_NHT) zlog_debug( "%s %s: could not find interface for ifindex %d (address %pPA(%s))", - __FILE__, __func__, first_ifindex, - &src_addr, pim->vrf->name); + __FILE__, __func__, first_ifindex, src, + pim->vrf->name); if (nh_iter == mod_val) mod_val++; // Select nexthpath nh_iter++; @@ -629,15 +623,14 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim, zlog_debug( "%s: multicast not enabled on input interface %s(%s) (ifindex=%d, RPF for source %pPA)", __func__, ifp->name, pim->vrf->name, - first_ifindex, &src_addr); + first_ifindex, src); if (nh_iter == mod_val) mod_val++; // Select nexthpath nh_iter++; continue; } - if (neighbor_needed && - !pim_if_connected_to_source(ifp, src_addr)) { + if (neighbor_needed && !pim_if_connected_to_source(ifp, *src)) { nbr = nbrs[nh_iter]; if (!nbr && !if_is_loopback(ifp)) { if (PIM_DEBUG_PIM_NHT) @@ -661,14 +654,14 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim, #endif nexthop->mrib_metric_preference = pnc->distance; nexthop->mrib_route_metric = pnc->metric; - nexthop->last_lookup = src_addr; + nexthop->last_lookup = *src; nexthop->last_lookup_time = pim_time_monotonic_usec(); nexthop->nbr = nbr; found = 1; if (PIM_DEBUG_PIM_NHT) zlog_debug( "%s: (%pPA,%pPA)(%s) selected nhop interface %s addr %pPAs mod_val %u iter %d ecmp %d", - __func__, &src_addr, &grp_addr, + __func__, src, &grp_addr, pim->vrf->name, ifp->name, &nh_addr, mod_val, nh_iter, pim->ecmp_enable); } @@ -708,12 +701,12 @@ int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS) } if (cmd == ZEBRA_NEXTHOP_UPDATE) { - prefix_copy(&rpf.rpf_addr, &match); + rpf.rpf_addr = pim_addr_from_prefix(&match); pnc = pim_nexthop_cache_find(pim, &rpf); if (!pnc) { if (PIM_DEBUG_PIM_NHT) zlog_debug( - "%s: Skipping NHT update, addr %pFX is not in local cached DB.", + "%s: Skipping NHT update, addr %pPA is not in local cached DB.", __func__, &rpf.rpf_addr); return 0; } @@ -740,12 +733,10 @@ int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS) */ #if PIM_IPV == 4 nexthop->type = NEXTHOP_TYPE_IPV4_IFINDEX; - nexthop->gate.ipv4 = - pnc->rpf.rpf_addr.u.prefix4; + nexthop->gate.ipv4 = pnc->rpf.rpf_addr; #else nexthop->type = NEXTHOP_TYPE_IPV6_IFINDEX; - nexthop->gate.ipv6 = - pnc->rpf.rpf_addr.u.prefix6; + nexthop->gate.ipv6 = pnc->rpf.rpf_addr; #endif break; #if PIM_IPV == 4 @@ -884,7 +875,7 @@ int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS) } int pim_ecmp_nexthop_lookup(struct pim_instance *pim, - struct pim_nexthop *nexthop, struct prefix *src, + struct pim_nexthop *nexthop, pim_addr *src, struct prefix *grp, int neighbor_needed) { struct pim_nexthop_cache *pnc; @@ -898,11 +889,10 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim, uint8_t i = 0; uint32_t hash_val = 0, mod_val = 0; uint32_t num_nbrs = 0; - pim_addr src_addr = pim_addr_from_prefix(src); if (PIM_DEBUG_PIM_NHT_DETAIL) zlog_debug("%s: Looking up: %pPA(%s), last lookup time: %lld", - __func__, &src_addr, pim->vrf->name, + __func__, src, pim->vrf->name, nexthop->last_lookup_time); rpf.rpf_addr = *src; @@ -917,13 +907,13 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim, memset(nexthop_tab, 0, sizeof(struct pim_zlookup_nexthop) * router->multipath); num_ifindex = - zclient_lookup_nexthop(pim, nexthop_tab, router->multipath, - src_addr, PIM_NEXTHOP_LOOKUP_MAX); + zclient_lookup_nexthop(pim, nexthop_tab, router->multipath, src, + PIM_NEXTHOP_LOOKUP_MAX); if (num_ifindex < 1) { if (PIM_DEBUG_PIM_NHT) zlog_warn( "%s: could not find nexthop ifindex for address %pPA(%s)", - __func__, &src_addr, pim->vrf->name); + __func__, src, pim->vrf->name); return 0; } @@ -941,13 +931,14 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim, nbrs[i] = pim_neighbor_find( ifps[i], nexthop_tab[i].nexthop_addr); if (nbrs[i] || - pim_if_connected_to_source(ifps[i], src_addr)) + pim_if_connected_to_source(ifps[i], *src)) num_nbrs++; } } // If PIM ECMP enable then choose ECMP path. if (pim->ecmp_enable) { + struct prefix src_pfx; uint32_t consider = num_ifindex; if (neighbor_needed && num_nbrs < consider) @@ -956,7 +947,8 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim, if (consider == 0) return 0; - hash_val = pim_compute_ecmp_hash(src, grp); + pim_addr_to_prefix(&src_pfx, *src); + hash_val = pim_compute_ecmp_hash(&src_pfx, grp); mod_val = hash_val % consider; if (PIM_DEBUG_PIM_NHT_DETAIL) zlog_debug("%s: hash_val %u mod_val %u", __func__, @@ -972,8 +964,8 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim, if (PIM_DEBUG_PIM_NHT) zlog_debug( "%s %s: could not find interface for ifindex %d (address %pPA(%s))", - __FILE__, __func__, first_ifindex, - &src_addr, pim->vrf->name); + __FILE__, __func__, first_ifindex, src, + pim->vrf->name); if (i == mod_val) mod_val++; i++; @@ -985,14 +977,13 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim, zlog_debug( "%s: multicast not enabled on input interface %s(%s) (ifindex=%d, RPF for source %pPA)", __func__, ifp->name, pim->vrf->name, - first_ifindex, &src_addr); + first_ifindex, src); if (i == mod_val) mod_val++; i++; continue; } - if (neighbor_needed && - !pim_if_connected_to_source(ifp, src_addr)) { + if (neighbor_needed && !pim_if_connected_to_source(ifp, *src)) { nbr = nbrs[i]; if (PIM_DEBUG_PIM_NHT_DETAIL) zlog_debug("ifp name: %s(%s), pim nbr: %p", @@ -1005,8 +996,7 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim, "%s: NBR (%pPA) not found on input interface %s(%s) (RPF for source %pPA)", __func__, &nexthop_tab[i].nexthop_addr, - ifp->name, pim->vrf->name, - &src_addr); + ifp->name, pim->vrf->name, src); i++; continue; } @@ -1017,7 +1007,7 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim, zlog_debug( "%s: found nhop %pPA for addr %pPA interface %s(%s) metric %d dist %d", __func__, &nexthop_tab[i].nexthop_addr, - &src_addr, ifp->name, pim->vrf->name, + src, ifp->name, pim->vrf->name, nexthop_tab[i].route_metric, nexthop_tab[i].protocol_distance); /* update nexthop data */ @@ -1028,7 +1018,7 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim, nexthop_tab[i].protocol_distance; nexthop->mrib_route_metric = nexthop_tab[i].route_metric; - nexthop->last_lookup = src_addr; + nexthop->last_lookup = *src; nexthop->last_lookup_time = pim_time_monotonic_usec(); nexthop->nbr = nbr; found = 1; @@ -1042,24 +1032,19 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim, return 0; } -int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim, - struct prefix *src, struct prefix *grp) +int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim, pim_addr *src, + struct prefix *grp) { struct pim_nexthop nhop; int vif_index; ifindex_t ifindex; - pim_addr src_addr; - - if (PIM_DEBUG_PIM_NHT_DETAIL) { - src_addr = pim_addr_from_prefix(src); - } memset(&nhop, 0, sizeof(nhop)); if (!pim_ecmp_nexthop_lookup(pim, &nhop, src, grp, 1)) { if (PIM_DEBUG_PIM_NHT) zlog_debug( "%s: could not find nexthop ifindex for address %pPA(%s)", - __func__, &src_addr, pim->vrf->name); + __func__, src, pim->vrf->name); return -1; } @@ -1069,7 +1054,7 @@ int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim, "%s: found nexthop ifindex=%d (interface %s(%s)) for address %pPA", __func__, ifindex, ifindex2ifname(ifindex, pim->vrf->vrf_id), - pim->vrf->name, &src_addr); + pim->vrf->name, src); vif_index = pim_if_find_vifindex_by_ifindex(pim, ifindex); @@ -1077,7 +1062,7 @@ int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim, if (PIM_DEBUG_PIM_NHT) { zlog_debug( "%s: low vif_index=%d(%s) < 1 nexthop for address %pPA", - __func__, vif_index, pim->vrf->name, &src_addr); + __func__, vif_index, pim->vrf->name, src); } return -2; } diff --git a/pimd/pim_nht.h b/pimd/pim_nht.h index d51f622ece..65cffdb595 100644 --- a/pimd/pim_nht.h +++ b/pimd/pim_nht.h @@ -54,21 +54,21 @@ struct pim_nexthop_cache { }; int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS); -int pim_find_or_track_nexthop(struct pim_instance *pim, struct prefix *addr, +int pim_find_or_track_nexthop(struct pim_instance *pim, pim_addr *addr, struct pim_upstream *up, struct rp_info *rp, struct pim_nexthop_cache *out_pnc); -void pim_delete_tracked_nexthop(struct pim_instance *pim, struct prefix *addr, +void pim_delete_tracked_nexthop(struct pim_instance *pim, pim_addr *addr, struct pim_upstream *up, struct rp_info *rp); struct pim_nexthop_cache *pim_nexthop_cache_find(struct pim_instance *pim, struct pim_rpf *rpf); uint32_t pim_compute_ecmp_hash(struct prefix *src, struct prefix *grp); int pim_ecmp_nexthop_lookup(struct pim_instance *pim, - struct pim_nexthop *nexthop, struct prefix *src, + struct pim_nexthop *nexthop, pim_addr *src, struct prefix *grp, int neighbor_needed); void pim_sendmsg_zebra_rnh(struct pim_instance *pim, struct zclient *zclient, struct pim_nexthop_cache *pnc, int command); -int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim, - struct prefix *src, struct prefix *grp); +int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim, pim_addr *src, + struct prefix *grp); void pim_rp_nexthop_del(struct rp_info *rp_info); /* for RPF check on BSM message receipt */ -- 2.39.5