session: accept notifies for sessions in created state

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

diff --git a/src/vnet/interface.c b/src/vnet/interface.c
index 13deacc..cd734ce 100644 (file)
--- a/src/vnet/interface.c
+++ b/src/vnet/interface.c
@@ -554,6 +554,21 @@ vnet_sw_interface_admin_down (vnet_main_t * vnm, u32 sw_if_index)
     }
 }
 
+static void
+vnet_if_update_lookup_tables (vnet_main_t *vnm, u32 sw_if_index)
+{
+  vnet_interface_main_t *im = &vnm->interface_main;
+  vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
+
+  vec_validate_init_empty (im->hw_if_index_by_sw_if_index, sw_if_index, ~0);
+  vec_validate_init_empty (im->if_out_arc_end_next_index_by_sw_if_index,
+                          sw_if_index, ~0);
+
+  im->hw_if_index_by_sw_if_index[sw_if_index] = hi->hw_if_index;
+  im->if_out_arc_end_next_index_by_sw_if_index[sw_if_index] =
+    hi->if_out_arc_end_node_next_index;
+}
+
 static u32
 vnet_create_sw_interface_no_callbacks (vnet_main_t * vnm,
                                       vnet_sw_interface_t * template)
@@ -595,6 +610,7 @@ vnet_create_sw_interface_no_callbacks (vnet_main_t * vnm,
     vnet_interface_counter_unlock (im);
   }
 
+  vnet_if_update_lookup_tables (vnm, sw_if_index);
   return sw_if_index;
 }
 
@@ -875,23 +891,23 @@ vnet_register_interface (vnet_main_t * vnm,
       vlib_node_rename (vm, hw->tx_node_index, "%v", tx_node_name);
       vlib_node_rename (vm, hw->output_node_index, "%v", output_node_name);
 
-      /* *INDENT-OFF* */
-      foreach_vlib_main ({
-        vnet_interface_output_runtime_t *rt;
-
-       rt = vlib_node_get_runtime_data (this_vlib_main, hw->output_node_index);
-       ASSERT (rt->is_deleted == 1);
-       rt->is_deleted = 0;
-       rt->hw_if_index = hw_index;
-       rt->sw_if_index = hw->sw_if_index;
-       rt->dev_instance = hw->dev_instance;
+      foreach_vlib_main ()
+       {
+         vnet_interface_output_runtime_t *rt;
 
-       rt = vlib_node_get_runtime_data (this_vlib_main, hw->tx_node_index);
-       rt->hw_if_index = hw_index;
-       rt->sw_if_index = hw->sw_if_index;
-       rt->dev_instance = hw->dev_instance;
-      });
-      /* *INDENT-ON* */
+         rt =
+           vlib_node_get_runtime_data (this_vlib_main, hw->output_node_index);
+         ASSERT (rt->is_deleted == 1);
+         rt->is_deleted = 0;
+         rt->hw_if_index = hw_index;
+         rt->sw_if_index = hw->sw_if_index;
+         rt->dev_instance = hw->dev_instance;
+
+         rt = vlib_node_get_runtime_data (this_vlib_main, hw->tx_node_index);
+         rt->hw_if_index = hw_index;
+         rt->sw_if_index = hw->sw_if_index;
+         rt->dev_instance = hw->dev_instance;
+       }
 
       /* The new class may differ from the old one.
        * Functions have to be updated. */
@@ -900,14 +916,13 @@ vnet_register_interface (vnet_main_t * vnm,
       node->node_fn_registrations = if_out_node->node_fn_registrations;
       node->function = if_out_node->function;
 
-      /* *INDENT-OFF* */
-      foreach_vlib_main ({
-        nrt = vlib_node_get_runtime (this_vlib_main, hw->output_node_index);
-        nrt->function = node->function;
-       vlib_node_runtime_perf_counter (this_vlib_main, nrt, 0, 0, 0,
-                                       VLIB_NODE_RUNTIME_PERF_RESET);
-      });
-      /* *INDENT-ON* */
+      foreach_vlib_main ()
+       {
+         nrt = vlib_node_get_runtime (this_vlib_main, hw->output_node_index);
+         nrt->function = node->function;
+         vlib_node_runtime_perf_counter (this_vlib_main, nrt, 0, 0, 0,
+                                         VLIB_NODE_RUNTIME_PERF_RESET);
+       }
 
       node = vlib_get_node (vm, hw->tx_node_index);
       if (dev_class->tx_fn_registrations)
@@ -919,14 +934,14 @@ vnet_register_interface (vnet_main_t * vnm,
       else
        node->function = dev_class->tx_function;
       node->format_trace = dev_class->format_tx_trace;
-      /* *INDENT-OFF* */
-      foreach_vlib_main ({
-        nrt = vlib_node_get_runtime (this_vlib_main, hw->tx_node_index);
-        nrt->function = node->function;
-       vlib_node_runtime_perf_counter (this_vlib_main, nrt, 0, 0, 0,
-                                       VLIB_NODE_RUNTIME_PERF_RESET);
-      });
-      /* *INDENT-ON* */
+
+      foreach_vlib_main ()
+       {
+         nrt = vlib_node_get_runtime (this_vlib_main, hw->tx_node_index);
+         nrt->function = node->function;
+         vlib_node_runtime_perf_counter (this_vlib_main, nrt, 0, 0, 0,
+                                         VLIB_NODE_RUNTIME_PERF_RESET);
+       }
 
       _vec_len (im->deleted_hw_interface_nodes) -= 1;
     }
@@ -992,7 +1007,6 @@ vnet_register_interface (vnet_main_t * vnm,
       vlib_node_add_next_with_slot (vm, hw->output_node_index,
                                    hw->tx_node_index,
                                    VNET_INTERFACE_OUTPUT_NEXT_TX);
-
       /* add interface to the list of "output-interface" feature arc start nodes
          and clone nexts from 1st interface if it exists */
       fcm = vnet_feature_get_config_main (im->output_feature_arc_index);
@@ -1016,6 +1030,9 @@ vnet_register_interface (vnet_main_t * vnm,
        }
     }
 
+  hw->if_out_arc_end_node_next_index = vlib_node_add_next (
+    vm, vnet_interface_output_arc_end_node.index, hw->tx_node_index);
+  vnet_if_update_lookup_tables (vnm, hw->sw_if_index);
   setup_output_node (vm, hw->output_node_index, hw_class);
   setup_tx_node (vm, hw->tx_node_index, dev_class);
 
@@ -1074,17 +1091,15 @@ vnet_delete_hw_interface (vnet_main_t * vnm, u32 hw_if_index)
       /* Put output/tx nodes into recycle pool */
       vnet_hw_interface_nodes_t *dn;
 
-      /* *INDENT-OFF* */
-      foreach_vlib_main
-       ({
+      foreach_vlib_main ()
+       {
          vnet_interface_output_runtime_t *rt =
            vlib_node_get_runtime_data (this_vlib_main, hw->output_node_index);
 
          /* Mark node runtime as deleted so output node (if called)
           * will drop packets. */
          rt->is_deleted = 1;
-       });
-      /* *INDENT-ON* */
+       }
 
       vlib_node_rename (vm, hw->output_node_index,
                        "interface-%d-output-deleted", hw_if_index);