X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fl2%2Fl2_fib.h;h=ee6f0dc56a4074f7fcfa15c4026252f527a777b9;hb=001fd406df771f1cf73ca0dea440c8bde309e077;hp=7e49d74baf8abc8c10d6c28091bab2366e7c602e;hpb=da1f2c7cffb0de4ef05a48ffd107214eb11fa45f;p=vpp.git

diff --git a/src/vnet/l2/l2_fib.h b/src/vnet/l2/l2_fib.h
index 7e49d74baf8..ee6f0dc56a4 100644
--- a/src/vnet/l2/l2_fib.h
+++ b/src/vnet/l2/l2_fib.h
@@ -27,6 +27,22 @@
 #define L2FIB_NUM_BUCKETS (64 * 1024)
 #define L2FIB_MEMORY_SIZE (256<<20)
 
+typedef struct
+{
+
+  /* hash table */
+  BVT (clib_bihash) mac_table;
+
+  /* per swif vector of sequence number for interface based flush of MACs */
+  u8 *swif_seq_num;
+
+  /* convenience variables */
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+} l2fib_main_t;
+
+extern l2fib_main_t l2fib_main;
+
 /*
  * The L2fib key is the mac address and bridge domain ID
  */
@@ -50,6 +66,20 @@ typedef struct
 
 STATIC_ASSERT_SIZEOF (l2fib_entry_key_t, 8);
 
+
+typedef struct
+{
+  union
+  {
+    struct
+    {
+      u8 swif;
+      u8 bd;
+    };
+    u16 as_u16;
+  };
+} l2fib_seq_num_t;
+
 /*
  * The l2fib entry results
  */
@@ -66,8 +96,7 @@ typedef struct
       u8 filter:1;		/* drop packets to/from this mac */
       u8 unused1:5;
       u8 timestamp;		/* timestamp for aging */
-      u8 int_sn;		/* interface seq num */
-      u8 bd_sn;			/* bridge domain seq num */
+      l2fib_seq_num_t sn;	/* bd/int seq num */
     } fields;
     u64 raw;
   };
@@ -314,13 +343,26 @@ l2fib_lookup_4 (BVT (clib_bihash) * mac_table,
     }
 }
 
-void l2fib_clear_table (uint keep_static);
+void l2fib_clear_table (void);
 
 void
 l2fib_add_entry (u64 mac,
 		 u32 bd_index,
 		 u32 sw_if_index, u32 static_mac, u32 drop_mac, u32 bvi_mac);
 
+static inline void
+l2fib_add_fwd_entry (u64 mac, u32 bd_index, u32 sw_if_index, u32 static_mac,
+		     u32 bvi_mac)
+{
+  l2fib_add_entry (mac, bd_index, sw_if_index, static_mac, 0, bvi_mac);
+}
+
+static inline void
+l2fib_add_filter_entry (u64 mac, u32 bd_index)
+{
+  l2fib_add_entry (mac, bd_index, ~0, 1, 1, 0);
+}
+
 u32 l2fib_del_entry (u64 mac, u32 bd_index);
 
 void l2fib_start_ager_scan (vlib_main_t * vm);
@@ -329,12 +371,29 @@ void l2fib_flush_int_mac (vlib_main_t * vm, u32 sw_if_index);
 
 void l2fib_flush_bd_mac (vlib_main_t * vm, u32 bd_index);
 
+void l2fib_flush_all_mac (vlib_main_t * vm);
+
 void
 l2fib_table_dump (u32 bd_index, l2fib_entry_key_t ** l2fe_key,
 		  l2fib_entry_result_t ** l2fe_res);
 
 u8 *format_vnet_sw_if_index_name_with_NA (u8 * s, va_list * args);
 
+static_always_inline u8 *
+l2fib_swif_seq_num (u32 sw_if_index)
+{
+  l2fib_main_t *mp = &l2fib_main;
+  return vec_elt_at_index (mp->swif_seq_num, sw_if_index);
+}
+
+static_always_inline u8 *
+l2fib_valid_swif_seq_num (u32 sw_if_index)
+{
+  l2fib_main_t *mp = &l2fib_main;
+  vec_validate (mp->swif_seq_num, sw_if_index);
+  return l2fib_swif_seq_num (sw_if_index);
+}
+
 BVT (clib_bihash) * get_mac_table (void);
 
 #endif