bonding: Revert adjust link state

[vpp.git] / src / vnet / bonding / cli.c

diff --git a/src/vnet/bonding/cli.c b/src/vnet/bonding/cli.c
index 554ffe9..92a9ff0 100644 (file)
--- a/src/vnet/bonding/cli.c
+++ b/src/vnet/bonding/cli.c
@@ -63,10 +63,6 @@ bond_disable_collecting_distributing (vlib_main_t * vm, slave_if_t * sif)
     vlib_process_signal_event (bm->vlib_main, bond_process_node.index,
                               BOND_SEND_GARP_NA, bif->hw_if_index);
   clib_spinlock_unlock_if_init (&bif->lockp);
-
-  if (bif->mode == BOND_MODE_LACP)
-    stat_segment_set_state_counter (bm->stats[bif->sw_if_index]
-                                   [sif->sw_if_index], sif->actor.state);
 }
 
 /*
@@ -82,8 +78,8 @@ bond_slave_sort (void *a1, void *a2)
   slave_if_t *sif2 = bond_get_slave_by_sw_if_index (*s2);
   bond_if_t *bif;
 
-  ASSERT (sif1);
-  ASSERT (sif2);
+  ALWAYS_ASSERT (sif1);
+  ALWAYS_ASSERT (sif2);
   /*
    * sort entries according to preference rules:
    * 1. biggest weight
@@ -175,10 +171,6 @@ bond_enable_collecting_distributing (vlib_main_t * vm, slave_if_t * sif)
 
 done:
   clib_spinlock_unlock_if_init (&bif->lockp);
-
-  if (bif->mode == BOND_MODE_LACP)
-    stat_segment_set_state_counter (bm->stats[bif->sw_if_index]
-                                   [sif->sw_if_index], sif->actor.state);
 }
 
 int
@@ -329,8 +321,12 @@ bond_delete_neighbor (vlib_main_t * vm, bond_if_t * bif, slave_if_t * sif)
     (*bm->lacp_enable_disable) (vm, bif, sif, 0);
 
   if (bif->mode == BOND_MODE_LACP)
-    stat_segment_deregister_state_counter
-      (bm->stats[bif->sw_if_index][sif->sw_if_index]);
+    {
+      stat_segment_deregister_state_counter
+       (bm->stats[bif->sw_if_index][sif->sw_if_index].actor_state);
+      stat_segment_deregister_state_counter
+       (bm->stats[bif->sw_if_index][sif->sw_if_index].partner_state);
+    }
 
   pool_put (bm->neighbors, sif);
 }
@@ -383,6 +379,7 @@ bond_create_if (vlib_main_t * vm, bond_create_if_args_t * args)
   vnet_main_t *vnm = vnet_get_main ();
   vnet_sw_interface_t *sw;
   bond_if_t *bif;
+  vnet_hw_interface_t *hw;
 
   if ((args->mode == BOND_MODE_LACP) && bm->lacp_plugin_loaded == 0)
     {
@@ -408,6 +405,7 @@ bond_create_if (vlib_main_t * vm, bond_create_if_args_t * args)
   bif->id = args->id;
   bif->lb = args->lb;
   bif->mode = args->mode;
+  bif->gso = args->gso;
 
   // Adjust requested interface id
   if (bif->id == ~0)
@@ -458,6 +456,16 @@ bond_create_if (vlib_main_t * vm, bond_create_if_args_t * args)
   bif->sw_if_index = sw->sw_if_index;
   bif->group = bif->sw_if_index;
   bif->numa_only = args->numa_only;
+
+  hw = vnet_get_hw_interface (vnm, bif->hw_if_index);
+  /*
+   * Add GSO and Checksum offload flags if GSO is enabled on Bond
+   */
+  if (args->gso)
+    {
+      hw->flags |= (VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO |
+                   VNET_HW_INTERFACE_FLAG_SUPPORTS_TX_L4_CKSUM_OFFLOAD);
+    }
   if (vlib_get_thread_main ()->n_vlib_mains > 1)
     clib_spinlock_init (&bif->lockp);
 
@@ -500,6 +508,8 @@ bond_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
        args.hw_addr_set = 1;
       else if (unformat (line_input, "id %u", &args.id))
        ;
+      else if (unformat (line_input, "gso"))
+       args.gso = 1;
       else if (unformat (line_input, "numa-only"))
        {
          if (args.mode == BOND_MODE_LACP)
@@ -530,8 +540,8 @@ bond_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
 VLIB_CLI_COMMAND (bond_create_command, static) = {
   .path = "create bond",
   .short_help = "create bond mode {round-robin | active-backup | broadcast | "
-    "{lacp | xor} [load-balance { l2 | l23 | l34 } [numa-only]]} [hw-addr <mac-address>] "
-    "[id <if-id>]",
+    "{lacp | xor} [load-balance { l2 | l23 | l34 } [numa-only]]} "
+    "[hw-addr <mac-address>] [id <if-id>] [gso]",
   .function = bond_create_command_fn,
 };
 /* *INDENT-ON* */
@@ -619,6 +629,13 @@ bond_enslave (vlib_main_t * vm, bond_enslave_args_t * args)
        clib_error_return (0, "bond interface cannot be enslaved");
       return;
     }
+  if (bif->gso && !(sif_hw->flags & VNET_HW_INTERFACE_FLAG_SUPPORTS_GSO))
+    {
+      args->rv = VNET_API_ERROR_INVALID_INTERFACE;
+      args->error =
+       clib_error_return (0, "slave interface is not gso capable");
+      return;
+    }
   if (bif->mode == BOND_MODE_LACP)
     {
       u8 *name = format (0, "/if/lacp/%u/%u/state%c", bif->sw_if_index,
@@ -628,7 +645,19 @@ bond_enslave (vlib_main_t * vm, bond_enslave_args_t * args)
       vec_validate (bm->stats[bif->sw_if_index], args->slave);
 
       args->error = stat_segment_register_state_counter
-       (name, &bm->stats[bif->sw_if_index][args->slave]);
+       (name, &bm->stats[bif->sw_if_index][args->slave].actor_state);
+      if (args->error != 0)
+       {
+         args->rv = VNET_API_ERROR_INVALID_INTERFACE;
+         vec_free (name);
+         return;
+       }
+
+      vec_reset_length (name);
+      name = format (0, "/if/lacp/%u/%u/partner-state%c", bif->sw_if_index,
+                    args->slave, 0);
+      args->error = stat_segment_register_state_counter
+       (name, &bm->stats[bif->sw_if_index][args->slave].partner_state);
       vec_free (name);
       if (args->error != 0)
        {
@@ -698,12 +727,11 @@ bond_enslave (vlib_main_t * vm, bond_enslave_args_t * args)
   bond_slave_add_del_mac_addrs (bif, sif->sw_if_index, 1 /* is_add */ );
 
   if (bif_hw->l2_if_count)
-    {
-      ethernet_set_flags (vnm, sif_hw->hw_if_index,
-                         ETHERNET_INTERFACE_FLAG_ACCEPT_ALL);
-      /* ensure all packets go to ethernet-input */
-      ethernet_set_rx_redirect (vnm, sif_hw, 1);
-    }
+    ethernet_set_flags (vnm, sif_hw->hw_if_index,
+                       ETHERNET_INTERFACE_FLAG_ACCEPT_ALL);
+  else
+    ethernet_set_flags (vnm, sif_hw->hw_if_index,
+                       /*ETHERNET_INTERFACE_FLAG_DEFAULT_L3 */ 0);
 
   if (bif->mode == BOND_MODE_LACP)
     {
@@ -893,6 +921,8 @@ show_bond_details (vlib_main_t * vm)
                     format_bond_mode, bif->mode);
     vlib_cli_output (vm, "  load balance: %U",
                     format_bond_load_balance, bif->lb);
+    if (bif->gso)
+      vlib_cli_output (vm, "  gso enable");
     if (bif->mode == BOND_MODE_ROUND_ROBIN)
       vlib_cli_output (vm, "  last xmit slave index: %u",
                       bif->lb_rr_last_index);