proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-02 21:06:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6853 from mjstapp/fix_rib_dups

Browse Source 
zebra: reduce impact of route-update overload
This commit is contained in:
Donald Sharp 2021-01-13 09:42:34 -05:00 committed by GitHub
commit 1afacb94e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 56 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
zebra/zebra_dplane.c
View File

@ -3684,7 +3684,7 @@ int dplane_show_helper(struct vty *vty, bool detailed)
int dplane_show_provs_helper(struct vty *vty, bool detailed) int dplane_show_provs_helper(struct vty *vty, bool detailed)
{ {
struct zebra_dplane_provider *prov; struct zebra_dplane_provider *prov;
uint64_t in, in_max, out, out_max; uint64_t in, in_q, in_max, out, out_q, out_max;
vty_out(vty, "Zebra dataplane providers:\n"); vty_out(vty, "Zebra dataplane providers:\n");
@ -3697,17 +3697,20 @@ int dplane_show_provs_helper(struct vty *vty, bool detailed)
in = atomic_load_explicit(&prov->dp_in_counter, in = atomic_load_explicit(&prov->dp_in_counter,
memory_order_relaxed); memory_order_relaxed);
in_q = atomic_load_explicit(&prov->dp_in_queued,
memory_order_relaxed);
in_max = atomic_load_explicit(&prov->dp_in_max, in_max = atomic_load_explicit(&prov->dp_in_max,
memory_order_relaxed); memory_order_relaxed);
out = atomic_load_explicit(&prov->dp_out_counter, out = atomic_load_explicit(&prov->dp_out_counter,
memory_order_relaxed); memory_order_relaxed);
out_q = atomic_load_explicit(&prov->dp_out_queued,
memory_order_relaxed);
out_max = atomic_load_explicit(&prov->dp_out_max, out_max = atomic_load_explicit(&prov->dp_out_max,
memory_order_relaxed); memory_order_relaxed);
vty_out(vty, vty_out(vty, "%s (%u): in: %"PRIu64", q: %"PRIu64", q_max: %"PRIu64", out: %"PRIu64", q: %"PRIu64", q_max: %"PRIu64"\n",
"%s (%u): in: %" PRIu64 ", q_max: %" PRIu64 prov->dp_name, prov->dp_id, in, in_q, in_max,
", out: %" PRIu64 ", q_max: %" PRIu64 "\n", out, out_q, out_max);
prov->dp_name, prov->dp_id, in, in_max, out, out_max);
DPLANE_LOCK(); DPLANE_LOCK();
prov = TAILQ_NEXT(prov, dp_prov_link); prov = TAILQ_NEXT(prov, dp_prov_link);
@ -3912,11 +3915,24 @@ uint32_t dplane_provider_out_ctx_queue_len(struct zebra_dplane_provider *prov)
void dplane_provider_enqueue_out_ctx(struct zebra_dplane_provider *prov, void dplane_provider_enqueue_out_ctx(struct zebra_dplane_provider *prov,
struct zebra_dplane_ctx *ctx) struct zebra_dplane_ctx *ctx)
{ {
uint64_t curr, high;
dplane_provider_lock(prov); dplane_provider_lock(prov);
TAILQ_INSERT_TAIL(&(prov->dp_ctx_out_q), ctx, TAILQ_INSERT_TAIL(&(prov->dp_ctx_out_q), ctx,
zd_q_entries); zd_q_entries);
/* Maintain out-queue counters */
atomic_fetch_add_explicit(&(prov->dp_out_queued), 1,
memory_order_relaxed);
curr = atomic_load_explicit(&prov->dp_out_queued,
memory_order_relaxed);
high = atomic_load_explicit(&prov->dp_out_max,
memory_order_relaxed);
if (curr > high)
atomic_store_explicit(&prov->dp_out_max, curr,
memory_order_relaxed);
dplane_provider_unlock(prov); dplane_provider_unlock(prov);
atomic_fetch_add_explicit(&(prov->dp_out_counter), 1, atomic_fetch_add_explicit(&(prov->dp_out_counter), 1,

41
zebra/zebra_rib.c
View File

@ -2941,8 +2941,10 @@ int rib_add_multipath_nhe(afi_t afi, safi_t safi, struct prefix *p,
struct nhg_hash_entry *nhe = NULL; struct nhg_hash_entry *nhe = NULL;
struct route_table *table; struct route_table *table;
struct route_node *rn; struct route_node *rn;
struct route_entry *same = NULL; struct route_entry *same = NULL, *first_same = NULL;
int ret = 0; int ret = 0;
int same_count = 0;
rib_dest_t *dest;
if (!re || !re_nhe) if (!re || !re_nhe)
return -1; return -1;
@ -3010,14 +3012,22 @@ int rib_add_multipath_nhe(afi_t afi, safi_t safi, struct prefix *p,
* for the install don't do a route replace. * for the install don't do a route replace.
*/ */
RNODE_FOREACH_RE (rn, same) { RNODE_FOREACH_RE (rn, same) {
if (CHECK_FLAG(same->status, ROUTE_ENTRY_REMOVED)) if (CHECK_FLAG(same->status, ROUTE_ENTRY_REMOVED)) {
same_count++;
continue; continue;
}
/* Compare various route_entry properties */ /* Compare various route_entry properties */
if (rib_compare_routes(re, same)) if (rib_compare_routes(re, same)) {
break; same_count++;
if (first_same == NULL)
first_same = same;
}
} }
same = first_same;
/* If this route is kernel/connected route, notify the dataplane. */ /* If this route is kernel/connected route, notify the dataplane. */
if (RIB_SYSTEM_ROUTE(re)) { if (RIB_SYSTEM_ROUTE(re)) {
/* Notify dataplane */ /* Notify dataplane */
@ -3027,8 +3037,9 @@ int rib_add_multipath_nhe(afi_t afi, safi_t safi, struct prefix *p,
/* Link new re to node.*/ /* Link new re to node.*/
if (IS_ZEBRA_DEBUG_RIB) { if (IS_ZEBRA_DEBUG_RIB) {
rnode_debug(rn, re->vrf_id, rnode_debug(rn, re->vrf_id,
"Inserting route rn %p, re %p (%s) existing %p", "Inserting route rn %p, re %p (%s) existing %p, same_count %d",
rn, re, zebra_route_string(re->type), same); rn, re, zebra_route_string(re->type), same,
same_count);
if (IS_ZEBRA_DEBUG_RIB_DETAILED) if (IS_ZEBRA_DEBUG_RIB_DETAILED)
route_entry_dump(p, src_p, re); route_entry_dump(p, src_p, re);
@ -3042,6 +3053,24 @@ int rib_add_multipath_nhe(afi_t afi, safi_t safi, struct prefix *p,
if (same) if (same)
rib_delnode(rn, same); rib_delnode(rn, same);
/* See if we can remove some RE entries that are queued for
* removal, but won't be considered in rib processing.
*/
dest = rib_dest_from_rnode(rn);
RNODE_FOREACH_RE_SAFE (rn, re, same) {
if (CHECK_FLAG(re->status, ROUTE_ENTRY_REMOVED)) {
/* If the route was used earlier, must retain it. */
if (dest && re == dest->selected_fib)
continue;
if (IS_ZEBRA_DEBUG_RIB)
rnode_debug(rn, re->vrf_id, "rn %p, removing unneeded re %p",
rn, re);
rib_unlink(rn, re);
}
}
route_unlock_node(rn); route_unlock_node(rn);
return ret; return ret;
} }