Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bgp_process work #15572

Merged
merged 11 commits into from
Apr 16, 2024
Merged

bgp_process work #15572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4d4c396
tests: Explicitly call out bgp timers for bgp_evpn_mh test
donaldsharp Mar 11, 2024
829a2e9
tests: teste_ospf_rte_calc.py uses bgp add pytest mark
donaldsharp Mar 11, 2024
f4fd5c8
bgpd: Modify update_evpn_type5_route_entry to include path_info pointer
donaldsharp Mar 11, 2024
1389316
bgpd: Fix indentation problem in bgp_recalculate_afi_safi_bestpaths
donaldsharp Mar 6, 2024
19fc4e7
bgpd: Add a path_info_flags dumper for bgp
donaldsharp Mar 1, 2024
6c8bfaa
bgpd: Add BGP_PATH_UNSORTED for future commits
donaldsharp Mar 1, 2024
04936ab
bgpd: Call bgp_process when bgp_path_info_delete is called
donaldsharp Mar 18, 2024
ab49fc9
bgpd: Add pi to bgp_process
donaldsharp Mar 4, 2024
fca8059
bgpd: bgp_best_selection is inherently pi based
donaldsharp Mar 11, 2024
6ebb7ad
bgpd: Do not reap, schedule for deletion
donaldsharp Mar 20, 2024
f3575f6
bgpd: Sort the bgp_path_info's
donaldsharp Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions bgpd/bgp_damp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ static void bgp_reuse_timer(struct event *t)
bgp_aggregate_increment(
bgp, bgp_dest_get_prefix(bdi->dest),
bdi->path, bdi->afi, bdi->safi);
bgp_process(bgp, bdi->dest, bdi->afi,
bgp_process(bgp, bdi->dest, bdi->path, bdi->afi,
bdi->safi);
}

Expand Down Expand Up @@ -306,8 +306,10 @@ void bgp_damp_info_free(struct bgp_damp_info *bdi, int withdraw, afi_t afi,
bgp_path_info_unset_flag(bdi->dest, path,
BGP_PATH_HISTORY | BGP_PATH_DAMPED);

if (bdi->lastrecord == BGP_RECORD_WITHDRAW && withdraw)
if (bdi->lastrecord == BGP_RECORD_WITHDRAW && withdraw) {
bgp_path_info_delete(bdi->dest, path);
bgp_process(path->peer->bgp, bdi->dest, path, afi, safi);
}

XFREE(MTYPE_BGP_DAMP_INFO, bdi);
}
Expand Down
70 changes: 44 additions & 26 deletions bgpd/bgp_evpn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1424,7 +1424,7 @@ static void evpn_delete_old_local_route(struct bgp *bgp, struct bgpevpn *vpn,
* this table.
*/
if (pi)
bgp_process(bgp, global_dest, afi, safi);
bgp_process(bgp, global_dest, pi, afi, safi);
bgp_dest_unlock_node(global_dest);
}

Expand All @@ -1438,14 +1438,29 @@ static void evpn_delete_old_local_route(struct bgp *bgp, struct bgpevpn *vpn,
* Note: vpn is NULL for local EAD-ES routes.
*/
int evpn_route_select_install(struct bgp *bgp, struct bgpevpn *vpn,
struct bgp_dest *dest)
struct bgp_dest *dest, struct bgp_path_info *pi)
{
struct bgp_path_info *old_select, *new_select;
struct bgp_path_info *old_select, *new_select, *first;
struct bgp_path_info_pair old_and_new;
afi_t afi = AFI_L2VPN;
safi_t safi = SAFI_EVPN;
int ret = 0;

first = bgp_dest_get_bgp_path_info(dest);
SET_FLAG(pi->flags, BGP_PATH_UNSORTED);
if (pi != first) {
if (pi->next)
pi->next->prev = pi->prev;
if (pi->prev)
pi->prev->next = pi->next;

if (first)
first->prev = pi;
pi->next = first;
pi->prev = NULL;
bgp_dest_set_bgp_path_info(dest, pi);
}

/* Compute the best path. */
bgp_best_selection(bgp, dest, &bgp->maxpaths[afi][safi], &old_and_new,
afi, safi);
Expand Down Expand Up @@ -1561,7 +1576,8 @@ static struct bgp_path_info *bgp_evpn_route_get_local_path(
static int update_evpn_type5_route_entry(struct bgp *bgp_evpn,
struct bgp *bgp_vrf, afi_t afi,
safi_t safi, struct bgp_dest *dest,
struct attr *attr, int *route_changed)
struct attr *attr, int *route_changed,
struct bgp_path_info **entry)
{
struct attr *attr_new = NULL;
struct bgp_path_info *pi = NULL;
Expand Down Expand Up @@ -1599,8 +1615,8 @@ static int update_evpn_type5_route_entry(struct bgp *bgp_evpn,

/* add the route entry to route node*/
bgp_path_info_add(dest, pi);
*entry = pi;
} else {

tmp_pi = local_pi;
if (!attrhash_cmp(tmp_pi->attr, attr)) {

Expand All @@ -1622,6 +1638,7 @@ static int update_evpn_type5_route_entry(struct bgp *bgp_evpn,
tmp_pi->attr = attr_new;
tmp_pi->uptime = monotime(NULL);
}
*entry = local_pi;
}
return 0;
}
Expand All @@ -1637,6 +1654,7 @@ static int update_evpn_type5_route(struct bgp *bgp_vrf, struct prefix_evpn *evp,
struct bgp_dest *dest = NULL;
struct bgp *bgp_evpn = NULL;
int route_changed = 0;
struct bgp_path_info *pi = NULL;

bgp_evpn = bgp_get_evpn();
if (!bgp_evpn)
Expand Down Expand Up @@ -1718,11 +1736,11 @@ static int update_evpn_type5_route(struct bgp *bgp_vrf, struct prefix_evpn *evp,

/* create or update the route entry within the route node */
update_evpn_type5_route_entry(bgp_evpn, bgp_vrf, afi, safi, dest, &attr,
&route_changed);
&route_changed, &pi);

/* schedule for processing and unlock node */
if (route_changed) {
bgp_process(bgp_evpn, dest, afi, safi);
bgp_process(bgp_evpn, dest, pi, afi, safi);
bgp_dest_unlock_node(dest);
}

Expand Down Expand Up @@ -2222,7 +2240,7 @@ static int update_evpn_route(struct bgp *bgp, struct bgpevpn *vpn,
* route would win, and we should evict the defunct local route
* and (re)install the remote route into zebra.
*/
evpn_route_select_install(bgp, vpn, dest);
evpn_route_select_install(bgp, vpn, dest, pi);
/*
* If the new local route was not selected evict it and tell zebra
* to re-add the best remote dest. BGP doesn't retain non-best local
Expand Down Expand Up @@ -2270,7 +2288,7 @@ static int update_evpn_route(struct bgp *bgp, struct bgpevpn *vpn,
false /* setup_sync */, NULL /* old_is_sync */);

/* Schedule for processing and unlock node. */
bgp_process(bgp, dest, afi, safi);
bgp_process(bgp, dest, global_pi, afi, safi);
bgp_dest_unlock_node(dest);
}

Expand Down Expand Up @@ -2330,7 +2348,7 @@ static int delete_evpn_type5_route(struct bgp *bgp_vrf, struct prefix_evpn *evp)

delete_evpn_route_entry(bgp_evpn, afi, safi, dest, &pi);
if (pi)
bgp_process(bgp_evpn, dest, afi, safi);
bgp_process(bgp_evpn, dest, pi, afi, safi);
bgp_dest_unlock_node(dest);
return 0;
}
Expand Down Expand Up @@ -2370,17 +2388,16 @@ static int delete_evpn_route(struct bgp *bgp, struct bgpevpn *vpn,
* this table.
*/
if (pi)
bgp_process(bgp, global_dest, afi, safi);
bgp_process(bgp, global_dest, pi, afi, safi);
bgp_dest_unlock_node(global_dest);
}

/* Delete route entry in the VNI route table. This can just be removed.
*/
delete_evpn_route_entry(bgp, afi, safi, dest, &pi);
if (pi) {
dest = bgp_path_info_reap(dest, pi);
assert(dest);
evpn_route_select_install(bgp, vpn, dest);
bgp_path_info_delete(dest, pi);
evpn_route_select_install(bgp, vpn, dest, pi);
}

/* dest should still exist due to locking make coverity happy */
Expand Down Expand Up @@ -2494,7 +2511,7 @@ void bgp_evpn_update_type2_route_entry(struct bgp *bgp, struct bgpevpn *vpn,
* advertised to peers; otherwise, ensure it is evicted and
* (re)install the remote route into zebra.
*/
evpn_route_select_install(bgp, vpn, dest);
evpn_route_select_install(bgp, vpn, dest, pi);

if (CHECK_FLAG(pi->flags, BGP_PATH_REMOVED)) {
route_change = 0;
Expand Down Expand Up @@ -2533,7 +2550,7 @@ void bgp_evpn_update_type2_route_entry(struct bgp *bgp, struct bgpevpn *vpn,
NULL /* old_is_sync */);

/* Schedule for processing and unlock node. */
bgp_process(bgp, global_dest, afi, safi);
bgp_process(bgp, global_dest, global_pi, afi, safi);
bgp_dest_unlock_node(global_dest);
}

Expand Down Expand Up @@ -2618,7 +2635,7 @@ static void delete_global_type2_routes(struct bgp *bgp, struct bgpevpn *vpn)

delete_evpn_route_entry(bgp, afi, safi, dest, &pi);
if (pi)
bgp_process(bgp, dest, afi, safi);
bgp_process(bgp, dest, pi, afi, safi);
}

/* Unlock RD node. */
Expand Down Expand Up @@ -3072,7 +3089,7 @@ static int install_evpn_route_entry_in_vrf(struct bgp *bgp_vrf,
safi);

/* Perform route selection and update zebra, if required. */
bgp_process(bgp_vrf, dest, afi, safi);
bgp_process(bgp_vrf, dest, pi, afi, safi);

/* Process for route leaking. */
vpn_leak_from_vrf_update(bgp_get_default(), bgp_vrf, pi);
Expand Down Expand Up @@ -3184,7 +3201,7 @@ static int install_evpn_route_entry_in_vni_common(
bgp_evpn_remote_ip_hash_add(vpn, pi);

/* Perform route selection and update zebra, if required. */
ret = evpn_route_select_install(bgp, vpn, dest);
ret = evpn_route_select_install(bgp, vpn, dest, pi);

/* if the best path is a local path with a non-zero ES
* sync info against the local path may need to be updated
Expand Down Expand Up @@ -3226,7 +3243,7 @@ static int uninstall_evpn_route_entry_in_vni_common(
bgp_path_info_delete(dest, pi);

/* Perform route selection and update zebra, if required. */
ret = evpn_route_select_install(bgp, vpn, dest);
ret = evpn_route_select_install(bgp, vpn, dest, pi);

/* if the best path is a local path with a non-zero ES
* sync info against the local path may need to be updated
Expand Down Expand Up @@ -3434,7 +3451,7 @@ static int uninstall_evpn_route_entry_in_vrf(struct bgp *bgp_vrf,
bgp_evpn_path_nh_del(bgp_vrf, pi);

/* Perform route selection and update zebra, if required. */
bgp_process(bgp_vrf, dest, afi, safi);
bgp_process(bgp_vrf, dest, pi, afi, safi);

/* Unlock route node. */
bgp_dest_unlock_node(dest);
Expand Down Expand Up @@ -4431,7 +4448,7 @@ static void update_advertise_vni_route(struct bgp *bgp, struct bgpevpn *vpn,
}

/* Schedule for processing and unlock node. */
bgp_process(bgp, global_dest, afi, safi);
bgp_process(bgp, global_dest, global_pi, afi, safi);
bgp_dest_unlock_node(global_dest);
}

Expand Down Expand Up @@ -4481,7 +4498,7 @@ static void update_advertise_vni_routes(struct bgp *bgp, struct bgpevpn *vpn)
false /* setup_sync */, NULL /* old_is_sync */);

/* Schedule for processing and unlock node. */
bgp_process(bgp, global_dest, afi, safi);
bgp_process(bgp, global_dest, pi, afi, safi);
bgp_dest_unlock_node(global_dest);
}

Expand Down Expand Up @@ -4526,7 +4543,7 @@ static int delete_withdraw_vni_routes(struct bgp *bgp, struct bgpevpn *vpn)
* this table.
*/
if (pi)
bgp_process(bgp, global_dest, afi, safi);
bgp_process(bgp, global_dest, pi, afi, safi);
bgp_dest_unlock_node(global_dest);
}

Expand Down Expand Up @@ -6425,9 +6442,10 @@ void bgp_filter_evpn_routes_upon_martian_change(

for (dest = bgp_table_top(table); dest;
dest = bgp_route_next(dest)) {
struct bgp_path_info *next;

for (pi = bgp_dest_get_bgp_path_info(dest); pi;
pi = pi->next) {
for (pi = bgp_dest_get_bgp_path_info(dest);
(pi != NULL) && (next = pi->next, 1); pi = next) {
bool affected = false;
const struct prefix *p;

Expand Down
21 changes: 12 additions & 9 deletions bgpd/bgp_evpn_mh.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ static void bgp_evpn_path_nh_unlink(struct bgp_path_evpn_nh_info *nh_info);
*/
static int bgp_evpn_es_route_select_install(struct bgp *bgp,
struct bgp_evpn_es *es,
struct bgp_dest *dest)
struct bgp_dest *dest,
struct bgp_path_info *pi)
{
int ret = 0;
afi_t afi = AFI_L2VPN;
Expand All @@ -100,6 +101,8 @@ static int bgp_evpn_es_route_select_install(struct bgp *bgp,
struct bgp_path_info *new_select; /* new best */
struct bgp_path_info_pair old_and_new;

SET_FLAG(pi->flags, BGP_PATH_UNSORTED);

/* Compute the best path. */
bgp_best_selection(bgp, dest, &bgp->maxpaths[afi][safi], &old_and_new,
afi, safi);
Expand Down Expand Up @@ -231,7 +234,7 @@ static int bgp_evpn_es_route_install(struct bgp *bgp,
}

/* Perform route selection and update zebra, if required. */
ret = bgp_evpn_es_route_select_install(bgp, es, dest);
ret = bgp_evpn_es_route_select_install(bgp, es, dest, pi);

bgp_dest_unlock_node(dest);

Expand Down Expand Up @@ -272,7 +275,7 @@ static int bgp_evpn_es_route_uninstall(struct bgp *bgp, struct bgp_evpn_es *es,
bgp_path_info_delete(dest, pi);

/* Perform route selection and update zebra, if required. */
ret = bgp_evpn_es_route_select_install(bgp, es, dest);
ret = bgp_evpn_es_route_select_install(bgp, es, dest, pi);

/* Unlock route node. */
bgp_dest_unlock_node(dest);
Expand Down Expand Up @@ -511,7 +514,7 @@ static int bgp_evpn_mh_route_delete(struct bgp *bgp, struct bgp_evpn_es *es,
* this table.
*/
if (pi)
bgp_process(bgp, global_dest, afi, safi);
bgp_process(bgp, global_dest, pi, afi, safi);
bgp_dest_unlock_node(global_dest);
}

Expand Down Expand Up @@ -562,7 +565,7 @@ int delete_global_ead_evi_routes(struct bgp *bgp, struct bgpevpn *vpn)

delete_evpn_route_entry(bgp, afi, safi, bd, &pi);
if (pi)
bgp_process(bgp, bd, afi, safi);
bgp_process(bgp, bd, pi, afi, safi);
}
}

Expand Down Expand Up @@ -668,7 +671,7 @@ static int bgp_evpn_type4_route_update(struct bgp *bgp,
* this is just to set the flags correctly
* as local route in the ES always wins.
*/
bgp_evpn_es_route_select_install(bgp, es, dest);
bgp_evpn_es_route_select_install(bgp, es, dest, pi);
bgp_dest_unlock_node(dest);

/* If this is a new route or some attribute has changed, export the
Expand All @@ -686,7 +689,7 @@ static int bgp_evpn_type4_route_update(struct bgp *bgp,
attr_new, &global_pi, &route_changed);

/* Schedule for processing and unlock node. */
bgp_process(bgp, dest, afi, safi);
bgp_process(bgp, dest, global_pi, afi, safi);
bgp_dest_unlock_node(dest);
}

Expand Down Expand Up @@ -1008,7 +1011,7 @@ static int bgp_evpn_type1_route_update(struct bgp *bgp, struct bgp_evpn_es *es,
* this is just to set the flags correctly as local route in
* the ES always wins.
*/
evpn_route_select_install(bgp, vpn, dest);
evpn_route_select_install(bgp, vpn, dest, pi);
bgp_dest_unlock_node(dest);

/* If this is a new route or some attribute has changed, export the
Expand All @@ -1025,7 +1028,7 @@ static int bgp_evpn_type1_route_update(struct bgp *bgp, struct bgp_evpn_es *es,
attr_new, &global_pi, &route_changed);

/* Schedule for processing and unlock node. */
bgp_process(bgp, dest, afi, safi);
bgp_process(bgp, dest, global_pi, afi, safi);
bgp_dest_unlock_node(dest);
}

Expand Down
3 changes: 2 additions & 1 deletion bgpd/bgp_evpn_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,8 @@ extern void delete_evpn_route_entry(struct bgp *bgp, afi_t afi, safi_t safi,
struct bgp_path_info **pi);
int vni_list_cmp(void *p1, void *p2);
extern int evpn_route_select_install(struct bgp *bgp, struct bgpevpn *vpn,
struct bgp_dest *dest);
struct bgp_dest *dest,
struct bgp_path_info *pi);
extern struct bgp_dest *
bgp_evpn_global_node_get(struct bgp_table *table, afi_t afi, safi_t safi,
const struct prefix_evpn *evp, struct prefix_rd *prd,
Expand Down
2 changes: 1 addition & 1 deletion bgpd/bgp_label.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ int bgp_parse_fec_update(void)
bgp_set_valid_label(&dest->local_label);
}
SET_FLAG(dest->flags, BGP_NODE_LABEL_CHANGED);
bgp_process(bgp, dest, afi, safi);
bgp_process(bgp, dest, NULL, afi, safi);
bgp_dest_unlock_node(dest);
return 1;
}
Expand Down
Loading
Loading