proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 12:25:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7992 from donaldsharp/bgp_locks

Browse Source 
bgpd: Centralize the dest unlocking for adj_out data structure
This commit is contained in:
Donatas Abraitis 2021-02-02 09:13:33 +02:00 committed by GitHub
commit c601ca8d4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bgpd/bgp_updgrp_adv.c
View File

@ -95,6 +95,10 @@ static void adj_free(struct bgp_adj_out *adj)
{ {
TAILQ_REMOVE(&(adj->subgroup->adjq), adj, subgrp_adj_train); TAILQ_REMOVE(&(adj->subgroup->adjq), adj, subgrp_adj_train);
SUBGRP_DECR_STAT(adj->subgroup, adj_count); SUBGRP_DECR_STAT(adj->subgroup, adj_count);
RB_REMOVE(bgp_adj_out_rb, &adj->dest->adj_out, adj);
bgp_dest_unlock_node(adj->dest);
XFREE(MTYPE_BGP_ADJ_OUT, adj); XFREE(MTYPE_BGP_ADJ_OUT, adj);
} }
@ -402,11 +406,9 @@ struct bgp_adj_out *bgp_adj_out_alloc(struct update_subgroup *subgrp,
adj->subgroup = subgrp; adj->subgroup = subgrp;
adj->addpath_tx_id = addpath_tx_id; adj->addpath_tx_id = addpath_tx_id;
if (dest) {
RB_INSERT(bgp_adj_out_rb, &dest->adj_out, adj); RB_INSERT(bgp_adj_out_rb, &dest->adj_out, adj);
bgp_dest_lock_node(dest); bgp_dest_lock_node(dest);
adj->dest = dest; adj->dest = dest;
}
TAILQ_INSERT_TAIL(&(subgrp->adjq), adj, subgrp_adj_train); TAILQ_INSERT_TAIL(&(subgrp->adjq), adj, subgrp_adj_train);
SUBGRP_INCR_STAT(subgrp, adj_count); SUBGRP_INCR_STAT(subgrp, adj_count);
@ -601,13 +603,8 @@ void bgp_adj_out_unset_subgroup(struct bgp_dest *dest,
if (trigger_write) if (trigger_write)
subgroup_trigger_write(subgrp); subgroup_trigger_write(subgrp);
} else { } else {
/* Remove myself from adjacency. */
RB_REMOVE(bgp_adj_out_rb, &dest->adj_out, adj);
/* Free allocated information. */ /* Free allocated information. */
adj_free(adj); adj_free(adj);
bgp_dest_unlock_node(dest);
} }
} }
@ -623,7 +620,6 @@ void bgp_adj_out_remove_subgroup(struct bgp_dest *dest, struct bgp_adj_out *adj,
if (adj->adv) if (adj->adv)
bgp_advertise_clean_subgroup(subgrp, adj); bgp_advertise_clean_subgroup(subgrp, adj);
RB_REMOVE(bgp_adj_out_rb, &dest->adj_out, adj);
adj_free(adj); adj_free(adj);
} }
@ -635,11 +631,8 @@ void subgroup_clear_table(struct update_subgroup *subgrp)
{ {
struct bgp_adj_out *aout, *taout; struct bgp_adj_out *aout, *taout;
SUBGRP_FOREACH_ADJ_SAFE (subgrp, aout, taout) { SUBGRP_FOREACH_ADJ_SAFE (subgrp, aout, taout)
struct bgp_dest *dest = aout->dest; bgp_adj_out_remove_subgroup(aout->dest, aout, subgrp);
bgp_adj_out_remove_subgroup(dest, aout, subgrp);
bgp_dest_unlock_node(dest);
}
} }
/* /*
@ -927,14 +920,8 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
bgp_advertise_clean_subgroup( bgp_advertise_clean_subgroup(
subgrp, adj); subgrp, adj);
/* Remove from adjacency. */
RB_REMOVE(bgp_adj_out_rb,
&dest->adj_out, adj);
/* Free allocated information. */ /* Free allocated information. */
adj_free(adj); adj_free(adj);
bgp_dest_unlock_node(dest);
} }
} }

1
bgpd/bgp_updgrp_packet.c
View File

@ -1041,7 +1041,6 @@ struct bpacket *subgroup_withdraw_packet(struct update_subgroup *subgrp)
subgrp->scount--; subgrp->scount--;
bgp_adj_out_remove_subgroup(dest, adj, subgrp); bgp_adj_out_remove_subgroup(dest, adj, subgrp);
bgp_dest_unlock_node(dest);
} }
if (!stream_empty(s)) { if (!stream_empty(s)) {