diff options
| author | Alexander V. Chernikov <melifaro@FreeBSD.org> | 2021-04-18 15:03:58 +0000 |
|---|---|---|
| committer | Alexander V. Chernikov <melifaro@FreeBSD.org> | 2021-04-29 08:47:31 +0000 |
| commit | a07e7856e4cd50b7fdae61b6dc6a4babe0cf1ed3 (patch) | |
| tree | ad0f17aeb6a13d71a8fc73c9c492270bb29065df | |
| parent | c971873acef46eedec786387b1d9c22b002b6634 (diff) | |
| download | src-a07e7856e4cd50b7fdae61b6dc6a4babe0cf1ed3.tar.gz src-a07e7856e4cd50b7fdae61b6dc6a4babe0cf1ed3.zip | |
fib algo: do not reallocate datapath index for datapath ptr update.
Fib algo uses a per-family array indexed by the fibnum to store
lookup function pointers and per-fib data.
Each algorithm rebuild currently requires re-allocating this array
to support atomic change of two pointers.
As in reality most of the changes actually involve changing only
data pointer, add a shortcut performing in-flight pointer update.
MFC after: 2 weeks
(cherry picked from commit 0abb6ff590842114c74e5d52e1af65605bd9d960)
| -rw-r--r-- | sys/net/route/fib_algo.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sys/net/route/fib_algo.c b/sys/net/route/fib_algo.c index 03c21af4df97..a00dfe338ab5 100644 --- a/sys/net/route/fib_algo.c +++ b/sys/net/route/fib_algo.c @@ -1438,6 +1438,17 @@ replace_rtables_family(struct fib_dp **pdp, struct fib_data *fd, struct fib_dp * FIB_MOD_LOCK(); old_fdh = get_fib_dp_header(*pdp); + if (old_fdh->fdh_idx[fd->fd_fibnum].f == dp->f) { + /* + * Function is the same, data pointer needs update. + * Perform in-line replace without reallocation. + */ + old_fdh->fdh_idx[fd->fd_fibnum].arg = dp->arg; + FD_PRINTF(LOG_DEBUG, fd, "FDH %p inline update", old_fdh); + FIB_MOD_UNLOCK(); + return (true); + } + new_fdh = alloc_fib_dp_array(old_fdh->fdh_num_tables, false); FD_PRINTF(LOG_DEBUG, fd, "OLD FDH: %p NEW FDH: %p", old_fdh, new_fdh); if (new_fdh == NULL) { |