mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 09:41:54 +00:00
Code Releases Activity

Filter global values are not used directly from config

Browse Source
This commit is contained in:
Maria Matejka 2024-06-13 15:49:56 +02:00
parent 397eee5a00
commit c4fbc5592d
4 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf/conf.c
View File

@ -139,6 +139,7 @@ config_parse(struct config *c)
goto cleanup; goto cleanup;
cf_lex_init(NULL, c); cf_lex_init(NULL, c);
filter_preconfig(c);
sysdep_preconfig(c); sysdep_preconfig(c);
protos_preconfig(c); protos_preconfig(c);
mpls_preconfig(c); mpls_preconfig(c);

3
filter/config.Y
View File

@ -401,6 +401,9 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN,
CF_GRAMMAR CF_GRAMMAR
conf: FILTER STACKS expr expr ';' { conf: FILTER STACKS expr expr ';' {
if (($3 < 16) || ($4 < 16))
/* Check for self-crippling values */
cf_error("Filter stack values lesser than 16 not supported");
new_config->filter_vstk = $3; new_config->filter_vstk = $3;
new_config->filter_estk = $4; new_config->filter_estk = $4;
} }

25
filter/filter.c
View File

@ -50,6 +50,15 @@ enum f_exception {
FE_RETURN = 0x1, FE_RETURN = 0x1,
}; };
/* Global filter runtime */
static struct {
_Atomic u16 filter_vstk;
_Atomic u16 filter_estk;
} global_filter_runtime = {
.filter_vstk = 128,
.filter_estk = 128,
};
struct filter_exec_stack { struct filter_exec_stack {
const struct f_line *line; /* The line that is being executed */ const struct f_line *line; /* The line that is being executed */
uint pos; /* Instruction index in the line */ uint pos; /* Instruction index in the line */
@ -90,9 +99,9 @@ _Thread_local static struct filter_state filter_state;
void (*bt_assert_hook)(int result, const struct f_line_item *assert); void (*bt_assert_hook)(int result, const struct f_line_item *assert);
#define _f_stack_init(fs, px, def) ((fs).stack.px##stk = alloca(sizeof(*(fs).stack.px##stk) * ((fs).stack.px##len = (config && config->filter_##px##stk) ? config->filter_##px##stk : (def)))) #define _f_stack_init(fs, px) ((fs).stack.px##stk = alloca(sizeof(*(fs).stack.px##stk) * ((fs).stack.px##len = atomic_load_explicit(&global_filter_runtime.filter_##px##stk, memory_order_relaxed))))
#define f_stack_init(fs) ( _f_stack_init(fs, v, 128), _f_stack_init(fs, e, 128) ) #define f_stack_init(fs) ( _f_stack_init(fs, v), _f_stack_init(fs, e) )
static struct tbf rl_runtime_err = TBF_DEFAULT_LOG_LIMITS; static struct tbf rl_runtime_err = TBF_DEFAULT_LOG_LIMITS;
@ -340,12 +349,24 @@ filter_same(const struct filter *new, const struct filter *old)
return new->sym->flags & SYM_FLAG_SAME; return new->sym->flags & SYM_FLAG_SAME;
} }
/* Initialize filter knobs */
void
filter_preconfig(struct config *new)
{
new->filter_vstk = 128;
new->filter_estk = 128;
}
/** /**
* filter_commit - do filter comparisons on all the named functions and filters * filter_commit - do filter comparisons on all the named functions and filters
*/ */
void void
filter_commit(struct config *new, struct config *old) filter_commit(struct config *new, struct config *old)
{ {
/* Update filter stack size variables */
atomic_store_explicit(&global_filter_runtime.filter_vstk, new->filter_vstk, memory_order_relaxed);
atomic_store_explicit(&global_filter_runtime.filter_estk, new->filter_estk, memory_order_relaxed);
if (!old) if (!old)
return; return;

1
filter/filter.h
View File

@ -70,6 +70,7 @@ const char *filter_name(const struct filter *filter);
int filter_same(const struct filter *new, const struct filter *old); int filter_same(const struct filter *new, const struct filter *old);
int f_same(const struct f_line *f1, const struct f_line *f2); int f_same(const struct f_line *f1, const struct f_line *f2);
void filter_preconfig(struct config *new);
void filter_commit(struct config *new, struct config *old); void filter_commit(struct config *new, struct config *old);
void filters_dump_all(void); void filters_dump_all(void);