X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbonding%2Fdevice.c;h=550321b3763acdaaeeea89e974b63d94f33d7891;hb=cbe25aab3be72154f2c706c39eeba6a77f34450f;hp=c9e8b4a50eb7969f4cb36e458653f694c97f5f5a;hpb=751e3f3824fc1a318f8c71ade664bd13c16b335e;p=vpp.git

diff --git a/src/vnet/bonding/device.c b/src/vnet/bonding/device.c
index c9e8b4a50eb..550321b3763 100644
--- a/src/vnet/bonding/device.c
+++ b/src/vnet/bonding/device.c
@@ -24,7 +24,7 @@
 #include <vnet/bonding/node.h>
 #include <vppinfra/lb_hash_hash.h>
 #include <vnet/ip/ip.h>
-#include <vnet/ethernet/arp_packet.h>
+#include <vnet/ip-neighbor/ip_neighbor.h>
 
 #define foreach_bond_tx_error     \
   _(NONE, "no error")             \
@@ -142,6 +142,50 @@ bond_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
   return 0;
 }
 
+static clib_error_t *
+bond_add_del_mac_address (vnet_hw_interface_t * hi, const u8 * address,
+			  u8 is_add)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  bond_if_t *bif;
+  clib_error_t *error = 0;
+  vnet_hw_interface_t *s_hi;
+  int i;
+
+
+  bif = bond_get_master_by_sw_if_index (hi->sw_if_index);
+  if (!bif)
+    {
+      return clib_error_return (0, "No bond master found for sw_if_index %u",
+				hi->sw_if_index);
+    }
+
+  /* Add/del address on each slave hw intf, they control the hardware */
+  vec_foreach_index (i, bif->slaves)
+  {
+    s_hi = vnet_get_sup_hw_interface (vnm, vec_elt (bif->slaves, i));
+    error = vnet_hw_interface_add_del_mac_address (vnm, s_hi->hw_if_index,
+						   address, is_add);
+
+    if (error)
+      {
+	int j;
+
+	/* undo any that were completed before the failure */
+	for (j = i - 1; j > -1; j--)
+	  {
+	    s_hi = vnet_get_sup_hw_interface (vnm, vec_elt (bif->slaves, j));
+	    vnet_hw_interface_add_del_mac_address (vnm, s_hi->hw_if_index,
+						   address, !(is_add));
+	  }
+
+	return error;
+      }
+  }
+
+  return 0;
+}
+
 static_always_inline void
 bond_tx_add_to_queue (bond_per_thread_data_t * ptd, u32 port, u32 bi)
 {
@@ -449,6 +493,7 @@ bond_tx_inline (vlib_main_t * vm, bond_if_t * bif, vlib_buffer_t ** b,
 
       n_left -= 1;
       b += 1;
+      h += 1;
     }
 }
 
@@ -745,11 +790,6 @@ done:
 	  ptd->per_port_queue[p].n_buffers = 0;
 	}
     }
-
-  vlib_increment_simple_counter (vnet_main.interface_main.sw_if_counters
-				 + VNET_INTERFACE_COUNTER_TX, thread_index,
-				 bif->sw_if_index, frame->n_vectors);
-
   return frame->n_vectors;
 }
 
@@ -759,8 +799,7 @@ bond_active_interface_switch_cb (vnet_main_t * vnm, u32 sw_if_index,
 {
   bond_main_t *bm = &bond_main;
 
-  send_ip4_garp (bm->vlib_main, sw_if_index);
-  send_ip6_na (bm->vlib_main, sw_if_index);
+  ip_neighbor_advertise (bm->vlib_main, IP46_TYPE_BOTH, NULL, sw_if_index);
 
   return (WALK_CONTINUE);
 }
@@ -782,9 +821,10 @@ bond_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
       for (i = 0; i < vec_len (event_data); i++)
 	{
 	  hw_if_index = event_data[i];
-	  /* walk hw interface to process all subinterfaces */
-	  vnet_hw_interface_walk_sw (vnm, hw_if_index,
-				     bond_active_interface_switch_cb, 0);
+	  if (vnet_get_hw_interface_or_null (vnm, hw_if_index))
+	    /* walk hw interface to process all subinterfaces */
+	    vnet_hw_interface_walk_sw (vnm, hw_if_index,
+				       bond_active_interface_switch_cb, 0);
 	}
       vec_reset_length (event_data);
     }
@@ -794,6 +834,7 @@ bond_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (bond_process_node) = {
   .function = bond_process,
+  .flags = VLIB_NODE_FLAG_TRACE_SUPPORTED,
   .type = VLIB_NODE_TYPE_PROCESS,
   .name = "bond-process",
 };
@@ -809,10 +850,30 @@ VNET_DEVICE_CLASS (bond_dev_class) = {
   .admin_up_down_function = bond_interface_admin_up_down,
   .subif_add_del_function = bond_subif_add_del_function,
   .format_tx_trace = format_bond_tx_trace,
+  .mac_addr_add_del_function = bond_add_del_mac_address,
 };
 
 /* *INDENT-ON* */
 
+static clib_error_t *
+bond_slave_interface_add_del (vnet_main_t * vnm, u32 sw_if_index, u32 is_add)
+{
+  bond_main_t *bm = &bond_main;
+  slave_if_t *sif;
+  bond_detach_slave_args_t args = { 0 };
+
+  if (is_add)
+    return 0;
+  sif = bond_get_slave_by_sw_if_index (sw_if_index);
+  if (!sif)
+    return 0;
+  args.slave = sw_if_index;
+  bond_detach_slave (bm->vlib_main, &args);
+  return args.error;
+}
+
+VNET_SW_INTERFACE_ADD_DEL_FUNCTION (bond_slave_interface_add_del);
+
 /*
  * fd.io coding-style-patch-verification: ON
  *