From d1f3123795162370885d5920c402f76f64e05891 Mon Sep 17 00:00:00 2001 From: Pierre Pfister Date: Mon, 17 Oct 2016 15:58:29 +0100 Subject: Update tx and output node runtime when recycling interface When an interface is removed, and another one is created, the nodes from the previous interface are reused. The current code fails when the new interface type differs from the original. It is necessary to update the node runtime, in particular the node function, and the node format function. Jira: VPP-460 Change-Id: I2fc3c609e0173a7f62597230768669039853ab03 Signed-off-by: Pierre Pfister (cherry picked from commit 064f55da7798f3a4c790b656dba71b32a3b82a5c) --- vnet/vnet/interface.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/vnet/vnet/interface.c b/vnet/vnet/interface.c index 3a12085da29..68433dac460 100644 --- a/vnet/vnet/interface.c +++ b/vnet/vnet/interface.c @@ -711,6 +711,8 @@ vnet_register_interface (vnet_main_t * vnm, { vnet_hw_interface_nodes_t *hn; vnet_interface_output_runtime_t *rt; + vlib_node_t *node; + vlib_node_runtime_t *nrt; hn = vec_end (im->deleted_hw_interface_nodes) - 1; @@ -732,6 +734,22 @@ vnet_register_interface (vnet_main_t * vnm, 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. */ + node = vlib_get_node (vm, hw->output_node_index); + node->function = dev_class->no_flatten_output_chains ? + vnet_interface_output_node_no_flatten_multiarch_select () : + vnet_interface_output_node_multiarch_select (); + node->format_trace = format_vnet_interface_output_trace; + nrt = vlib_node_get_runtime (vm, hw->output_node_index); + nrt->function = node->function; + + node = vlib_get_node (vm, hw->tx_node_index); + node->function = dev_class->tx_function; + node->format_trace = dev_class->format_tx_trace; + nrt = vlib_node_get_runtime (vm, hw->tx_node_index); + nrt->function = node->function; + vlib_worker_thread_node_runtime_update (); _vec_len (im->deleted_hw_interface_nodes) -= 1; } -- cgit 1.2.3-korg