misc: add address sanitizer heap instrumentation

[vpp.git] / src / vnet / ethernet / interface.c

diff --git a/src/vnet/ethernet/interface.c b/src/vnet/ethernet/interface.c
index f1e6785..d796692 100644 (file)
--- a/src/vnet/ethernet/interface.c
+++ b/src/vnet/ethernet/interface.c
@@ -41,6 +41,7 @@
 #include <vnet/ip/ip.h>
 #include <vnet/pg/pg.h>
 #include <vnet/ethernet/ethernet.h>
+#include <vnet/ethernet/arp.h>
 #include <vnet/l2/l2_input.h>
 #include <vnet/l2/l2_bd.h>
 #include <vnet/adj/adj.h>
@@ -277,7 +278,7 @@ clib_error_t *
 ethernet_register_interface (vnet_main_t * vnm,
                             u32 dev_class_index,
                             u32 dev_instance,
-                            u8 * address,
+                            const u8 * address,
                             u32 * hw_if_index_return,
                             ethernet_flag_change_function_t flag_change)
 {
@@ -310,6 +311,7 @@ ethernet_register_interface (vnet_main_t * vnm,
 
   clib_memcpy (ei->address, address, sizeof (ei->address));
   vec_add (hi->hw_address, address, sizeof (ei->address));
+  CLIB_MEM_UNPOISON (hi->hw_address, 8);
 
   if (error)
     {
@@ -658,9 +660,6 @@ VNET_DEVICE_CLASS (ethernet_simulated_device_class) = {
 };
 /* *INDENT-ON* */
 
-VLIB_DEVICE_TX_FUNCTION_MULTIARCH (ethernet_simulated_device_class,
-                                  simulated_ethernet_interface_tx);
-
 /*
  * Maintain a bitmap of allocated loopback instance numbers.
  */
@@ -894,6 +893,53 @@ ethernet_get_interface (ethernet_main_t * em, u32 hw_if_index)
          index ? pool_elt_at_index (em->interfaces, i->hw_instance) : 0);
 }
 
+mac_address_t *
+ethernet_interface_add_del_address (ethernet_main_t * em,
+                                   u32 hw_if_index, const u8 * address,
+                                   u8 is_add)
+{
+  ethernet_interface_t *ei = ethernet_get_interface (em, hw_if_index);
+  mac_address_t *if_addr = 0;
+
+  /* return if there is not an ethernet interface for this hw interface */
+  if (!ei)
+    return 0;
+
+  /* determine whether the address is configured on the interface */
+  vec_foreach (if_addr, ei->secondary_addrs)
+  {
+    if (!ethernet_mac_address_equal (if_addr->bytes, address))
+      continue;
+
+    break;
+  }
+
+  if (if_addr && vec_is_member (ei->secondary_addrs, if_addr))
+    {
+      /* delete found address */
+      if (!is_add)
+       {
+         vec_delete (ei->secondary_addrs, 1, if_addr - ei->secondary_addrs);
+         if_addr = 0;
+       }
+      /* address already found, so nothing needs to be done if adding */
+    }
+  else
+    {
+      /* if_addr could be 0 or past the end of the vector. reset to 0 */
+      if_addr = 0;
+
+      /* add new address */
+      if (is_add)
+       {
+         vec_add2 (ei->secondary_addrs, if_addr, 1);
+         clib_memcpy (&if_addr->bytes, address, sizeof (if_addr->bytes));
+       }
+    }
+
+  return if_addr;
+}
+
 int
 vnet_delete_loopback_interface (u32 sw_if_index)
 {
@@ -914,6 +960,48 @@ vnet_delete_loopback_interface (u32 sw_if_index)
   return 0;
 }
 
+int
+vnet_create_sub_interface (u32 sw_if_index, u32 id,
+                          u32 flags, u16 inner_vlan_id, u16 outer_vlan_id,
+                          u32 * sub_sw_if_index)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_interface_main_t *im = &vnm->interface_main;
+  vnet_hw_interface_t *hi;
+  u64 sup_and_sub_key = ((u64) (sw_if_index) << 32) | (u64) id;
+  vnet_sw_interface_t template;
+  uword *p;
+  u64 *kp;
+
+  hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
+
+  p = hash_get_mem (im->sw_if_index_by_sup_and_sub, &sup_and_sub_key);
+  if (p)
+    {
+      return (VNET_API_ERROR_VLAN_ALREADY_EXISTS);
+    }
+
+  clib_memset (&template, 0, sizeof (template));
+  template.type = VNET_SW_INTERFACE_TYPE_SUB;
+  template.flood_class = VNET_FLOOD_CLASS_NORMAL;
+  template.sup_sw_if_index = sw_if_index;
+  template.sub.id = id;
+  template.sub.eth.raw_flags = flags;
+  template.sub.eth.outer_vlan_id = outer_vlan_id;
+  template.sub.eth.inner_vlan_id = inner_vlan_id;
+
+  if (vnet_create_sw_interface (vnm, &template, sub_sw_if_index))
+    return (VNET_API_ERROR_UNSPECIFIED);
+
+  kp = clib_mem_alloc (sizeof (*kp));
+  *kp = sup_and_sub_key;
+
+  hash_set (hi->sub_interface_sw_if_index_by_id, id, *sub_sw_if_index);
+  hash_set_mem (im->sw_if_index_by_sup_and_sub, kp, *sub_sw_if_index);
+
+  return (0);
+}
+
 int
 vnet_delete_sub_interface (u32 sw_if_index)
 {