upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 00:32:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move business logic from rebuild_fd_callout() into rebuild_fd().

Browse source 
This simplifies code a bit and allows for future non-callout
 callers to request rebuild.

MFC after:	3 days
This commit is contained in:
Alexander V. Chernikov 2021-01-30 22:32:42 +00:00
parent f8b7ebea49
commit ab6d9aaed7
1 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
sys/net/route/fib_algo.c
View file

@ -155,6 +155,7 @@ struct fib_data {
TAILQ_ENTRY(fib_data) entries; /* list of all fds in vnet */ TAILQ_ENTRY(fib_data) entries; /* list of all fds in vnet */
}; };
static bool rebuild_fd(struct fib_data *fd);
static void rebuild_fd_callout(void *_data); static void rebuild_fd_callout(void *_data);
static void destroy_fd_instance_epoch(epoch_context_t ctx); static void destroy_fd_instance_epoch(epoch_context_t ctx);
static enum flm_op_result attach_datapath(struct fib_data *fd); static enum flm_op_result attach_datapath(struct fib_data *fd);
@ -1011,13 +1012,28 @@ setup_fd_instance(struct fib_lookup_module *flm, struct rib_head *rh,
static void static void
rebuild_fd_callout(void *_data) rebuild_fd_callout(void *_data)
{ {
struct fib_data *fd, *fd_new, *fd_tmp; struct fib_data *fd = (struct fib_data *)_data;
FD_PRINTF(LOG_INFO, fd, "running callout rebuild");
CURVNET_SET(fd->fd_vnet);
rebuild_fd(fd);
CURVNET_RESTORE();
}
/*
* Tries to create new algo instance based on @fd data.
* Returns true on success.
*/
static bool
rebuild_fd(struct fib_data *fd)
{
struct fib_data *fd_new, *fd_tmp;
struct fib_lookup_module *flm_new = NULL; struct fib_lookup_module *flm_new = NULL;
struct epoch_tracker et; struct epoch_tracker et;
enum flm_op_result result; enum flm_op_result result;
bool need_rebuild = false; bool need_rebuild = false;
fd = (struct fib_data *)_data;
FIB_MOD_LOCK(); FIB_MOD_LOCK();
need_rebuild = fd->fd_need_rebuild; need_rebuild = fd->fd_need_rebuild;
@ -1026,15 +1042,12 @@ rebuild_fd_callout(void *_data)
fd->fd_num_changes = 0; fd->fd_num_changes = 0;
FIB_MOD_UNLOCK(); FIB_MOD_UNLOCK();
CURVNET_SET(fd->fd_vnet);
/* First, check if we're still OK to use this algo */ /* First, check if we're still OK to use this algo */
if (!is_algo_fixed(fd->fd_rh)) if (!is_algo_fixed(fd->fd_rh))
flm_new = fib_check_best_algo(fd->fd_rh, fd->fd_flm); flm_new = fib_check_best_algo(fd->fd_rh, fd->fd_flm);
if ((flm_new == NULL) && (!need_rebuild)) { if ((flm_new == NULL) && (!need_rebuild)) {
/* Keep existing algo, no need to rebuild. */ /* Keep existing algo, no need to rebuild. */
CURVNET_RESTORE(); return (true);
return;
} }
if (flm_new == NULL) { if (flm_new == NULL) {
@ -1051,19 +1064,16 @@ rebuild_fd_callout(void *_data)
} }
if (result != FLM_SUCCESS) { if (result != FLM_SUCCESS) {
FD_PRINTF(LOG_NOTICE, fd, "table rebuild failed"); FD_PRINTF(LOG_NOTICE, fd, "table rebuild failed");
CURVNET_RESTORE(); return (false);
return;
} }
FD_PRINTF(LOG_INFO, fd_new, "switched to new instance"); FD_PRINTF(LOG_INFO, fd_new, "switched to new instance");
/* Remove old instance removal */ /* Remove old instance */
if (fd != NULL) { NET_EPOCH_ENTER(et);
NET_EPOCH_ENTER(et); schedule_destroy_fd_instance(fd, true);
schedule_destroy_fd_instance(fd, true); NET_EPOCH_EXIT(et);
NET_EPOCH_EXIT(et);
}
CURVNET_RESTORE(); return (true);
} }
/* /*