diff options
| author |   Eyal Bari <ebari@cisco.com> | 2017-06-14 13:11:20 +0300 |
|---|---|---|
| committer |   John Lo <loj@cisco.com> | 2017-06-19 22:24:19 +0000 |
| commit | 0f360dc3aa40d0654198bd3f3850bd31a0d78f7e (patch) | |
| tree | 2e0d277a48c1a1babdf548690814a02b189f5063 /src/vnet/l2/l2_input.c | |
| parent | 08ce432ce9727c7e099ea6c4630e4e6ebbecc92a (diff) | |
L2FWD:fix seq_num overwritten + validate l2fib entries when forwarding
l2_classify memeber table_index was overlaid over l2.l2fib_seq_num
which over written when table_index gets initialized in l2_input_classify
solved by overlaying both table_index and opaque_index as only one is used
seperated l2fib seq num from l2_input configs
for better handling of theoretical ABA issue where an entry for a deleted
interface is considered valid by the ager because a different interface with
same sw_if_index and seq_num was created before the ager got a chance to delete
Change-Id: I7b0eeded971627406f1c80834d7e02c0ebe62136
Signed-off-by: Eyal Bari <ebari@cisco.com>
Diffstat (limited to 'src/vnet/l2/l2_input.c')
| -rw-r--r-- | src/vnet/l2/l2_input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vnet/l2/l2_input.c b/src/vnet/l2/l2_input.c index aca23fe03fc..22fc2a9894f 100644 --- a/src/vnet/l2/l2_input.c +++ b/src/vnet/l2/l2_input.c @@ -205,7 +205,7 @@ classify_and_dispatch (vlib_main_t * vm, /* Save bridge domain and interface seq_num */ /* *INDENT-OFF* */ l2fib_seq_num_t sn = { - .swif = config->seq_num, + .swif = *l2fib_swif_seq_num(sw_if_index0), .bd = bd_config->seq_num, }; /* *INDENT-ON* */ @@ -637,7 +637,7 @@ set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main, /* */ config->xconnect = 0; config->bridge = 1; config->bd_index = bd_index; - config->seq_num += 1; + *l2fib_swif_seq_num (sw_if_index) += 1; /* * Enable forwarding, flooding, learning and ARP termination by default |