matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

bgpd: Convert thread_cancel to THREAD_OFF and use THREAD_ARG

Browse source 
Just convert all uses of thread_cancel to THREAD_OFF.  Additionally
use THREAD_ARG instead of t->arg to get the arguement.  Individual
files should never be accessing thread private data like this.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2022-06-03 10:59:31 -04:00
parent fa5806c318
commit c3aaa89a44
10 changed files with 53 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bgpd/bgp_damp.c
View file

@ -465,7 +465,7 @@ int bgp_damp_disable(struct bgp *bgp, afi_t afi, safi_t safi)
return 0; return 0;
/* Cancel reuse event. */ /* Cancel reuse event. */
thread_cancel(&(bdc->t_reuse)); THREAD_OFF(bdc->t_reuse);
/* Clean BGP dampening information. */ /* Clean BGP dampening information. */
bgp_damp_info_clean(afi, safi); bgp_damp_info_clean(afi, safi);

2
bgpd/bgp_dump.c
View file

@ -702,7 +702,7 @@ static int bgp_dump_unset(struct bgp_dump *bgp_dump)
} }
/* Removing interval event. */ /* Removing interval event. */
thread_cancel(&bgp_dump->t_interval); THREAD_OFF(bgp_dump->t_interval);
bgp_dump->interval = 0; bgp_dump->interval = 0;

2
bgpd/bgp_evpn_mh.c
View file

@ -4952,7 +4952,7 @@ void bgp_evpn_mh_finish(void)
bgp_evpn_es_local_info_clear(es, true); bgp_evpn_es_local_info_clear(es, true);
} }
if (bgp_mh_info->t_cons_check) if (bgp_mh_info->t_cons_check)
thread_cancel(&bgp_mh_info->t_cons_check); THREAD_OFF(bgp_mh_info->t_cons_check);
list_delete(&bgp_mh_info->local_es_list); list_delete(&bgp_mh_info->local_es_list);
list_delete(&bgp_mh_info->pend_es_list); list_delete(&bgp_mh_info->pend_es_list);
list_delete(&bgp_mh_info->ead_es_export_rtl); list_delete(&bgp_mh_info->ead_es_export_rtl);

2
bgpd/bgp_route.c
View file

@ -4744,7 +4744,7 @@ void bgp_stop_announce_route_timer(struct peer_af *paf)
if (!paf->t_announce_route) if (!paf->t_announce_route)
return; return;
thread_cancel(&paf->t_announce_route); THREAD_OFF(paf->t_announce_route);
} }
/* /*

2
bgpd/bgp_updgrp.c
View file

@ -1896,7 +1896,7 @@ void update_group_refresh_default_originate_route_map(struct thread *thread)
bgp = THREAD_ARG(thread); bgp = THREAD_ARG(thread);
update_group_walk(bgp, update_group_default_originate_route_map_walkcb, update_group_walk(bgp, update_group_default_originate_route_map_walkcb,
reason); reason);
thread_cancel(&bgp->t_rmap_def_originate_eval); THREAD_OFF(bgp->t_rmap_def_originate_eval);
bgp_unlock(bgp); bgp_unlock(bgp);
} }

2
bgpd/bgp_vty.c
View file

@ -2055,7 +2055,7 @@ DEFUN (no_bgp_maxmed_onstartup,
/* Cancel max-med onstartup if its on */ /* Cancel max-med onstartup if its on */
if (bgp->t_maxmed_onstartup) { if (bgp->t_maxmed_onstartup) {
thread_cancel(&bgp->t_maxmed_onstartup); THREAD_OFF(bgp->t_maxmed_onstartup);
bgp->maxmed_onstartup_over = 1; bgp->maxmed_onstartup_over = 1;
} }

57
bgpd/rfapi/rfapi_import.c
View file

@ -856,13 +856,11 @@ static void rfapiBgpInfoChainFree(struct bgp_path_info *bpi)
*/ */
if (CHECK_FLAG(bpi->flags, BGP_PATH_REMOVED) if (CHECK_FLAG(bpi->flags, BGP_PATH_REMOVED)
&& bpi->extra->vnc.import.timer) { && bpi->extra->vnc.import.timer) {
struct rfapi_withdraw *wcb =
struct thread **t = THREAD_ARG(bpi->extra->vnc.import.timer);
&(bpi->extra->vnc.import.timer);
struct rfapi_withdraw *wcb = (*t)->arg;
XFREE(MTYPE_RFAPI_WITHDRAW, wcb); XFREE(MTYPE_RFAPI_WITHDRAW, wcb);
thread_cancel(t); THREAD_OFF(bpi->extra->vnc.import.timer);
} }
next = bpi->next; next = bpi->next;
@ -2371,7 +2369,7 @@ static void rfapiMonitorEncapDelete(struct bgp_path_info *vpn_bpi)
*/ */
static void rfapiWithdrawTimerVPN(struct thread *t) static void rfapiWithdrawTimerVPN(struct thread *t)
{ {
struct rfapi_withdraw *wcb = t->arg; struct rfapi_withdraw *wcb = THREAD_ARG(t);
struct bgp_path_info *bpi = wcb->info; struct bgp_path_info *bpi = wcb->info;
struct bgp *bgp = bgp_get_default(); struct bgp *bgp = bgp_get_default();
const struct prefix *p; const struct prefix *p;
@ -2672,7 +2670,7 @@ rfapiWithdrawEncapUpdateCachedUn(struct rfapi_import_table *import_table,
static void rfapiWithdrawTimerEncap(struct thread *t) static void rfapiWithdrawTimerEncap(struct thread *t)
{ {
struct rfapi_withdraw *wcb = t->arg; struct rfapi_withdraw *wcb = THREAD_ARG(t);
struct bgp_path_info *bpi = wcb->info; struct bgp_path_info *bpi = wcb->info;
int was_first_route = 0; int was_first_route = 0;
struct rfapi_monitor_encap *em; struct rfapi_monitor_encap *em;
@ -3089,13 +3087,12 @@ static void rfapiBgpInfoFilteredImportEncap(
*/ */
if (CHECK_FLAG(bpi->flags, BGP_PATH_REMOVED) if (CHECK_FLAG(bpi->flags, BGP_PATH_REMOVED)
&& bpi->extra->vnc.import.timer) { && bpi->extra->vnc.import.timer) {
struct rfapi_withdraw *wcb = THREAD_ARG(
struct thread **t = bpi->extra->vnc.import.timer);
&(bpi->extra->vnc.import.timer);
struct rfapi_withdraw *wcb = (*t)->arg;
XFREE(MTYPE_RFAPI_WITHDRAW, wcb); XFREE(MTYPE_RFAPI_WITHDRAW, wcb);
thread_cancel(t); THREAD_OFF(
bpi->extra->vnc.import.timer);
} }
if (action == FIF_ACTION_UPDATE) { if (action == FIF_ACTION_UPDATE) {
@ -3182,12 +3179,11 @@ static void rfapiBgpInfoFilteredImportEncap(
"%s: removing holddown bpi matching NVE of new route", "%s: removing holddown bpi matching NVE of new route",
__func__); __func__);
if (bpi->extra->vnc.import.timer) { if (bpi->extra->vnc.import.timer) {
struct thread **t = struct rfapi_withdraw *wcb =
&(bpi->extra->vnc.import.timer); THREAD_ARG(bpi->extra->vnc.import.timer);
struct rfapi_withdraw *wcb = (*t)->arg;
XFREE(MTYPE_RFAPI_WITHDRAW, wcb); XFREE(MTYPE_RFAPI_WITHDRAW, wcb);
thread_cancel(t); THREAD_OFF(bpi->extra->vnc.import.timer);
} }
rfapiExpireEncapNow(import_table, rn, bpi); rfapiExpireEncapNow(import_table, rn, bpi);
} }
@ -3543,13 +3539,12 @@ void rfapiBgpInfoFilteredImportVPN(
*/ */
if (CHECK_FLAG(bpi->flags, BGP_PATH_REMOVED) if (CHECK_FLAG(bpi->flags, BGP_PATH_REMOVED)
&& bpi->extra->vnc.import.timer) { && bpi->extra->vnc.import.timer) {
struct rfapi_withdraw *wcb = THREAD_ARG(
struct thread **t = bpi->extra->vnc.import.timer);
&(bpi->extra->vnc.import.timer);
struct rfapi_withdraw *wcb = (*t)->arg;
XFREE(MTYPE_RFAPI_WITHDRAW, wcb); XFREE(MTYPE_RFAPI_WITHDRAW, wcb);
thread_cancel(t); THREAD_OFF(
bpi->extra->vnc.import.timer);
import_table->holddown_count[afi] -= 1; import_table->holddown_count[afi] -= 1;
RFAPI_UPDATE_ITABLE_COUNT( RFAPI_UPDATE_ITABLE_COUNT(
@ -3762,12 +3757,11 @@ void rfapiBgpInfoFilteredImportVPN(
"%s: removing holddown bpi matching NVE of new route", "%s: removing holddown bpi matching NVE of new route",
__func__); __func__);
if (bpi->extra->vnc.import.timer) { if (bpi->extra->vnc.import.timer) {
struct thread **t = struct rfapi_withdraw *wcb =
&(bpi->extra->vnc.import.timer); THREAD_ARG(bpi->extra->vnc.import.timer);
struct rfapi_withdraw *wcb = (*t)->arg;
XFREE(MTYPE_RFAPI_WITHDRAW, wcb); XFREE(MTYPE_RFAPI_WITHDRAW, wcb);
thread_cancel(t); THREAD_OFF(bpi->extra->vnc.import.timer);
} }
rfapiExpireVpnNow(import_table, rn, bpi, 0); rfapiExpireVpnNow(import_table, rn, bpi, 0);
} }
@ -4490,12 +4484,11 @@ static void rfapiDeleteRemotePrefixesIt(
if (!delete_holddown) if (!delete_holddown)
continue; continue;
if (bpi->extra->vnc.import.timer) { if (bpi->extra->vnc.import.timer) {
struct thread **t =
&(bpi->extra->vnc
.import.timer);
struct rfapi_withdraw *wcb = struct rfapi_withdraw *wcb =
(*t)->arg; THREAD_ARG(
bpi->extra->vnc
.import
.timer);
wcb->import_table wcb->import_table
->holddown_count[afi] -= ->holddown_count[afi] -=
@ -4505,7 +4498,9 @@ static void rfapiDeleteRemotePrefixesIt(
afi, 1); afi, 1);
XFREE(MTYPE_RFAPI_WITHDRAW, XFREE(MTYPE_RFAPI_WITHDRAW,
wcb); wcb);
thread_cancel(t); THREAD_OFF(
bpi->extra->vnc.import
.timer);
} }
} else { } else {
if (!delete_active) if (!delete_active)

12
bgpd/rfapi/rfapi_monitor.c
View file

@ -620,7 +620,7 @@ void rfapiMonitorDel(struct bgp *bgp, struct rfapi_descriptor *rfd,
rfapiMonitorDetachImport(m); rfapiMonitorDetachImport(m);
} }
thread_cancel(&m->timer); THREAD_OFF(m->timer);
/* /*
* remove from rfd list * remove from rfd list
@ -657,7 +657,7 @@ int rfapiMonitorDelHd(struct rfapi_descriptor *rfd)
rfapiMonitorDetachImport(m); rfapiMonitorDetachImport(m);
} }
thread_cancel(&m->timer); THREAD_OFF(m->timer);
XFREE(MTYPE_RFAPI_MONITOR, m); XFREE(MTYPE_RFAPI_MONITOR, m);
rn->info = NULL; rn->info = NULL;
@ -691,7 +691,7 @@ int rfapiMonitorDelHd(struct rfapi_descriptor *rfd)
#endif #endif
} }
thread_cancel(&mon_eth->timer); THREAD_OFF(mon_eth->timer);
/* /*
* remove from rfd list * remove from rfd list
@ -733,7 +733,7 @@ void rfapiMonitorResponseRemovalOn(struct bgp *bgp)
static void rfapiMonitorTimerExpire(struct thread *t) static void rfapiMonitorTimerExpire(struct thread *t)
{ {
struct rfapi_monitor_vpn *m = t->arg; struct rfapi_monitor_vpn *m = THREAD_ARG(t);
/* forget reference to thread, it's gone */ /* forget reference to thread, it's gone */
m->timer = NULL; m->timer = NULL;
@ -1039,7 +1039,7 @@ void rfapiMonitorMovedUp(struct rfapi_import_table *import_table,
static void rfapiMonitorEthTimerExpire(struct thread *t) static void rfapiMonitorEthTimerExpire(struct thread *t)
{ {
struct rfapi_monitor_eth *m = t->arg; struct rfapi_monitor_eth *m = THREAD_ARG(t);
/* forget reference to thread, it's gone */ /* forget reference to thread, it's gone */
m->timer = NULL; m->timer = NULL;
@ -1400,7 +1400,7 @@ void rfapiMonitorEthDel(struct bgp *bgp, struct rfapi_descriptor *rfd,
rfapiMonitorEthDetachImport(bgp, val); rfapiMonitorEthDetachImport(bgp, val);
} }
thread_cancel(&val->timer); THREAD_OFF(val->timer);
/* /*
* remove from rfd list * remove from rfd list

22
bgpd/rfapi/rfapi_rib.c
View file

@ -268,8 +268,8 @@ static void rfapi_info_free(struct rfapi_info *goner)
if (goner->timer) { if (goner->timer) {
struct rfapi_rib_tcb *tcb; struct rfapi_rib_tcb *tcb;
tcb = goner->timer->arg; tcb = THREAD_ARG(goner->timer);
thread_cancel(&goner->timer); THREAD_OFF(goner->timer);
XFREE(MTYPE_RFAPI_RECENT_DELETE, tcb); XFREE(MTYPE_RFAPI_RECENT_DELETE, tcb);
} }
XFREE(MTYPE_RFAPI_INFO, goner); XFREE(MTYPE_RFAPI_INFO, goner);
@ -293,7 +293,7 @@ struct rfapi_rib_tcb {
*/ */
static void rfapiRibExpireTimer(struct thread *t) static void rfapiRibExpireTimer(struct thread *t)
{ {
struct rfapi_rib_tcb *tcb = t->arg; struct rfapi_rib_tcb *tcb = THREAD_ARG(t);
RFAPI_RIB_CHECK_COUNTS(1, 0); RFAPI_RIB_CHECK_COUNTS(1, 0);
@ -338,8 +338,8 @@ static void rfapiRibStartTimer(struct rfapi_descriptor *rfd,
struct rfapi_rib_tcb *tcb = NULL; struct rfapi_rib_tcb *tcb = NULL;
if (ri->timer) { if (ri->timer) {
tcb = ri->timer->arg; tcb = THREAD_ARG(ri->timer);
thread_cancel(&ri->timer); THREAD_OFF(ri->timer);
} else { } else {
tcb = XCALLOC(MTYPE_RFAPI_RECENT_DELETE, tcb = XCALLOC(MTYPE_RFAPI_RECENT_DELETE,
sizeof(struct rfapi_rib_tcb)); sizeof(struct rfapi_rib_tcb));
@ -913,8 +913,8 @@ static void process_pending_node(struct bgp *bgp, struct rfapi_descriptor *rfd,
if (ri->timer) { if (ri->timer) {
struct rfapi_rib_tcb *tcb; struct rfapi_rib_tcb *tcb;
tcb = ri->timer->arg; tcb = THREAD_ARG(ri->timer);
thread_cancel(&ri->timer); THREAD_OFF(ri->timer);
XFREE(MTYPE_RFAPI_RECENT_DELETE, tcb); XFREE(MTYPE_RFAPI_RECENT_DELETE, tcb);
} }
@ -998,8 +998,8 @@ static void process_pending_node(struct bgp *bgp, struct rfapi_descriptor *rfd,
if (ori->timer) { if (ori->timer) {
struct rfapi_rib_tcb *tcb; struct rfapi_rib_tcb *tcb;
tcb = ori->timer->arg; tcb = THREAD_ARG(ori->timer);
thread_cancel(&ori->timer); THREAD_OFF(ori->timer);
XFREE(MTYPE_RFAPI_RECENT_DELETE, tcb); XFREE(MTYPE_RFAPI_RECENT_DELETE, tcb);
} }
@ -1342,8 +1342,8 @@ callback:
if (ri->timer) { if (ri->timer) {
struct rfapi_rib_tcb *tcb; struct rfapi_rib_tcb *tcb;
tcb = ri->timer->arg; tcb = THREAD_ARG(ri->timer);
thread_cancel(&ri->timer); THREAD_OFF(ri->timer);
XFREE(MTYPE_RFAPI_RECENT_DELETE, tcb); XFREE(MTYPE_RFAPI_RECENT_DELETE, tcb);
} }
RFAPI_RIB_CHECK_COUNTS(0, delete_list->count); RFAPI_RIB_CHECK_COUNTS(0, delete_list->count);

8
bgpd/rfapi/vnc_export_bgp.c
View file

@ -1712,7 +1712,7 @@ void vnc_direct_bgp_rh_add_route(struct bgp *bgp, afi_t afi,
* export expiration timer is already running on * export expiration timer is already running on
* this route: cancel it * this route: cancel it
*/ */
thread_cancel(&eti->timer); THREAD_OFF(eti->timer);
bgp_update(peer, prefix, /* prefix */ bgp_update(peer, prefix, /* prefix */
0, /* addpath_id */ 0, /* addpath_id */
@ -1726,7 +1726,7 @@ void vnc_direct_bgp_rh_add_route(struct bgp *bgp, afi_t afi,
static void vncExportWithdrawTimer(struct thread *t) static void vncExportWithdrawTimer(struct thread *t)
{ {
struct vnc_export_info *eti = t->arg; struct vnc_export_info *eti = THREAD_ARG(t);
const struct prefix *p = agg_node_get_prefix(eti->node); const struct prefix *p = agg_node_get_prefix(eti->node);
/* /*
@ -1943,7 +1943,7 @@ void vnc_direct_bgp_rh_vpn_enable(struct bgp *bgp, afi_t afi)
* already running on * already running on
* this route: cancel it * this route: cancel it
*/ */
thread_cancel(&eti->timer); THREAD_OFF(eti->timer);
vnc_zlog_debug_verbose( vnc_zlog_debug_verbose(
"%s: calling bgp_update", "%s: calling bgp_update",
@ -2012,7 +2012,7 @@ void vnc_direct_bgp_rh_vpn_disable(struct bgp *bgp, afi_t afi)
ZEBRA_ROUTE_VNC_DIRECT_RH, ZEBRA_ROUTE_VNC_DIRECT_RH,
BGP_ROUTE_REDISTRIBUTE); BGP_ROUTE_REDISTRIBUTE);
if (eti) { if (eti) {
thread_cancel(&eti->timer); THREAD_OFF(eti->timer);
vnc_eti_delete(eti); vnc_eti_delete(eti);
} }