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

bgpd: speed up "no-hit" withdraws for routeservers

Browse Source 
This accelerates handling of incoming Withdraw messages for routes that
don't exist in the table to begin with.  Cisco IOS 12.4(24)T4 has a bug
in this regard - it sends withdraws instead of doing nothing for
prefixes that are filtered.

Pulling up the adj_in removal in Quagga should have no ill effect, but
we can avoid the costly iteration over all rsclients if there was no
adj_in entry.

Performance impact of this change on routeserver with 3 buggy peers,
startup/sync time:

before patch:  143.12 seconds (user cpu)
after patch:     7.01 seconds (user cpu)

Many thanks to Nick Hilliard & INEX for providing real-world test data!

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Acked-by: Paul Jakma <paul@jakma.org>
This commit is contained in:
David Lamparter 2015-04-13 09:50:00 +02:00 committed by Donald Sharp
parent 801e0e1492
commit 6b87f73618
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bgpd/bgp_advertise.c
View File

@ -222,7 +222,7 @@ bgp_adj_in_remove (struct bgp_node *rn, struct bgp_adj_in *bai)
XFREE (MTYPE_BGP_ADJ_IN, bai); XFREE (MTYPE_BGP_ADJ_IN, bai);
} }
void int
bgp_adj_in_unset (struct bgp_node *rn, struct peer *peer, bgp_adj_in_unset (struct bgp_node *rn, struct peer *peer,
u_int32_t addpath_id) u_int32_t addpath_id)
{ {
@ -230,6 +230,10 @@ bgp_adj_in_unset (struct bgp_node *rn, struct peer *peer,
struct bgp_adj_in *adj_next; struct bgp_adj_in *adj_next;
adj = rn->adj_in; adj = rn->adj_in;
if (!adj)
return 0;
while (adj) while (adj)
{ {
adj_next = adj->next; adj_next = adj->next;
@ -242,6 +246,8 @@ bgp_adj_in_unset (struct bgp_node *rn, struct peer *peer,
adj = adj_next; adj = adj_next;
} }
return 1;
} }
void void

2
bgpd/bgp_advertise.h
View File

@ -172,7 +172,7 @@ struct bgp_synchronize
/* Prototypes. */ /* Prototypes. */
extern int bgp_adj_out_lookup (struct peer *, struct bgp_node *, u_int32_t); extern int bgp_adj_out_lookup (struct peer *, struct bgp_node *, u_int32_t);
extern void bgp_adj_in_set (struct bgp_node *, struct peer *, struct attr *, u_int32_t); extern void bgp_adj_in_set (struct bgp_node *, struct peer *, struct attr *, u_int32_t);
extern void bgp_adj_in_unset (struct bgp_node *, struct peer *, u_int32_t); extern int bgp_adj_in_unset (struct bgp_node *, struct peer *, u_int32_t);
extern void bgp_adj_in_remove (struct bgp_node *, struct bgp_adj_in *); extern void bgp_adj_in_remove (struct bgp_node *, struct bgp_adj_in *);
extern void bgp_sync_init (struct peer *); extern void bgp_sync_init (struct peer *);

20
bgpd/bgp_route.c
View File

@ -2561,10 +2561,26 @@ bgp_withdraw (struct peer *peer, struct prefix *p, u_int32_t addpath_id,
rn = bgp_afi_node_get (bgp->rib[afi][safi], afi, safi, p, prd); rn = bgp_afi_node_get (bgp->rib[afi][safi], afi, safi, p, prd);
/* If peer is soft reconfiguration enabled. Record input packet for /* If peer is soft reconfiguration enabled. Record input packet for
further calculation. */ * further calculation.
*
* Cisco IOS 12.4(24)T4 on session establishment sends withdraws for all
* routes that are filtered. This tanks out Quagga RS pretty badly due to
* the iteration over all RS clients.
* Since we need to remove the entry from adj_in anyway, do that first and
* if there was no entry, we don't need to do anything more.
*/
if (CHECK_FLAG (peer->af_flags[afi][safi], PEER_FLAG_SOFT_RECONFIG) if (CHECK_FLAG (peer->af_flags[afi][safi], PEER_FLAG_SOFT_RECONFIG)
&& peer != bgp->peer_self) && peer != bgp->peer_self)
bgp_adj_in_unset (rn, peer, addpath_id); if (!bgp_adj_in_unset (rn, peer, addpath_id))
{
if (bgp_debug_update (peer, p, NULL, 1))
zlog_debug ("%s withdrawing route %s/%d "
"not in adj-in", peer->host,
inet_ntop(p->family, &p->u.prefix, buf, SU_ADDRSTRLEN),
p->prefixlen);
bgp_unlock_node (rn);
return 0;
}
/* Lookup withdrawn route. */ /* Lookup withdrawn route. */
for (ri = rn->info; ri; ri = ri->next) for (ri = rn->info; ri; ri = ri->next)