diff options
| author |   John Lo <loj@cisco.com> | 2018-01-23 19:21:34 -0500 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2018-01-24 13:56:45 +0000 |
| commit | e5453d0fa29f39a7f78a7e22815566a7f4c9e5ef (patch) | |
| tree | 805b3d5ad2ca314a99d9460b202c483b4ae5550a /src/vnet/vxlan-gpe | |
| parent | d95c39e87bf9d21b2a9d4c49fdf7ebca2a5eab3d (diff) | |
Improve tunnel interface creation performance
Modify interface creation to allow creation of tunnel interfaces
without dedicated per tunnel output and tx nodes which are not
used for most tunnel types. Also changed interface-output node
function vnet_per_buffer_interface_output() so it does not rely
on hw_if_index as the next node index which is not flexible nor
efficient for large scale tunnel interfaces.
The improvenemts are done for VXLAN, VXLAN-GPE, GENEVE and GTPU
tunnels. GRE tunnel is still using per tunnel output nodes which
will be changed in a separate patch with other GRE enhencements.
Change-Id: I4123c01c0d2ead814417a867adb8c8a407e4df55
Signed-off-by: John Lo <loj@cisco.com>
Diffstat (limited to 'src/vnet/vxlan-gpe')
| -rw-r--r-- | src/vnet/vxlan-gpe/vxlan_gpe.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/vnet/vxlan-gpe/vxlan_gpe.c b/src/vnet/vxlan-gpe/vxlan_gpe.c index 918a982d70d..af5dd190693 100644 --- a/src/vnet/vxlan-gpe/vxlan_gpe.c +++ b/src/vnet/vxlan-gpe/vxlan_gpe.c @@ -120,14 +120,6 @@ format_vxlan_gpe_name (u8 * s, va_list * args) return format (s, "vxlan_gpe_tunnel%d", dev_instance); } -static uword -dummy_interface_tx (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) -{ - clib_warning ("you shouldn't be here, leaking buffers..."); - return frame->n_vectors; -} - /** * @brief CLI function for VXLAN GPE admin up/down * @@ -154,7 +146,6 @@ VNET_DEVICE_CLASS (vxlan_gpe_device_class,static) = { .name = "VXLAN_GPE", .format_device_name = format_vxlan_gpe_name, .format_tx_trace = format_vxlan_gpe_encap_trace, - .tx_function = dummy_interface_tx, .admin_up_down_function = vxlan_gpe_interface_admin_up_down, }; /* *INDENT-ON* */ @@ -600,9 +591,12 @@ int vnet_vxlan_gpe_add_del_tunnel (vnm, vxlan_gpe_device_class.index, t - ngm->tunnels, vxlan_gpe_hw_class.index, t - ngm->tunnels); hi = vnet_get_hw_interface (vnm, hw_if_index); - hi->output_node_index = vxlan_gpe_encap_node.index; } + /* Set vxlan-gpe tunnel output node */ + u32 encap_index = vxlan_gpe_encap_node.index; + vnet_set_interface_output_node (vnm, hw_if_index, encap_index); + t->hw_if_index = hw_if_index; t->sw_if_index = sw_if_index = hi->sw_if_index; vec_validate_init_empty (ngm->tunnel_index_by_sw_if_index, sw_if_index, @@ -620,7 +614,6 @@ int vnet_vxlan_gpe_add_del_tunnel VNET_SW_INTERFACE_FLAG_ADMIN_UP); fib_node_init (&t->node, FIB_NODE_TYPE_VXLAN_GPE_TUNNEL); fib_prefix_t tun_remote_pfx; - u32 encap_index = vxlan_gpe_encap_node.index; vnet_flood_class_t flood_class = VNET_FLOOD_CLASS_TUNNEL_NORMAL; fib_prefix_from_ip46_addr (&t->remote, &tun_remote_pfx); @@ -711,9 +704,6 @@ int vnet_vxlan_gpe_add_del_tunnel flood_class = VNET_FLOOD_CLASS_TUNNEL_MASTER; } - /* Set vxlan tunnel output node */ - hi->output_node_index = encap_index; - vnet_get_sw_interface (vnet_get_main (), sw_if_index)->flood_class = flood_class; } |