*
*/
-typedef struct
-{
-
- /* hash table */
- BVT (clib_bihash) mac_table;
-
- /* convenience variables */
- vlib_main_t *vlib_main;
- vnet_main_t *vnet_main;
-} l2fib_main_t;
-
l2fib_main_t l2fib_main;
-
/** Format sw_if_index. If the value is ~0, use the text "N/A" */
u8 *
format_vnet_sw_if_index_name_with_NA (u8 * s, va_list * args)
u32 sw_if_index = va_arg (*args, u32);
if (sw_if_index == ~0)
return format (s, "N/A");
- else
- return format (s, "%U",
- format_vnet_sw_interface_name, vnm,
- vnet_get_sw_interface (vnm, sw_if_index));
+
+ vnet_sw_interface_t *swif = vnet_get_sw_interface_safe (vnm, sw_if_index);
+ if (!swif)
+ return format (s, "Stale");
+
+ return format (s, "%U", format_vnet_sw_interface_name, vnm,
+ vnet_get_sw_interface_safe (vnm, sw_if_index));
}
void
{
l2fib_main_t *msm = &l2fib_main;
BVT (clib_bihash) * h = &msm->mac_table;
- clib_bihash_bucket_t *b;
+ BVT (clib_bihash_bucket) * b;
BVT (clib_bihash_value) * v;
l2fib_entry_key_t key;
l2fib_entry_result_t result;
l2fib_main_t *msm = &l2fib_main;
l2_bridge_domain_t *bd_config;
BVT (clib_bihash) * h = &msm->mac_table;
- clib_bihash_bucket_t *b;
+ BVT (clib_bihash_bucket) * b;
BVT (clib_bihash_value) * v;
l2fib_entry_key_t key;
l2fib_entry_result_t result;
key.fields.bd_index,
result.fields.sw_if_index == ~0
? -1 : result.fields.sw_if_index,
- result.fields.bd_sn, result.fields.int_sn,
+ result.fields.sn.bd, result.fields.sn.swif,
s, result.fields.static_mac ? "*" : "-",
result.fields.filter ? "*" : "-",
result.fields.bvi ? "*" : "-",
if (total_entries == 0)
vlib_cli_output (vm, "no l2fib entries");
else
- vlib_cli_output (vm, "%lld l2fib entries", total_entries);
+ vlib_cli_output (vm,
+ "%lld l2fib entries with %d learned (or non-static) entries",
+ total_entries, l2learn_main.global_learn_count);
if (raw)
vlib_cli_output (vm, "Raw Hash Table:\n%U\n",
/* Remove all entries from the l2fib */
void
-l2fib_clear_table (uint keep_static)
+l2fib_clear_table (void)
{
l2fib_main_t *mp = &l2fib_main;
- if (keep_static)
- {
- /* TODO: remove only non-static entries */
- }
- else
- {
- /* Remove all entries */
- BV (clib_bihash_free) (&mp->mac_table);
- BV (clib_bihash_init) (&mp->mac_table, "l2fib mac table",
- L2FIB_NUM_BUCKETS, L2FIB_MEMORY_SIZE);
- }
-
+ /* Remove all entries */
+ BV (clib_bihash_free) (&mp->mac_table);
+ BV (clib_bihash_init) (&mp->mac_table, "l2fib mac table",
+ L2FIB_NUM_BUCKETS, L2FIB_MEMORY_SIZE);
l2learn_main.global_learn_count = 0;
}
clear_l2fib (vlib_main_t * vm,
unformat_input_t * input, vlib_cli_command_t * cmd)
{
- l2fib_clear_table (0);
+ l2fib_clear_table ();
return 0;
}
};
/* *INDENT-ON* */
+static inline 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* */
+}
/**
* Add an entry to the l2fib.
* If the entry already exists then overwrite it
*/
void
-l2fib_add_entry (u64 mac,
- u32 bd_index,
+l2fib_add_entry (u64 mac, u32 bd_index,
u32 sw_if_index, u32 static_mac, u32 filter_mac, u32 bvi_mac)
{
l2fib_entry_key_t key;
result.fields.filter = filter_mac;
result.fields.bvi = bvi_mac;
if (!static_mac)
- {
- l2_input_config_t *int_config = l2input_intf_config (sw_if_index);
- l2_bridge_domain_t *bd_config =
- vec_elt_at_index (l2input_main.bd_configs,
- bd_index);
- result.fields.int_sn = int_config->seq_num;
- result.fields.bd_sn = bd_config->seq_num;
- }
+ result.fields.sn = l2fib_cur_seq_num (bd_index, sw_if_index);
kv.key = key.raw;
kv.value = result.raw;
BV (clib_bihash_add_del) (&mp->mac_table, &kv, 1 /* is_add */ );
/* increment counter if dynamically learned mac */
- if (result.fields.static_mac)
+ if (result.fields.static_mac == 0)
{
l2learn_main.global_learn_count++;
}
}
}
- l2fib_add_entry (mac, bd_index, sw_if_index, static_mac, filter_mac,
- bvi_mac);
+ if (vec_len (l2input_main.configs) <= sw_if_index)
+ {
+ error = clib_error_return (0, "Interface sw_if_index %d not in L2 mode",
+ sw_if_index);
+ goto done;
+ }
+
+ if (filter_mac)
+ l2fib_add_filter_entry (mac, bd_index);
+ else
+ l2fib_add_fwd_entry (mac, bd_index, sw_if_index, static_mac, bvi_mac);
done:
return error;
u64 mac, save_mac;
u32 bd_index = 0;
u32 sw_if_index = 8;
- u32 filter_mac = 0;
u32 bvi_mac = 0;
u32 is_add = 0;
u32 is_del = 0;
for (i = 0; i < count; i++)
{
u64 tmp;
- l2fib_add_entry (mac, bd_index, sw_if_index, mac,
- filter_mac, bvi_mac);
+ l2fib_add_fwd_entry (mac, bd_index, sw_if_index, mac, bvi_mac);
tmp = clib_net_to_host_u64 (mac);
tmp >>= 16;
tmp++;
* Delete an entry from the l2fib.
* Return 0 if the entry was deleted, or 1 if it was not found
*/
-u32
-l2fib_del_entry (u64 mac, u32 bd_index)
+static u32
+l2fib_del_entry_by_key (u64 raw_key)
{
l2fib_entry_result_t result;
BVT (clib_bihash_kv) kv;
/* set up key */
- kv.key = l2fib_make_key ((u8 *) & mac, bd_index);
+ kv.key = raw_key;
if (BV (clib_bihash_search) (&mp->mac_table, &kv, &kv))
return 1;
result.raw = kv.value;
/* decrement counter if dynamically learned mac */
- if (result.fields.static_mac)
+ if (result.fields.static_mac == 0)
{
if (l2learn_main.global_learn_count > 0)
{
return 0;
}
+/**
+ * Delete an entry from the l2fib.
+ * Return 0 if the entry was deleted, or 1 if it was not found
+ */
+u32
+l2fib_del_entry (u64 mac, u32 bd_index)
+{
+ return l2fib_del_entry_by_key (l2fib_make_key ((u8 *) & mac, bd_index));
+}
+
/**
* Delete an entry from the L2FIB.
* The CLI format is:
}
/**
- Flush all learned MACs from an interface
+ Flush all non static MACs from an interface
*/
void
l2fib_flush_int_mac (vlib_main_t * vm, u32 sw_if_index)
{
- l2_input_config_t *int_config;
- int_config = l2input_intf_config (sw_if_index);
- int_config->seq_num += 1;
+ *l2fib_swif_seq_num (sw_if_index) += 1;
l2fib_start_ager_scan (vm);
}
/**
- Flush all learned MACs in a bridge domain
+ Flush all non static MACs in a bridge domain
*/
void
l2fib_flush_bd_mac (vlib_main_t * vm, u32 bd_index)
{
- l2_bridge_domain_t *bd_config;
- bd_config = l2input_bd_config (bd_index);
+ l2_bridge_domain_t *bd_config = l2input_bd_config (bd_index);
bd_config->seq_num += 1;
l2fib_start_ager_scan (vm);
}
+/**
+ Flush all non static MACs - flushes all valid BDs
+*/
+void
+l2fib_flush_all_mac (vlib_main_t * vm)
+{
+ l2_bridge_domain_t *bd_config;
+ vec_foreach (bd_config, l2input_main.bd_configs)
+ if (bd_is_valid (bd_config))
+ bd_config->seq_num += 1;
+
+ l2fib_start_ager_scan (vm);
+}
+
+
/**
Flush MACs, except static ones, associated with an interface
The CLI format is:
return error;
}
+/**
+ Flush all MACs, except static ones
+ The CLI format is:
+ l2fib flush-mac all
+*/
+static clib_error_t *
+l2fib_flush_mac_all (vlib_main_t * vm,
+ unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+ l2fib_flush_all_mac (vm);
+ return 0;
+}
+
+/*?
+ * This command kick off ager to delete all existing MAC Address entries,
+ * except static ones, associated with an interface from the L2 FIB table.
+ *
+ * @cliexpar
+ * Example of how to flush MAC Address entries learned on an interface from the L2 FIB table:
+ * @cliexcmd{l2fib flush-mac interface GigabitEthernet2/1/0}
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (l2fib_flush_mac_all_cli, static) = {
+ .path = "l2fib flush-mac all",
+ .short_help = "l2fib flush-mac all",
+ .function = l2fib_flush_mac_all,
+};
+/* *INDENT-ON* */
+
/*?
* This command kick off ager to delete all existing MAC Address entries,
* except static ones, associated with an interface from the L2 FIB table.
{
uword event_type, *event_data = 0;
l2fib_main_t *msm = &l2fib_main;
- l2_input_config_t *int_config;
- l2_bridge_domain_t *bd_config;
- BVT (clib_bihash) * h = &msm->mac_table;
- clib_bihash_bucket_t *b;
- BVT (clib_bihash_value) * v;
- l2fib_entry_key_t key;
- l2fib_entry_result_t result;
- int i, j, k;
bool enabled = 0;
f64 start_time, last_run_duration = 0, t;
- i16 delta;
while (1)
{
ASSERT (0);
}
last_run_duration = start_time = vlib_time_now (vm);
+
+ BVT (clib_bihash) * h = &msm->mac_table;
+ int i, j, k;
for (i = 0; i < h->nbuckets; i++)
{
/* Allow no more than 10us without a pause */
if (i < (h->nbuckets - 3))
{
- b = &h->buckets[i + 3];
+ BVT (clib_bihash_bucket) * b = &h->buckets[i + 3];
CLIB_PREFETCH (b, CLIB_CACHE_LINE_BYTES, LOAD);
b = &h->buckets[i + 1];
if (b->offset)
{
- v = BV (clib_bihash_get_value) (h, b->offset);
+ BVT (clib_bihash_value) * v =
+ BV (clib_bihash_get_value) (h, b->offset);
CLIB_PREFETCH (v, CLIB_CACHE_LINE_BYTES, LOAD);
}
}
- b = &h->buckets[i];
+ BVT (clib_bihash_bucket) * b = &h->buckets[i];
if (b->offset == 0)
continue;
- v = BV (clib_bihash_get_value) (h, b->offset);
+ BVT (clib_bihash_value) * v =
+ BV (clib_bihash_get_value) (h, b->offset);
for (j = 0; j < (1 << b->log2_pages); j++)
{
for (k = 0; k < BIHASH_KVP_PER_PAGE; k++)
if (v->kvp[k].key == ~0ULL && v->kvp[k].value == ~0ULL)
continue;
- key.raw = v->kvp[k].key;
- result.raw = v->kvp[k].value;
+ l2fib_entry_key_t key = {.raw = v->kvp[k].key };
+ l2fib_entry_result_t result = {.raw = v->kvp[k].value };
if (result.fields.static_mac)
continue;
- int_config =
- l2input_intf_config (result.fields.sw_if_index);
- bd_config =
- vec_elt_at_index (l2input_main.bd_configs,
- key.fields.bd_index);
-
- if ((result.fields.int_sn != int_config->seq_num) ||
- (result.fields.bd_sn != bd_config->seq_num))
+ 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)
{
- void *p = &key.fields.mac;
- l2fib_del_entry (*(u64 *) p, key.fields.bd_index);
+ l2fib_del_entry_by_key (key.raw);
continue;
}
+ l2_bridge_domain_t *bd_config =
+ vec_elt_at_index (l2input_main.bd_configs, bd_index);
if (bd_config->mac_age == 0)
continue;
- delta = (u8) (start_time / 60) - result.fields.timestamp;
+ i16 delta =
+ (u8) (start_time / 60) - result.fields.timestamp;
delta += delta < 0 ? 256 : 0;
if (delta > bd_config->mac_age)
- {
- void *p = &key.fields.mac;
- l2fib_del_entry (*(u64 *) p, key.fields.bd_index);
- }
+ l2fib_del_entry_by_key (key.raw);
}
v++;
}
Code Review / vpp.git / blobdiff