proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-11 15:18:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: update atomic memory orders

Browse Source 
Use best-performing memory orders where appropriate.
Also update some style and add missing comments.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2017-07-05 11:38:57 -04:00
parent 152456fe23
commit 1588f6f441
No known key found for this signature in database
GPG Key ID: DAF48E0F57E0834F
2 changed files with 77 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
bgpd/bgp_io.c
View File

@ -61,10 +61,8 @@ void bgp_io_init()
bgp_io_thread_started = false; bgp_io_thread_started = false;
} }
static int bgp_io_dummy(struct thread *thread) /* Unused callback for thread_add_read() */
{ static int bgp_io_dummy(struct thread *thread) { return 0; }
return 0;
}
void *bgp_io_start(void *arg) void *bgp_io_start(void *arg)
{ {
@ -81,9 +79,9 @@ void *bgp_io_start(void *arg)
struct thread task; struct thread task;
atomic_store_explicit(&bgp_io_thread_run, true, memory_order_relaxed); atomic_store_explicit(&bgp_io_thread_run, true, memory_order_seq_cst);
atomic_store_explicit(&bgp_io_thread_started, true, atomic_store_explicit(&bgp_io_thread_started, true,
memory_order_relaxed); memory_order_seq_cst);
while (bgp_io_thread_run) { while (bgp_io_thread_run) {
if (thread_fetch(fpt->master, &task)) { if (thread_fetch(fpt->master, &task)) {
@ -99,7 +97,7 @@ void *bgp_io_start(void *arg)
static int bgp_io_finish(struct thread *thread) static int bgp_io_finish(struct thread *thread)
{ {
atomic_store_explicit(&bgp_io_thread_run, false, memory_order_relaxed); atomic_store_explicit(&bgp_io_thread_run, false, memory_order_seq_cst);
return 0; return 0;
} }
@ -114,8 +112,8 @@ int bgp_io_stop(void **result, struct frr_pthread *fpt)
void bgp_writes_on(struct peer *peer) void bgp_writes_on(struct peer *peer)
{ {
while (!atomic_load_explicit(&bgp_io_thread_started, while (
memory_order_relaxed)) !atomic_load_explicit(&bgp_io_thread_started, memory_order_seq_cst))
; ;
assert(peer->status != Deleted); assert(peer->status != Deleted);
@ -134,8 +132,8 @@ void bgp_writes_on(struct peer *peer)
void bgp_writes_off(struct peer *peer) void bgp_writes_off(struct peer *peer)
{ {
while (!atomic_load_explicit(&bgp_io_thread_started, while (
memory_order_relaxed)) !atomic_load_explicit(&bgp_io_thread_started, memory_order_seq_cst))
; ;
struct frr_pthread *fpt = frr_pthread_get(PTHREAD_IO); struct frr_pthread *fpt = frr_pthread_get(PTHREAD_IO);
@ -148,8 +146,8 @@ void bgp_writes_off(struct peer *peer)
void bgp_reads_on(struct peer *peer) void bgp_reads_on(struct peer *peer)
{ {
while (!atomic_load_explicit(&bgp_io_thread_started, while (
memory_order_relaxed)) !atomic_load_explicit(&bgp_io_thread_started, memory_order_seq_cst))
; ;
assert(peer->status != Deleted); assert(peer->status != Deleted);
@ -171,8 +169,8 @@ void bgp_reads_on(struct peer *peer)
void bgp_reads_off(struct peer *peer) void bgp_reads_off(struct peer *peer)
{ {
while (!atomic_load_explicit(&bgp_io_thread_started, while (
memory_order_relaxed)) !atomic_load_explicit(&bgp_io_thread_started, memory_order_seq_cst))
; ;
struct frr_pthread *fpt = frr_pthread_get(PTHREAD_IO); struct frr_pthread *fpt = frr_pthread_get(PTHREAD_IO);
@ -376,8 +374,8 @@ static uint16_t bgp_write(struct peer *peer)
uint32_t wpkt_quanta_old; uint32_t wpkt_quanta_old;
// cache current write quanta // cache current write quanta
wpkt_quanta_old = atomic_load_explicit(&peer->bgp->wpkt_quanta, wpkt_quanta_old =
memory_order_relaxed); atomic_load_explicit(&peer->bgp->wpkt_quanta, memory_order_relaxed);
while (count < wpkt_quanta_old && (s = stream_fifo_head(peer->obuf))) { while (count < wpkt_quanta_old && (s = stream_fifo_head(peer->obuf))) {
int writenum; int writenum;
@ -405,13 +403,16 @@ static uint16_t bgp_write(struct peer *peer)
switch (type) { switch (type) {
case BGP_MSG_OPEN: case BGP_MSG_OPEN:
peer->open_out++; atomic_fetch_add_explicit(&peer->open_out, 1,
memory_order_relaxed);
break; break;
case BGP_MSG_UPDATE: case BGP_MSG_UPDATE:
peer->update_out++; atomic_fetch_add_explicit(&peer->update_out, 1,
memory_order_relaxed);
break; break;
case BGP_MSG_NOTIFY: case BGP_MSG_NOTIFY:
peer->notify_out++; atomic_fetch_add_explicit(&peer->notify_out, 1,
memory_order_relaxed);
/* Double start timer. */ /* Double start timer. */
peer->v_start *= 2; peer->v_start *= 2;
@ -427,14 +428,17 @@ static uint16_t bgp_write(struct peer *peer)
goto done; goto done;
case BGP_MSG_KEEPALIVE: case BGP_MSG_KEEPALIVE:
peer->keepalive_out++; atomic_fetch_add_explicit(&peer->keepalive_out, 1,
memory_order_relaxed);
break; break;
case BGP_MSG_ROUTE_REFRESH_NEW: case BGP_MSG_ROUTE_REFRESH_NEW:
case BGP_MSG_ROUTE_REFRESH_OLD: case BGP_MSG_ROUTE_REFRESH_OLD:
peer->refresh_out++; atomic_fetch_add_explicit(&peer->refresh_out, 1,
memory_order_relaxed);
break; break;
case BGP_MSG_CAPABILITY: case BGP_MSG_CAPABILITY:
peer->dynamic_cap_out++; atomic_fetch_add_explicit(&peer->dynamic_cap_out, 1,
memory_order_relaxed);
break; break;
} }
@ -447,11 +451,13 @@ static uint16_t bgp_write(struct peer *peer)
done : { done : {
/* Update last_update if UPDATEs were written. */ /* Update last_update if UPDATEs were written. */
if (peer->update_out > oc) if (peer->update_out > oc)
peer->last_update = bgp_clock(); atomic_store_explicit(&peer->last_update, bgp_clock(),
memory_order_relaxed);
/* If we TXed any flavor of packet update last_write */ /* If we TXed any flavor of packet update last_write */
if (update_last_write) if (update_last_write)
peer->last_write = bgp_clock(); atomic_store_explicit(&peer->last_write, bgp_clock(),
memory_order_relaxed);
} }
return status; return status;
@ -560,9 +566,11 @@ static bool validate_header(struct peer *peer)
&& type != BGP_MSG_ROUTE_REFRESH_NEW && type != BGP_MSG_ROUTE_REFRESH_NEW
&& type != BGP_MSG_ROUTE_REFRESH_OLD && type != BGP_MSG_ROUTE_REFRESH_OLD
&& type != BGP_MSG_CAPABILITY) { && type != BGP_MSG_CAPABILITY) {
if (bgp_debug_neighbor_events(peer)) if (bgp_debug_neighbor_events(peer)) {
// XXX: zlog is not MT-safe
zlog_debug("%s unknown message type 0x%02x", peer->host, zlog_debug("%s unknown message type 0x%02x", peer->host,
type); type);
}
bgp_notify_send_with_data(peer, BGP_NOTIFY_HEADER_ERR, bgp_notify_send_with_data(peer, BGP_NOTIFY_HEADER_ERR,
BGP_NOTIFY_HEADER_BAD_MESTYPE, BGP_NOTIFY_HEADER_BAD_MESTYPE,
@ -582,11 +590,13 @@ static bool validate_header(struct peer *peer)
&& size < BGP_MSG_ROUTE_REFRESH_MIN_SIZE) && size < BGP_MSG_ROUTE_REFRESH_MIN_SIZE)
|| (type == BGP_MSG_CAPABILITY || (type == BGP_MSG_CAPABILITY
&& size < BGP_MSG_CAPABILITY_MIN_SIZE)) { && size < BGP_MSG_CAPABILITY_MIN_SIZE)) {
if (bgp_debug_neighbor_events(peer)) if (bgp_debug_neighbor_events(peer)) {
// XXX: zlog is not MT-safe
zlog_debug("%s bad message length - %d for %s", zlog_debug("%s bad message length - %d for %s",
peer->host, size, peer->host, size,
type == 128 ? "ROUTE-REFRESH" type == 128 ? "ROUTE-REFRESH"
: bgp_type_str[(int) type]); : bgp_type_str[(int) type]);
}
bgp_notify_send_with_data(peer, BGP_NOTIFY_HEADER_ERR, bgp_notify_send_with_data(peer, BGP_NOTIFY_HEADER_ERR,
BGP_NOTIFY_HEADER_BAD_MESLEN, BGP_NOTIFY_HEADER_BAD_MESLEN,

56
bgpd/bgpd.h
View File

@ -789,19 +789,19 @@ struct peer {
(CHECK_FLAG(peer->config, PEER_CONFIG_TIMER) \ (CHECK_FLAG(peer->config, PEER_CONFIG_TIMER) \
|| CHECK_FLAG(peer->config, PEER_GROUP_CONFIG_TIMER)) || CHECK_FLAG(peer->config, PEER_GROUP_CONFIG_TIMER))
u_int32_t holdtime; _Atomic uint32_t holdtime;
u_int32_t keepalive; _Atomic uint32_t keepalive;
u_int32_t connect; _Atomic uint32_t connect;
u_int32_t routeadv; _Atomic uint32_t routeadv;
/* Timer values. */ /* Timer values. */
u_int32_t v_start; _Atomic uint32_t v_start;
u_int32_t v_connect; _Atomic uint32_t v_connect;
u_int32_t v_holdtime; _Atomic uint32_t v_holdtime;
u_int32_t v_keepalive; _Atomic uint32_t v_keepalive;
u_int32_t v_routeadv; _Atomic uint32_t v_routeadv;
u_int32_t v_pmax_restart; _Atomic uint32_t v_pmax_restart;
u_int32_t v_gr_restart; _Atomic uint32_t v_gr_restart;
/* Threads. */ /* Threads. */
struct thread *t_read; struct thread *t_read;
@ -818,7 +818,7 @@ struct peer {
struct thread *t_process_packet; struct thread *t_process_packet;
/* Thread flags. */ /* Thread flags. */
u_int16_t thread_flags; _Atomic uint16_t thread_flags;
#define PEER_THREAD_WRITES_ON (1 << 0) #define PEER_THREAD_WRITES_ON (1 << 0)
#define PEER_THREAD_READS_ON (1 << 1) #define PEER_THREAD_READS_ON (1 << 1)
#define PEER_THREAD_KEEPALIVES_ON (1 << 2) #define PEER_THREAD_KEEPALIVES_ON (1 << 2)
@ -826,19 +826,19 @@ struct peer {
struct work_queue *clear_node_queue; struct work_queue *clear_node_queue;
/* Statistics field */ /* Statistics field */
u_int32_t open_in; /* Open message input count */ _Atomic uint32_t open_in; /* Open message input count */
u_int32_t open_out; /* Open message output count */ _Atomic uint32_t open_out; /* Open message output count */
u_int32_t update_in; /* Update message input count */ _Atomic uint32_t update_in; /* Update message input count */
u_int32_t update_out; /* Update message ouput count */ _Atomic uint32_t update_out; /* Update message ouput count */
time_t update_time; /* Update message received time. */ _Atomic time_t update_time; /* Update message received time. */
u_int32_t keepalive_in; /* Keepalive input count */ _Atomic uint32_t keepalive_in; /* Keepalive input count */
u_int32_t keepalive_out; /* Keepalive output count */ _Atomic uint32_t keepalive_out; /* Keepalive output count */
u_int32_t notify_in; /* Notify input count */ _Atomic uint32_t notify_in; /* Notify input count */
u_int32_t notify_out; /* Notify output count */ _Atomic uint32_t notify_out; /* Notify output count */
u_int32_t refresh_in; /* Route Refresh input count */ _Atomic uint32_t refresh_in; /* Route Refresh input count */
u_int32_t refresh_out; /* Route Refresh output count */ _Atomic uint32_t refresh_out; /* Route Refresh output count */
u_int32_t dynamic_cap_in; /* Dynamic Capability input count. */ _Atomic uint32_t dynamic_cap_in; /* Dynamic Capability input count. */
u_int32_t dynamic_cap_out; /* Dynamic Capability output count. */ _Atomic uint32_t dynamic_cap_out; /* Dynamic Capability output count. */
/* BGP state count */ /* BGP state count */
u_int32_t established; /* Established */ u_int32_t established; /* Established */
@ -851,8 +851,10 @@ struct peer {
/* Syncronization list and time. */ /* Syncronization list and time. */
struct bgp_synchronize *sync[AFI_MAX][SAFI_MAX]; struct bgp_synchronize *sync[AFI_MAX][SAFI_MAX];
time_t synctime; time_t synctime;
time_t last_write; /* timestamp when the last msg was written */ /* timestamp when the last UPDATE msg was written */
time_t last_update; /* timestamp when the last UPDATE msg was written */ _Atomic time_t last_write;
/* timestamp when the last msg was written */
_Atomic time_t last_update;
/* Send prefix count. */ /* Send prefix count. */
unsigned long scount[AFI_MAX][SAFI_MAX]; unsigned long scount[AFI_MAX][SAFI_MAX];