aboutsummaryrefslogtreecommitdiffstats
path: root/src/vnet/l2/l2_api.c
diff options
context:
space:
mode:
authorEyal Bari <ebari@cisco.com>2017-06-25 14:42:33 +0300
committerJohn Lo <loj@cisco.com>2017-06-27 12:41:56 +0000
commit25ff2ea3a31e422094f6d91eab46222a29a77c4b (patch)
treea8249ce452d6af4daa66e09851ae689612286e71 /src/vnet/l2/l2_api.c
parente2547ab574a82c69482704ef27375f1391deb9af (diff)
L2-LEARN:fix l2fib entry seq num not updated on hit (VPP-888)
fixed instability in l2bd_multi_instnce test - sometimes failing with extra packets captured it appears l2-learn was not updating hit entries but rather a copy of them. if the ager did not have a chance to run before the test was running the learning cycle - entries were not updated with the packet's seq num - causing packets to flood when hitting the stale seq_num in l2-fwd - hence the extra packets fixed handling of filter entries revert workaround for instability in test Change-Id: I16d918e6310a5bf40bad5b7335b2140c2867cb71 Signed-off-by: Eyal Bari <ebari@cisco.com>
Diffstat (limited to 'src/vnet/l2/l2_api.c')
-rw-r--r--src/vnet/l2/l2_api.c28
1 files changed, 11 insertions, 17 deletions
diff --git a/src/vnet/l2/l2_api.c b/src/vnet/l2/l2_api.c
index aa3dcb7e49e..a0b40d6d840 100644
--- a/src/vnet/l2/l2_api.c
+++ b/src/vnet/l2/l2_api.c
@@ -187,30 +187,24 @@ vl_api_l2fib_add_del_t_handler (vl_api_l2fib_add_del_t * mp)
l2input_main_t *l2im = &l2input_main;
vl_api_l2fib_add_del_reply_t *rmp;
int rv = 0;
- u64 mac = 0;
- u32 sw_if_index = ntohl (mp->sw_if_index);
u32 bd_id = ntohl (mp->bd_id);
- u32 bd_index;
- u32 static_mac;
- u32 filter_mac;
- u32 bvi_mac;
- uword *p;
-
- mac = mp->mac;
+ uword *p = hash_get (bdm->bd_index_by_bd_id, bd_id);
- p = hash_get (bdm->bd_index_by_bd_id, bd_id);
if (!p)
{
rv = VNET_API_ERROR_NO_SUCH_ENTRY;
goto bad_sw_if_index;
}
- bd_index = p[0];
+ u32 bd_index = p[0];
+ u64 mac = mp->mac;
if (mp->is_add)
{
- filter_mac = mp->filter_mac ? 1 : 0;
- if (filter_mac == 0)
+ if (mp->filter_mac)
+ l2fib_add_filter_entry (mac, bd_index);
+ else
{
+ u32 sw_if_index = ntohl (mp->sw_if_index);
VALIDATE_SW_IF_INDEX (mp);
if (vec_len (l2im->configs) <= sw_if_index)
{
@@ -227,11 +221,11 @@ vl_api_l2fib_add_del_t_handler (vl_api_l2fib_add_del_t * mp)
goto bad_sw_if_index;
}
}
+ u32 static_mac = mp->static_mac ? 1 : 0;
+ u32 bvi_mac = mp->bvi_mac ? 1 : 0;
+ l2fib_add_fwd_entry (mac, bd_index, sw_if_index, static_mac,
+ bvi_mac);
}
- static_mac = mp->static_mac ? 1 : 0;
- bvi_mac = mp->bvi_mac ? 1 : 0;
- l2fib_add_entry (mac, bd_index, sw_if_index, static_mac, filter_mac,
- bvi_mac);
}
else
{