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

Jump to bottom

bgpd: Revalidate locally originated routes also when RPKI state changes #16483

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

bgpd: Revalidate locally originated routes also when RPKI state changes #16483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33a28c2
bgpd: Revalidate locally originated routes also when RPKI state changes
ton31337 Jul 26, 2024
7ff082e
bgpd: Revalidate redistributed routes also when RPKI state changes
ton31337 Jul 27, 2024
77476b6
bgpd: Revalidate all routes periodically using a separate event
ton31337 Jul 27, 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
60 changes: 56 additions & 4 deletions bgpd/bgp_rpki.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#include "bgpd/bgp_route.h"
#include "bgpd/bgp_rpki.h"
#include "bgpd/bgp_debug.h"
#include "bgpd/bgp_zebra.h"
#include "northbound_cli.h"

#include "lib/network.h"
Expand All @@ -58,6 +59,7 @@ DEFINE_MTYPE_STATIC(BGPD, BGP_RPKI_REVALIDATE, "BGP RPKI Revalidation");
#define EXPIRE_INTERVAL_DEFAULT 7200
#define RETRY_INTERVAL_DEFAULT 600
#define BGP_RPKI_CACHE_SERVER_SYNC_RETRY_TIMEOUT 3
#define BGP_RPKI_REVALIDATE_INTERVAL 30

#define RPKI_DEBUG(...) \
if (rpki_debug_conf || rpki_debug_term) { \
Expand Down Expand Up @@ -103,6 +105,7 @@ struct rpki_vrf {
unsigned int polling_period;
unsigned int expire_interval;
unsigned int retry_interval;
uint32_t revalidate_interval;
int rpki_sync_socket_rtr;
int rpki_sync_socket_bgpd;
char *vrfname;
Expand Down Expand Up @@ -155,7 +158,7 @@ static enum route_map_cmd_result_t route_match(void *rule,
void *object);
static void *route_match_compile(const char *arg);
static void revalidate_bgp_node(struct bgp_dest *dest, afi_t afi, safi_t safi);
static void revalidate_all_routes(struct rpki_vrf *rpki_vrf);
static void rpki_revalidate_all_routes(struct event *event);

static bool rpki_debug_conf, rpki_debug_term;

Expand Down Expand Up @@ -606,7 +609,6 @@ static void bgpd_sync_callback(struct event *thread)

atomic_store_explicit(&rpki_vrf->rtr_update_overflow, 0,
memory_order_seq_cst);
revalidate_all_routes(rpki_vrf);
return;
}

Expand Down Expand Up @@ -644,6 +646,13 @@ static void bgpd_sync_callback(struct event *thread)
if (!table)
continue;

if (!event_is_scheduled(bgp->t_revalidate_all[afi][safi]))
event_add_timer(bm->master,
rpki_revalidate_all_routes,
rpki_vrf,
rpki_vrf->revalidate_interval,
&bgp->t_revalidate_all[afi][safi]);

rrp = XCALLOC(MTYPE_BGP_RPKI_REVALIDATE, sizeof(*rrp));
rrp->bgp = bgp;
rrp->prefix = prefix;
Expand Down Expand Up @@ -701,11 +710,12 @@ static void bgp_rpki_revalidate_peer(struct event *thread)
XFREE(MTYPE_BGP_RPKI_REVALIDATE, rvp);
}

static void revalidate_all_routes(struct rpki_vrf *rpki_vrf)
static void rpki_revalidate_all_routes(struct event *event)
{
struct bgp *bgp;
struct listnode *node;
struct vrf *vrf = NULL;
struct rpki_vrf *rpki_vrf = EVENT_ARG(event);

if (rpki_vrf->vrfname) {
vrf = vrf_lookup_by_name(rpki_vrf->vrfname);
Expand All @@ -725,6 +735,9 @@ static void revalidate_all_routes(struct rpki_vrf *rpki_vrf)
if (vrf && bgp->vrf_id != vrf->vrf_id)
continue;

bgp_static_add(bgp);
bgp_redistribute_redo(bgp);

for (ALL_LIST_ELEMENTS_RO(bgp->peer, peer_listnode, peer)) {
afi_t afi;
safi_t safi;
Expand Down Expand Up @@ -846,6 +859,7 @@ static struct rpki_vrf *bgp_rpki_allocate(const char *vrfname)
rpki_vrf->polling_period = POLLING_PERIOD_DEFAULT;
rpki_vrf->expire_interval = EXPIRE_INTERVAL_DEFAULT;
rpki_vrf->retry_interval = RETRY_INTERVAL_DEFAULT;
rpki_vrf->revalidate_interval = BGP_RPKI_REVALIDATE_INTERVAL;

if (vrfname && !strmatch(vrfname, VRF_DEFAULT_NAME))
rpki_vrf->vrfname = XSTRDUP(MTYPE_BGP_RPKI_CACHE, vrfname);
Expand Down Expand Up @@ -1597,7 +1611,8 @@ static int bgp_rpki_write_vrf(struct vty *vty, struct vrf *vrf)
if (rpki_vrf->cache_list && list_isempty(rpki_vrf->cache_list) &&
rpki_vrf->polling_period == POLLING_PERIOD_DEFAULT &&
rpki_vrf->retry_interval == RETRY_INTERVAL_DEFAULT &&
rpki_vrf->expire_interval == EXPIRE_INTERVAL_DEFAULT)
rpki_vrf->expire_interval == EXPIRE_INTERVAL_DEFAULT &&
rpki_vrf->revalidate_interval == BGP_RPKI_REVALIDATE_INTERVAL)
/* do not display the default config values */
return 0;

Expand All @@ -1614,6 +1629,9 @@ static int bgp_rpki_write_vrf(struct vty *vty, struct vrf *vrf)
if (rpki_vrf->expire_interval != EXPIRE_INTERVAL_DEFAULT)
vty_out(vty, "%s rpki expire_interval %d\n", sep,
rpki_vrf->expire_interval);
if (rpki_vrf->revalidate_interval != BGP_RPKI_REVALIDATE_INTERVAL)
vty_out(vty, "%s rpki revalidate_interval %u\n", sep,
rpki_vrf->revalidate_interval);

for (ALL_LIST_ELEMENTS_RO(rpki_vrf->cache_list, cache_node, cache)) {
switch (cache->type) {
Expand Down Expand Up @@ -1736,6 +1754,7 @@ DEFPY (no_rpki,
rpki_vrf->polling_period = POLLING_PERIOD_DEFAULT;
rpki_vrf->expire_interval = EXPIRE_INTERVAL_DEFAULT;
rpki_vrf->retry_interval = RETRY_INTERVAL_DEFAULT;
rpki_vrf->revalidate_interval = BGP_RPKI_REVALIDATE_INTERVAL;

return CMD_SUCCESS;
}
Expand Down Expand Up @@ -1920,6 +1939,32 @@ DEFUN (no_rpki_retry_interval,
return CMD_SUCCESS;
}

DEFPY (rpki_revalidate_interval,
rpki_revalidate_interval_cmd,
"[no] rpki revalidate_interval (1-4294967295)$revalidate",
NO_STR
RPKI_OUTPUT_STRING
"Set revalidate all routes interval\n"
"revalidate interval value\n")
{
struct rpki_vrf *rpki_vrf;

if (vty->node == RPKI_VRF_NODE)
rpki_vrf = VTY_GET_CONTEXT_SUB(rpki_vrf);
else
rpki_vrf = VTY_GET_CONTEXT(rpki_vrf);

if (!rpki_vrf)
return CMD_WARNING_CONFIG_FAILED;

if (no)
rpki_vrf->revalidate_interval = BGP_RPKI_REVALIDATE_INTERVAL;
else
rpki_vrf->revalidate_interval = revalidate;

return CMD_SUCCESS;
}

DEFPY(rpki_cache_tcp, rpki_cache_tcp_cmd,
"rpki cache tcp <A.B.C.D|WORD>$cache TCPPORT [source <A.B.C.D>$bindaddr] preference (1-255)",
RPKI_OUTPUT_STRING
Expand Down Expand Up @@ -2572,6 +2617,8 @@ DEFPY(show_rpki_configuration, show_rpki_configuration_cmd,
rpki_vrf->retry_interval);
json_object_int_add(json, "expireIntervalSeconds",
rpki_vrf->expire_interval);
json_object_int_add(json, "revalidateAllSeconds",
rpki_vrf->revalidate_interval);

vty_json(vty, json);

Expand All @@ -2592,6 +2639,8 @@ DEFPY(show_rpki_configuration, show_rpki_configuration_cmd,
vty_out(vty, "\tpolling period %d\n", rpki_vrf->polling_period);
vty_out(vty, "\tretry interval %d\n", rpki_vrf->retry_interval);
vty_out(vty, "\texpire interval %d\n", rpki_vrf->expire_interval);
vty_out(vty, "\trevalidate interval %u\n",
rpki_vrf->revalidate_interval);

return CMD_SUCCESS;
}
Expand Down Expand Up @@ -2742,6 +2791,9 @@ static void install_cli_commands(void)
install_element(RPKI_NODE, &rpki_retry_interval_cmd);
install_element(RPKI_NODE, &no_rpki_retry_interval_cmd);

/* Install rpki revalidate interval commands */
install_element(RPKI_NODE, &rpki_revalidate_interval_cmd);

/* Install rpki cache commands */
install_element(RPKI_NODE, &rpki_cache_tcp_cmd);
install_element(RPKI_NODE, &rpki_cache_ssh_cmd);
Expand Down
4 changes: 3 additions & 1 deletion bgpd/bgpd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3981,8 +3981,10 @@ int bgp_delete(struct bgp *bgp)

hook_call(bgp_inst_delete, bgp);

FOREACH_AFI_SAFI (afi, safi)
FOREACH_AFI_SAFI (afi, safi) {
EVENT_OFF(bgp->t_revalidate[afi][safi]);
EVENT_OFF(bgp->t_revalidate_all[afi][safi]);
}

EVENT_OFF(bgp->t_condition_check);
EVENT_OFF(bgp->t_startup);
Expand Down
1 change: 1 addition & 0 deletions bgpd/bgpd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,7 @@ struct bgp {
struct event *t_update_delay;
struct event *t_establish_wait;
struct event *t_revalidate[AFI_MAX][SAFI_MAX];
struct event *t_revalidate_all[AFI_MAX][SAFI_MAX];

uint8_t update_delay_over;
uint8_t main_zebra_update_hold;
Expand Down
8 changes: 8 additions & 0 deletions doc/user/rpki.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,14 @@ The following commands are available for independent of a specific cache server.

The default value is 600 seconds.

.. clicmd:: rpki revalidate_interval (1-4294967295)

Set the number of seconds the router waits until it revalidates all the routes, including
redistributed routes, statically defined routes (``network``), and routes per neighbor
(soft reconfiguration).

The default value is 30 seconds.

.. clicmd:: rpki cache tcp HOST PORT [source A.B.C.D] preference (1-255)

Add a TCP cache server to the socket.
Expand Down
Loading