proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-30 15:02:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: fix data plane FPM netlink module

Browse Source 
Changes:

*   Let the package builder scripts know that we have a new module that
    needs to be taken care of.
*   Include the frr atomic header to avoid undeclared atomic operations.
*   Disable build on *BSDs because the code is using some zebra netlink
    functions only available for Linux.
*   Move data plane FPM module outside old FPM automake definition.
*   Fix atomic usage for Ubuntu 14.04 (always use explicit).

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
This commit is contained in:
Rafael Zalamena 2020-01-03 17:22:27 -03:00
parent edfeff4251
commit c871e6c9d1
4 changed files with 61 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/frr.install vendored
View File

@ -9,6 +9,7 @@ usr/lib/frr/*d
usr/lib/frr/watchfrr usr/lib/frr/watchfrr
usr/lib/frr/zebra usr/lib/frr/zebra
usr/lib/*/frr/modules/zebra_cumulus_mlag.so usr/lib/*/frr/modules/zebra_cumulus_mlag.so
usr/lib/*/frr/modules/dplane_fpm_nl.so
usr/lib/*/frr/modules/zebra_irdp.so usr/lib/*/frr/modules/zebra_irdp.so
usr/lib/*/frr/modules/zebra_fpm.so usr/lib/*/frr/modules/zebra_fpm.so
usr/lib/*/frr/modules/bgpd_bmp.so usr/lib/*/frr/modules/bgpd_bmp.so

1
redhat/frr.spec.in
View File

@ -675,6 +675,7 @@ fi
%{_libdir}/frr/modules/bgpd_rpki.so %{_libdir}/frr/modules/bgpd_rpki.so
%endif %endif
%{_libdir}/frr/modules/zebra_cumulus_mlag.so %{_libdir}/frr/modules/zebra_cumulus_mlag.so
%{_libdir}/frr/modules/dplane_fpm_nl.so
%{_libdir}/frr/modules/zebra_irdp.so %{_libdir}/frr/modules/zebra_irdp.so
%{_libdir}/frr/modules/bgpd_bmp.so %{_libdir}/frr/modules/bgpd_bmp.so
%{_bindir}/* %{_bindir}/*

81
zebra/dplane_fpm_nl.c
View File

@ -31,6 +31,7 @@
#include "lib/zebra.h" #include "lib/zebra.h"
#include "lib/json.h" #include "lib/json.h"
#include "lib/libfrr.h" #include "lib/libfrr.h"
#include "lib/frratomic.h"
#include "lib/command.h" #include "lib/command.h"
#include "lib/memory.h" #include "lib/memory.h"
#include "lib/network.h" #include "lib/network.h"
@ -415,7 +416,8 @@ static int fpm_read(struct thread *t)
rv = stream_read_try(fnc->ibuf, fnc->socket, rv = stream_read_try(fnc->ibuf, fnc->socket,
STREAM_WRITEABLE(fnc->ibuf)); STREAM_WRITEABLE(fnc->ibuf));
if (rv == 0) { if (rv == 0) {
atomic_fetch_add(&fnc->counters.connection_closes, 1); atomic_fetch_add_explicit(&fnc->counters.connection_closes, 1,
memory_order_relaxed);
zlog_debug("%s: connection closed", __func__); zlog_debug("%s: connection closed", __func__);
fpm_reconnect(fnc); fpm_reconnect(fnc);
return 0; return 0;
@ -425,7 +427,8 @@ static int fpm_read(struct thread *t)
|| errno == EINTR) || errno == EINTR)
return 0; return 0;
atomic_fetch_add(&fnc->counters.connection_errors, 1); atomic_fetch_add_explicit(&fnc->counters.connection_errors, 1,
memory_order_relaxed);
zlog_debug("%s: connection failure: %s", __func__, zlog_debug("%s: connection failure: %s", __func__,
strerror(errno)); strerror(errno));
fpm_reconnect(fnc); fpm_reconnect(fnc);
@ -434,7 +437,8 @@ static int fpm_read(struct thread *t)
stream_reset(fnc->ibuf); stream_reset(fnc->ibuf);
/* Account all bytes read. */ /* Account all bytes read. */
atomic_fetch_add(&fnc->counters.bytes_read, rv); atomic_fetch_add_explicit(&fnc->counters.bytes_read, rv,
memory_order_relaxed);
thread_add_read(fnc->fthread->master, fpm_read, fnc, fnc->socket, thread_add_read(fnc->fthread->master, fpm_read, fnc, fnc->socket,
&fnc->t_read); &fnc->t_read);
@ -464,7 +468,9 @@ static int fpm_write(struct thread *t)
zlog_debug("%s: SO_ERROR failed: %s", __func__, zlog_debug("%s: SO_ERROR failed: %s", __func__,
strerror(status)); strerror(status));
atomic_fetch_add(&fnc->counters.connection_errors, 1); atomic_fetch_add_explicit(
&fnc->counters.connection_errors, 1,
memory_order_relaxed);
fpm_reconnect(fnc); fpm_reconnect(fnc);
return 0; return 0;
@ -493,7 +499,9 @@ static int fpm_write(struct thread *t)
stream_get_getp(fnc->obuf); stream_get_getp(fnc->obuf);
bwritten = write(fnc->socket, stream_pnt(fnc->obuf), btotal); bwritten = write(fnc->socket, stream_pnt(fnc->obuf), btotal);
if (bwritten == 0) { if (bwritten == 0) {
atomic_fetch_add(&fnc->counters.connection_closes, 1); atomic_fetch_add_explicit(
&fnc->counters.connection_closes, 1,
memory_order_relaxed);
zlog_debug("%s: connection closed", __func__); zlog_debug("%s: connection closed", __func__);
break; break;
} }
@ -505,7 +513,9 @@ static int fpm_write(struct thread *t)
if (errno == EAGAIN || errno == EWOULDBLOCK) if (errno == EAGAIN || errno == EWOULDBLOCK)
break; break;
atomic_fetch_add(&fnc->counters.connection_errors, 1); atomic_fetch_add_explicit(
&fnc->counters.connection_errors, 1,
memory_order_relaxed);
zlog_debug("%s: connection failure: %s", __func__, zlog_debug("%s: connection failure: %s", __func__,
strerror(errno)); strerror(errno));
fpm_reconnect(fnc); fpm_reconnect(fnc);
@ -513,10 +523,12 @@ static int fpm_write(struct thread *t)
} }
/* Account all bytes sent. */ /* Account all bytes sent. */
atomic_fetch_add(&fnc->counters.bytes_sent, bwritten); atomic_fetch_add_explicit(&fnc->counters.bytes_sent, bwritten,
memory_order_relaxed);
/* Account number of bytes free. */ /* Account number of bytes free. */
atomic_fetch_sub(&fnc->counters.obuf_bytes, bwritten); atomic_fetch_sub_explicit(&fnc->counters.obuf_bytes, bwritten,
memory_order_relaxed);
stream_forward_getp(fnc->obuf, (size_t)bwritten); stream_forward_getp(fnc->obuf, (size_t)bwritten);
} }
@ -565,7 +577,8 @@ static int fpm_connect(struct thread *t)
rv = connect(sock, (struct sockaddr *)&fnc->addr, slen); rv = connect(sock, (struct sockaddr *)&fnc->addr, slen);
if (rv == -1 && errno != EINPROGRESS) { if (rv == -1 && errno != EINPROGRESS) {
atomic_fetch_add(&fnc->counters.connection_errors, 1); atomic_fetch_add_explicit(&fnc->counters.connection_errors, 1,
memory_order_relaxed);
close(sock); close(sock);
zlog_warn("%s: fpm connection failed: %s", __func__, zlog_warn("%s: fpm connection failed: %s", __func__,
strerror(errno)); strerror(errno));
@ -690,8 +703,9 @@ static int fpm_nl_enqueue(struct fpm_nl_ctx *fnc, struct zebra_dplane_ctx *ctx)
/* Check if we have enough buffer space. */ /* Check if we have enough buffer space. */
if (STREAM_WRITEABLE(fnc->obuf) < (nl_buf_len + FPM_HEADER_SIZE)) { if (STREAM_WRITEABLE(fnc->obuf) < (nl_buf_len + FPM_HEADER_SIZE)) {
atomic_fetch_add(&fnc->counters.buffer_full, 1); atomic_fetch_add_explicit(&fnc->counters.buffer_full, 1,
zlog_debug("%s: buffer full: wants to write %lu but has %ld", memory_order_relaxed);
zlog_debug("%s: buffer full: wants to write %zu but has %zu",
__func__, nl_buf_len + FPM_HEADER_SIZE, __func__, nl_buf_len + FPM_HEADER_SIZE,
STREAM_WRITEABLE(fnc->obuf)); STREAM_WRITEABLE(fnc->obuf));
return -1; return -1;
@ -710,14 +724,16 @@ static int fpm_nl_enqueue(struct fpm_nl_ctx *fnc, struct zebra_dplane_ctx *ctx)
stream_write(fnc->obuf, nl_buf, (size_t)nl_buf_len); stream_write(fnc->obuf, nl_buf, (size_t)nl_buf_len);
/* Account number of bytes waiting to be written. */ /* Account number of bytes waiting to be written. */
atomic_fetch_add(&fnc->counters.obuf_bytes, atomic_fetch_add_explicit(&fnc->counters.obuf_bytes,
nl_buf_len + FPM_HEADER_SIZE); nl_buf_len + FPM_HEADER_SIZE,
memory_order_relaxed);
obytes = atomic_load_explicit(&fnc->counters.obuf_bytes, obytes = atomic_load_explicit(&fnc->counters.obuf_bytes,
memory_order_relaxed); memory_order_relaxed);
obytes_peak = atomic_load_explicit(&fnc->counters.obuf_peak, obytes_peak = atomic_load_explicit(&fnc->counters.obuf_peak,
memory_order_relaxed); memory_order_relaxed);
if (obytes_peak < obytes) if (obytes_peak < obytes)
atomic_store(&fnc->counters.obuf_peak, obytes); atomic_store_explicit(&fnc->counters.obuf_peak, obytes,
memory_order_relaxed);
/* Tell the thread to start writing. */ /* Tell the thread to start writing. */
thread_add_write(fnc->fthread->master, fpm_write, fnc, fnc->socket, thread_add_write(fnc->fthread->master, fpm_write, fnc, fnc->socket,
@ -914,15 +930,19 @@ static int fpm_process_queue(struct thread *t)
fpm_nl_enqueue(fnc, ctx); fpm_nl_enqueue(fnc, ctx);
/* Account the processed entries. */ /* Account the processed entries. */
atomic_fetch_add(&fnc->counters.dplane_contexts, 1); atomic_fetch_add_explicit(&fnc->counters.dplane_contexts, 1,
atomic_fetch_sub(&fnc->counters.ctxqueue_len, 1); memory_order_relaxed);
atomic_fetch_sub_explicit(&fnc->counters.ctxqueue_len, 1,
memory_order_relaxed);
dplane_ctx_set_status(ctx, ZEBRA_DPLANE_REQUEST_SUCCESS); dplane_ctx_set_status(ctx, ZEBRA_DPLANE_REQUEST_SUCCESS);
dplane_provider_enqueue_out_ctx(fnc->prov, ctx); dplane_provider_enqueue_out_ctx(fnc->prov, ctx);
} }
/* Check for more items in the queue. */ /* Check for more items in the queue. */
if (atomic_load(&fnc->counters.ctxqueue_len) > 0) if (atomic_load_explicit(&fnc->counters.ctxqueue_len,
memory_order_relaxed)
> 0)
thread_add_timer(fnc->fthread->master, fpm_process_queue, thread_add_timer(fnc->fthread->master, fpm_process_queue,
fnc, 0, &fnc->t_dequeue); fnc, 0, &fnc->t_dequeue);
@ -941,7 +961,8 @@ static int fpm_process_event(struct thread *t)
case FNE_DISABLE: case FNE_DISABLE:
zlog_debug("%s: manual FPM disable event", __func__); zlog_debug("%s: manual FPM disable event", __func__);
fnc->disabled = true; fnc->disabled = true;
atomic_fetch_add(&fnc->counters.user_disables, 1); atomic_fetch_add_explicit(&fnc->counters.user_disables, 1,
memory_order_relaxed);
/* Call reconnect to disable timers and clean up context. */ /* Call reconnect to disable timers and clean up context. */
fpm_reconnect(fnc); fpm_reconnect(fnc);
@ -950,7 +971,8 @@ static int fpm_process_event(struct thread *t)
case FNE_RECONNECT: case FNE_RECONNECT:
zlog_debug("%s: manual FPM reconnect event", __func__); zlog_debug("%s: manual FPM reconnect event", __func__);
fnc->disabled = false; fnc->disabled = false;
atomic_fetch_add(&fnc->counters.user_configures, 1); atomic_fetch_add_explicit(&fnc->counters.user_configures, 1,
memory_order_relaxed);
fpm_reconnect(fnc); fpm_reconnect(fnc);
break; break;
@ -1024,13 +1046,18 @@ static int fpm_nl_process(struct zebra_dplane_provider *prov)
dplane_ctx_enqueue_tail(&fnc->ctxqueue, ctx); dplane_ctx_enqueue_tail(&fnc->ctxqueue, ctx);
/* Account the number of contexts. */ /* Account the number of contexts. */
atomic_fetch_add(&fnc->counters.ctxqueue_len, 1); atomic_fetch_add_explicit(&fnc->counters.ctxqueue_len,
cur_queue = atomic_load_explicit(&fnc->counters.ctxqueue_len, 1, memory_order_relaxed);
memory_order_relaxed); cur_queue = atomic_load_explicit(
peak_queue = atomic_load_explicit(&fnc->counters.ctxqueue_len_peak, &fnc->counters.ctxqueue_len,
memory_order_relaxed); memory_order_relaxed);
peak_queue = atomic_load_explicit(
&fnc->counters.ctxqueue_len_peak,
memory_order_relaxed);
if (peak_queue < cur_queue) if (peak_queue < cur_queue)
atomic_store(&fnc->counters.ctxqueue_len_peak, peak_queue); atomic_store_explicit(
&fnc->counters.ctxqueue_len_peak,
peak_queue, memory_order_relaxed);
continue; continue;
} }
@ -1038,7 +1065,9 @@ static int fpm_nl_process(struct zebra_dplane_provider *prov)
dplane_provider_enqueue_out_ctx(prov, ctx); dplane_provider_enqueue_out_ctx(prov, ctx);
} }
if (atomic_load(&fnc->counters.ctxqueue_len) > 0) if (atomic_load_explicit(&fnc->counters.ctxqueue_len,
memory_order_relaxed)
> 0)
thread_add_timer(fnc->fthread->master, fpm_process_queue, thread_add_timer(fnc->fthread->master, fpm_process_queue,
fnc, 0, &fnc->t_dequeue); fnc, 0, &fnc->t_dequeue);

5
zebra/subdir.am
View File

@ -32,7 +32,6 @@ module_LTLIBRARIES += zebra/zebra_snmp.la
endif endif
if FPM if FPM
module_LTLIBRARIES += zebra/zebra_fpm.la module_LTLIBRARIES += zebra/zebra_fpm.la
module_LTLIBRARIES += zebra/dplane_fpm_nl.la
endif endif
if LINUX if LINUX
module_LTLIBRARIES += zebra/zebra_cumulus_mlag.la module_LTLIBRARIES += zebra/zebra_cumulus_mlag.la
@ -201,8 +200,12 @@ nodist_zebra_zebra_SOURCES = \
zebra_zebra_cumulus_mlag_la_SOURCES = zebra/zebra_mlag_private.c zebra_zebra_cumulus_mlag_la_SOURCES = zebra/zebra_mlag_private.c
zebra_zebra_cumulus_mlag_la_LDFLAGS = -avoid-version -module -shared -export-dynamic zebra_zebra_cumulus_mlag_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
if LINUX
module_LTLIBRARIES += zebra/dplane_fpm_nl.la
zebra_dplane_fpm_nl_la_SOURCES = zebra/dplane_fpm_nl.c zebra_dplane_fpm_nl_la_SOURCES = zebra/dplane_fpm_nl.c
zebra_dplane_fpm_nl_la_LDFLAGS = -avoid-version -module -shared -export-dynamic zebra_dplane_fpm_nl_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
zebra_dplane_fpm_nl_la_LIBADD = zebra_dplane_fpm_nl_la_LIBADD =
vtysh_scan += $(top_srcdir)/zebra/dplane_fpm_nl.c vtysh_scan += $(top_srcdir)/zebra/dplane_fpm_nl.c
endif