#include <vlib/vlib.h>
#include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
#include <vnet/ethernet/ethernet.h>
#include <vlib/cli.h>
#include <vnet/l2/l2_fib.h>
#include <vnet/l2/l2_learn.h>
#include <vnet/l2/l2_bd.h>
-
#include <vppinfra/bihash_template.c>
-
#include <vlibmemory/api.h>
-#include <vnet/vnet_msg_enum.h>
-#define vl_typedefs /* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
+#include <vnet/l2/l2.api_enum.h>
+#include <vnet/l2/l2.api_types.h>
-#define vl_endianfun /* define message structures */
-#include <vnet/vnet_all_api_h.h>
+#define vl_endianfun
+#include <vnet/l2/l2.api.h>
#undef vl_endianfun
/**
*l2fe_res = ctx.l2fe_res;
}
+void
+l2_fib_extract_seq_num (l2fib_seq_num_t sn, u8 * bd_sn, u8 * if_sn)
+{
+ *bd_sn = sn >> 8;
+ *if_sn = sn & 0xff;
+}
+
+u8 *
+format_l2_fib_seq_num (u8 * s, va_list * a)
+{
+ l2fib_seq_num_t sn = va_arg (*a, int);
+ u8 bd_sn, if_sn;
+
+ l2_fib_extract_seq_num (sn, &bd_sn, &if_sn);
+
+ s = format (s, "%3d/%-3d", bd_sn, if_sn);
+
+ return (s);
+}
+
typedef struct l2fib_show_walk_ctx_t_
{
u8 first_entry;
if (ctx->add && !l2fib_entry_result_is_set_AGE_NOT (&result))
return (BIHASH_WALK_CONTINUE); /* skip learned macs */
- bd_config = vec_elt_at_index (l2input_main.bd_configs,
- key.fields.bd_index);
+ bd_config = &vec_elt (l2input_main.bd_configs, key.fields.bd_index);
if (l2fib_entry_result_is_set_AGE_NOT (&result))
s = format (s, "no");
}
vlib_cli_output (ctx->vm,
- "%=19U%=7d%=7d %3d/%-3d%=9v%=7s%=7s%=5s%=30U",
+ "%=19U%=7d%=7d %U%=9v%=7s%=7s%=5s%=30U",
format_ethernet_address, key.fields.mac,
key.fields.bd_index,
result.fields.sw_if_index == ~0
? -1 : result.fields.sw_if_index,
- result.fields.sn.bd, result.fields.sn.swif, s,
+ format_l2_fib_seq_num, result.fields.sn, s,
l2fib_entry_result_is_set_STATIC (&result) ? "*" : "-",
l2fib_entry_result_is_set_FILTER (&result) ? "*" : "-",
l2fib_entry_result_is_set_BVI (&result) ? "*" : "-",
l2fib_clear_table (void)
{
l2fib_main_t *mp = &l2fib_main;
+ l2_bridge_domain_t *bd_config;
if (mp->mac_table_initialized == 0)
return;
+ mp->mac_table_initialized = 0;
+
/* Remove all entries */
BV (clib_bihash_free) (&mp->mac_table);
l2fib_table_init ();
l2learn_main.global_learn_count = 0;
+ vec_foreach (bd_config, l2input_main.bd_configs)
+ bd_config->learn_count = 0;
}
/** Clear all entries in L2FIB.
};
/* *INDENT-ON* */
-static inline l2fib_seq_num_t
+static l2fib_seq_num_t
l2fib_cur_seq_num (u32 bd_index, u32 sw_if_index)
{
l2_bridge_domain_t *bd_config = l2input_bd_config (bd_index);
- /* *INDENT-OFF* */
- return (l2fib_seq_num_t) {
- .swif = *l2fib_swif_seq_num (sw_if_index),
- .bd = bd_config->seq_num,
- };
- /* *INDENT-ON* */
+
+ return l2_fib_mk_seq_num (bd_config->seq_num,
+ l2_input_seq_num (sw_if_index));
}
/**
{
/* decrement counter if overwriting a learned mac */
result.raw = kv.value;
- if ((!l2fib_entry_result_is_set_AGE_NOT (&result))
- && (lm->global_learn_count))
- lm->global_learn_count--;
+ if (!l2fib_entry_result_is_set_AGE_NOT (&result))
+ {
+ l2_bridge_domain_t *bd_config =
+ vec_elt_at_index (l2input_main.bd_configs, bd_index);
+
+ /* check if learn_count == 0 in case of race condition between 2
+ * workers adding an entry simultaneously */
+ /* learn_count variable may have little inaccuracy because they are
+ * not incremented/decremented with atomic operations */
+ /* l2fib_scan is call every 2sec fixing potential inaccuracy */
+ if (lm->global_learn_count)
+ lm->global_learn_count--;
+ if (bd_config->learn_count)
+ bd_config->learn_count--;
+ }
}
/* set up result */
l2fib_test_command_fn (vlib_main_t * vm,
unformat_input_t * input, vlib_cli_command_t * cmd)
{
- u8 mac[6], save_mac[6];
+ u8 mac[8], save_mac[6];
u32 bd_index = 0;
u32 sw_if_index = 8;
u32 is_add = 0;
return 1;
/* decrement counter if dynamically learned mac */
- if ((!l2fib_entry_result_is_set_AGE_NOT (&result)) &&
- (l2learn_main.global_learn_count))
- l2learn_main.global_learn_count--;
+ if (!l2fib_entry_result_is_set_AGE_NOT (&result))
+ {
+ l2_bridge_domain_t *bd_config =
+ vec_elt_at_index (l2input_main.bd_configs, bd_index);
+ if (l2learn_main.global_learn_count)
+ l2learn_main.global_learn_count--;
+ if (bd_config->learn_count)
+ bd_config->learn_count--;
+ }
/* Remove entry from hash table */
BV (clib_bihash_add_del) (&mp->mac_table, &kv, 0 /* is_add */ );
};
/* *INDENT-ON* */
+static clib_error_t *
+l2fib_set_scan_delay (vlib_main_t *vm, unformat_input_t *input,
+ vlib_cli_command_t *cmd)
+{
+ clib_error_t *error = 0;
+ u32 scan_delay;
+ l2fib_main_t *fm = &l2fib_main;
+
+ if (!unformat (input, "%d", &scan_delay))
+ {
+ error = clib_error_return (0, "expecting delay but got `%U'",
+ format_unformat_error, input);
+ goto done;
+ }
+ fm->event_scan_delay = (f64) (scan_delay) *10e-3;
+ l2fib_flush_all_mac (vlib_get_main ());
+done:
+ return error;
+}
+
+/*?
+ * This command set scan delay (in 1/10s unit)
+ *
+?*/
+VLIB_CLI_COMMAND (l2fib_set_scan_delay_cli, static) = {
+ .path = "set l2fib scan-delay",
+ .short_help = "set l2fib scan-delay <delay>",
+ .function = l2fib_set_scan_delay,
+};
+
/**
Kick off ager to scan MACs to age/delete MAC entries
*/
void
l2fib_flush_int_mac (vlib_main_t * vm, u32 sw_if_index)
{
- *l2fib_swif_seq_num (sw_if_index) += 1;
+ l2_input_seq_num_inc (sw_if_index);
l2fib_start_ager_scan (vm);
}
l2fib_sw_interface_up_down (vnet_main_t * vnm, u32 sw_if_index, u32 flags)
{
l2_input_config_t *config = l2input_intf_config (sw_if_index);
- if ((flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) == 0 && config->bridge)
+ if ((flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) == 0 &&
+ l2_input_is_bridge (config))
l2fib_flush_int_mac (vnm->vlib_main, sw_if_index);
return 0;
}
l2fib_main_t *fm = &l2fib_main;
vl_api_l2_macs_event_t *mp = vl_msg_api_alloc
(sizeof (*mp) + (fm->max_macs_in_event * sizeof (vl_api_mac_entry_t)));
- mp->_vl_msg_id = htons (VL_API_L2_MACS_EVENT);
+ mp->_vl_msg_id = htons (l2input_main.msg_id_base + VL_API_L2_MACS_EVENT);
mp->pid = htonl (client);
mp->client_index = client_index;
return mp;
u32 cl_idx = lm->client_index;
vl_api_l2_macs_event_t *mp = 0;
vl_api_registration_t *reg = 0;
+ u32 bd_index;
+ static u32 *bd_learn_counts = 0;
/* Don't scan the l2 fib if it hasn't been instantiated yet */
if (alloc_arena (h) == 0)
return 0.0;
+ vec_reset_length (bd_learn_counts);
+ vec_validate (bd_learn_counts, vec_len (l2input_main.bd_configs) - 1);
+
if (client)
{
mp = allocate_mac_evt_buf (client, cl_idx);
if (delta_t > 20e-6)
{
vlib_process_suspend (vm, 100e-6); /* suspend for 100 us */
+ /* in case a new bd was created while sleeping */
+ vec_validate (bd_learn_counts,
+ vec_len (l2input_main.bd_configs) - 1);
last_start = vlib_time_now (vm);
accum_t += delta_t;
}
{
BVT (clib_bihash_bucket) * b =
BV (clib_bihash_get_bucket) (h, i + 3);
- CLIB_PREFETCH (b, CLIB_CACHE_LINE_BYTES, LOAD);
+ clib_prefetch_load (b);
b = BV (clib_bihash_get_bucket) (h, i + 1);
if (!BV (clib_bihash_bucket_is_empty) (b))
{
BVT (clib_bihash_value) * v =
BV (clib_bihash_get_value) (h, b->offset);
- CLIB_PREFETCH (v, CLIB_CACHE_LINE_BYTES, LOAD);
+ clib_prefetch_load (v);
}
}
l2fib_entry_result_t result = {.raw = v->kvp[k].value };
if (!l2fib_entry_result_is_set_AGE_NOT (&result))
- learn_count++;
+ {
+ learn_count++;
+ vec_elt (bd_learn_counts, key.fields.bd_index)++;
+ }
if (client)
{
/* start aging processing */
u32 bd_index = key.fields.bd_index;
u32 sw_if_index = result.fields.sw_if_index;
- u16 sn = l2fib_cur_seq_num (bd_index, sw_if_index).as_u16;
- if (result.fields.sn.as_u16 != sn)
+ u16 sn = l2fib_cur_seq_num (bd_index, sw_if_index);
+ if (result.fields.sn != sn)
goto age_out; /* stale mac */
l2_bridge_domain_t *bd_config =
kv.key = key.raw;
BV (clib_bihash_add_del) (&fm->mac_table, &kv, 0);
learn_count--;
+ vec_elt (bd_learn_counts, key.fields.bd_index)--;
/*
* Note: we may have just freed the bucket's backing
* storage, so check right here...
/* keep learn count consistent */
l2learn_main.global_learn_count = learn_count;
+ vec_foreach_index (bd_index, l2input_main.bd_configs)
+ {
+ vec_elt (l2input_main.bd_configs, bd_index).learn_count =
+ vec_elt (bd_learn_counts, bd_index);
+ }
if (mp)
{