From af86a48733c548931f8983984328b906f7e7aef8 Mon Sep 17 00:00:00 2001 From: eyal bari Date: Tue, 17 Apr 2018 11:20:27 +0300 Subject: vxlan:offload RX flow ip4 vxlan cli/api (using flow infra) to create flows and enable them on different hardware (currently tested with i40e) to offload a vxlan tunnel onto hw: set flow-offload vxlan hw TwentyFiveGigabitEthernet3/0/0 rx vxlan_tunnel1 to remove offload: set flow-offload vxlan hw TwentyFiveGigabitEthernet3/0/0 rx vxlan_tunnel1 del TODO:ipv6 handling Change-Id: I70e61f792ef8e3f007d03d7df70e97ea4725b101 Signed-off-by: Eyal Bari --- src/vnet/vxlan/vxlan.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) (limited to 'src/vnet/vxlan/vxlan.c') diff --git a/src/vnet/vxlan/vxlan.c b/src/vnet/vxlan/vxlan.c index 4f966fc323b..6b0b6c43840 100644 --- a/src/vnet/vxlan/vxlan.c +++ b/src/vnet/vxlan/vxlan.c @@ -20,6 +20,7 @@ #include #include #include +#include #include /** @@ -73,6 +74,10 @@ format_vxlan_tunnel (u8 * s, va_list * args) if (PREDICT_FALSE (ip46_address_is_multicast (&t->dst))) s = format (s, "mcast-sw-if-idx %d ", t->mcast_sw_if_index); + if (t->flow_index != ~0) + s = format (s, "flow-index %d [%U]", t->flow_index, + format_flow_enabled_hw, t->flow_index); + return s; } @@ -424,6 +429,7 @@ int vnet_vxlan_add_del_tunnel t->dev_instance = dev_instance; /* actual */ t->user_instance = user_instance; /* name */ + t->flow_index = ~0; /* copy the key */ if (is_ip6) @@ -572,6 +578,9 @@ int vnet_vxlan_add_del_tunnel if (!ip46_address_is_multicast (&t->dst)) { + if (t->flow_index != ~0) + vnet_flow_del (vnm, t->flow_index); + vtep_addr_unref (&t->src); fib_entry_child_remove (t->fib_entry_index, t->sibling_index); fib_table_entry_delete_index (t->fib_entry_index, FIB_SOURCE_RR); @@ -1020,6 +1029,122 @@ VLIB_CLI_COMMAND (set_interface_ip6_vxlan_bypass_command, static) = { }; /* *INDENT-ON* */ +int +vnet_vxlan_add_del_rx_flow (u32 hw_if_index, u32 t_index, int is_add) +{ + vxlan_main_t *vxm = &vxlan_main; + vxlan_tunnel_t *t = pool_elt_at_index (vxm->tunnels, t_index); + vnet_main_t *vnm = vnet_get_main (); + if (is_add) + { + if (t->flow_index == ~0) + { + vxlan_main_t *vxm = &vxlan_main; + vnet_flow_t flow = { + .actions = + VNET_FLOW_ACTION_REDIRECT_TO_NODE | VNET_FLOW_ACTION_MARK, + .mark_flow_id = t->dev_instance + vxm->flow_id_start, + .redirect_node_index = vxlan4_flow_input_node.index, + .type = VNET_FLOW_TYPE_IP4_VXLAN, + .ip4_vxlan = { + .src_addr = t->dst.ip4, + .dst_addr = t->src.ip4, + .dst_port = UDP_DST_PORT_vxlan, + .vni = t->vni, + } + , + }; + vnet_flow_add (vnm, &flow, &t->flow_index); + } + return vnet_flow_enable (vnm, t->flow_index, hw_if_index); + } + /* flow index is removed when the tunnel is deleted */ + return vnet_flow_disable (vnm, t->flow_index, hw_if_index); +} + +u32 +vnet_vxlan_get_tunnel_index (u32 sw_if_index) +{ + vxlan_main_t *vxm = &vxlan_main; + + if (sw_if_index > vec_len (vxm->tunnel_index_by_sw_if_index)) + return ~0; + return vxm->tunnel_index_by_sw_if_index[sw_if_index]; +} + +static clib_error_t * +vxlan_offload_command_fn (vlib_main_t * vm, + unformat_input_t * input, vlib_cli_command_t * cmd) +{ + unformat_input_t _line_input, *line_input = &_line_input; + + /* Get a line of input. */ + if (!unformat_user (input, unformat_line_input, line_input)) + return 0; + + vnet_main_t *vnm = vnet_get_main (); + u32 rx_sw_if_index = ~0; + u32 hw_if_index = ~0; + int is_add = 1; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (line_input, "hw %U", unformat_vnet_hw_interface, vnm, + &hw_if_index)) + continue; + if (unformat (line_input, "rx %U", unformat_vnet_sw_interface, vnm, + &rx_sw_if_index)) + continue; + if (unformat (line_input, "del")) + { + is_add = 0; + continue; + } + return clib_error_return (0, "unknown input `%U'", + format_unformat_error, line_input); + } + + if (rx_sw_if_index == ~0) + return clib_error_return (0, "missing rx interface"); + if (hw_if_index == ~0) + return clib_error_return (0, "missing hw interface"); + + u32 t_index = vnet_vxlan_get_tunnel_index (rx_sw_if_index);; + if (t_index == ~0) + return clib_error_return (0, "%U is not a vxlan tunnel", + format_vnet_sw_if_index_name, vnm, + rx_sw_if_index); + + vxlan_main_t *vxm = &vxlan_main; + vxlan_tunnel_t *t = pool_elt_at_index (vxm->tunnels, t_index); + + if (!ip46_address_is_ip4 (&t->dst)) + return clib_error_return (0, "currently only IPV4 tunnels are supported"); + + vnet_hw_interface_t *hw_if = vnet_get_hw_interface (vnm, hw_if_index); + ip4_main_t *im = &ip4_main; + u32 rx_fib_index = + vec_elt (im->fib_index_by_sw_if_index, hw_if->sw_if_index); + + if (t->encap_fib_index != rx_fib_index) + return clib_error_return (0, "interface/tunnel fib mismatch"); + + if (vnet_vxlan_add_del_rx_flow (hw_if_index, t_index, is_add)) + return clib_error_return (0, "error %s flow", + is_add ? "enabling" : "disabling"); + + return 0; +} + +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (vxlan_offload_command, static) = { + .path = "set flow-offload vxlan", + .short_help = + "set flow-offload vxlan hw rx [del]", + .function = vxlan_offload_command_fn, +}; +/* *INDENT-ON* */ + clib_error_t * vxlan_init (vlib_main_t * vm) { @@ -1028,6 +1153,9 @@ vxlan_init (vlib_main_t * vm) vxm->vnet_main = vnet_get_main (); vxm->vlib_main = vm; + vnet_flow_get_range (vxm->vnet_main, "vxlan", 1024 * 1024, + &vxm->flow_id_start); + /* initialize the ip6 hash */ vxm->vxlan6_tunnel_by_key = hash_create_mem (0, sizeof (vxlan6_tunnel_key_t), -- cgit 1.2.3-korg