X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fvxlan%2Fvxlan.c;h=dcf480578a7e4ff0c83a1e4436842ad2f814fbc9;hb=1433185908daf98deb0a8f43c303b99382a87442;hp=300aae4e0ba03712640c63e45d76d55344a355aa;hpb=a4b0541f64eef02fa0d003d8f831cfdeb45d3668;p=vpp.git diff --git a/src/vnet/vxlan/vxlan.c b/src/vnet/vxlan/vxlan.c index 300aae4e0ba..dcf480578a7 100644 --- a/src/vnet/vxlan/vxlan.c +++ b/src/vnet/vxlan/vxlan.c @@ -70,11 +70,12 @@ format_vxlan_tunnel (u8 * s, va_list * args) vxlan_tunnel_t *t = va_arg (*args, vxlan_tunnel_t *); s = format (s, - "[%d] instance %d src %U dst %U vni %d fib-idx %d sw-if-idx %d ", - t->dev_instance, t->user_instance, - format_ip46_address, &t->src, IP46_TYPE_ANY, - format_ip46_address, &t->dst, IP46_TYPE_ANY, - t->vni, t->encap_fib_index, t->sw_if_index); + "[%d] instance %d src %U dst %U src_port %d dst_port %d vni %d " + "fib-idx %d sw-if-idx %d ", + t->dev_instance, t->user_instance, format_ip46_address, &t->src, + IP46_TYPE_ANY, format_ip46_address, &t->dst, IP46_TYPE_ANY, + t->src_port, t->dst_port, t->vni, t->encap_fib_index, + t->sw_if_index); s = format (s, "encap-dpo-idx %d ", t->next_dpo.dpoi_index); @@ -236,14 +237,15 @@ const static fib_node_vft_t vxlan_vft = { .fnv_back_walk = vxlan_tunnel_back_walk, }; - -#define foreach_copy_field \ -_(vni) \ -_(mcast_sw_if_index) \ -_(encap_fib_index) \ -_(decap_next_index) \ -_(src) \ -_(dst) +#define foreach_copy_field \ + _ (vni) \ + _ (mcast_sw_if_index) \ + _ (encap_fib_index) \ + _ (decap_next_index) \ + _ (src) \ + _ (dst) \ + _ (src_port) \ + _ (dst_port) static void vxlan_rewrite (vxlan_tunnel_t * t, bool is_ip6) @@ -288,8 +290,8 @@ vxlan_rewrite (vxlan_tunnel_t * t, bool is_ip6) } /* UDP header, randomize src port on something, maybe? */ - udp->src_port = clib_host_to_net_u16 (4789); - udp->dst_port = clib_host_to_net_u16 (UDP_DST_PORT_vxlan); + udp->src_port = clib_host_to_net_u16 (t->src_port); + udp->dst_port = clib_host_to_net_u16 (t->dst_port); /* VXLAN header */ vnet_set_vni_and_flags (vxlan, t->vni); @@ -365,15 +367,23 @@ int vnet_vxlan_add_del_tunnel vlib_main_t *vm = vlib_get_main (); u8 hw_addr[6]; + /* Set udp-ports */ + if (a->src_port == 0) + a->src_port = is_ip6 ? UDP_DST_PORT_vxlan6 : UDP_DST_PORT_vxlan; + + if (a->dst_port == 0) + a->dst_port = is_ip6 ? UDP_DST_PORT_vxlan6 : UDP_DST_PORT_vxlan; + int not_found; if (!is_ip6) { /* ip4 mcast is indexed by mcast addr only */ key4.key[0] = ip46_address_is_multicast (&a->dst) ? - a->dst.ip4.as_u32 : - a->dst.ip4.as_u32 | (((u64) a->src.ip4.as_u32) << 32); - key4.key[1] = (((u64) a->encap_fib_index) << 32) - | clib_host_to_net_u32 (a->vni << 8); + a->dst.ip4.as_u32 : + a->dst.ip4.as_u32 | (((u64) a->src.ip4.as_u32) << 32); + key4.key[1] = ((u64) clib_host_to_net_u16 (a->src_port) << 48) | + (((u64) a->encap_fib_index) << 32) | + clib_host_to_net_u32 (a->vni << 8); not_found = clib_bihash_search_inline_16_8 (&vxm->vxlan4_tunnel_by_key, &key4); p = (void *) &key4.value; @@ -382,8 +392,9 @@ int vnet_vxlan_add_del_tunnel { key6.key[0] = a->dst.ip6.as_u64[0]; key6.key[1] = a->dst.ip6.as_u64[1]; - key6.key[2] = (((u64) a->encap_fib_index) << 32) - | clib_host_to_net_u32 (a->vni << 8); + key6.key[2] = (((u64) clib_host_to_net_u16 (a->src_port) << 48) | + ((u64) a->encap_fib_index) << 32) | + clib_host_to_net_u32 (a->vni << 8); not_found = clib_bihash_search_inline_24_8 (&vxm->vxlan6_tunnel_by_key, &key6); p = (void *) &key6.value; @@ -431,29 +442,36 @@ int vnet_vxlan_add_del_tunnel return VNET_API_ERROR_INSTANCE_IN_USE; } - f64 now = vlib_time_now (vm); - u32 rnd; - rnd = (u32) (now * 1e6); - rnd = random_u32 (&rnd); - - memcpy (hw_addr + 2, &rnd, sizeof (rnd)); - hw_addr[0] = 2; - hw_addr[1] = 0xfe; - - if (ethernet_register_interface (vnm, vxlan_device_class.index, - dev_instance, hw_addr, &t->hw_if_index, - vxlan_eth_flag_change)) - { - pool_put (vxm->tunnels, t); - return VNET_API_ERROR_SYSCALL_ERROR_2; - } - hash_set (vxm->instance_used, user_instance, 1); t->dev_instance = dev_instance; /* actual */ - t->user_instance = user_instance; /* name */ + t->user_instance = user_instance; /* name */ t->flow_index = ~0; + if (a->is_l3) + t->hw_if_index = + vnet_register_interface (vnm, vxlan_device_class.index, dev_instance, + vxlan_hw_class.index, dev_instance); + else + { + f64 now = vlib_time_now (vm); + u32 rnd; + rnd = (u32) (now * 1e6); + rnd = random_u32 (&rnd); + memcpy (hw_addr + 2, &rnd, sizeof (rnd)); + hw_addr[0] = 2; + hw_addr[1] = 0xfe; + if (ethernet_register_interface ( + vnm, vxlan_device_class.index, dev_instance, hw_addr, + &t->hw_if_index, vxlan_eth_flag_change)) + { + hash_unset (vxm->instance_used, t->user_instance); + + pool_put (vxm->tunnels, t); + return VNET_API_ERROR_SYSCALL_ERROR_2; + } + } + vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, t->hw_if_index); /* Set vxlan tunnel output node */ @@ -485,7 +503,10 @@ int vnet_vxlan_add_del_tunnel if (add_failed) { - ethernet_delete_interface (vnm, t->hw_if_index); + if (a->is_l3) + vnet_delete_hw_interface (vnm, t->hw_if_index); + else + ethernet_delete_interface (vnm, t->hw_if_index); hash_unset (vxm->instance_used, t->user_instance); pool_put (vxm->tunnels, t); return VNET_API_ERROR_INVALID_REGISTRATION; @@ -634,7 +655,11 @@ int vnet_vxlan_add_del_tunnel mcast_shared_remove (&t->dst); } - ethernet_delete_interface (vnm, t->hw_if_index); + vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, t->hw_if_index); + if (hw->dev_class_index == vxlan_device_class.index) + vnet_delete_hw_interface (vnm, t->hw_if_index); + else + ethernet_delete_interface (vnm, t->hw_if_index); hash_unset (vxm->instance_used, t->user_instance); fib_node_deinit (&t->node); @@ -647,11 +672,11 @@ int vnet_vxlan_add_del_tunnel if (a->is_add) { /* register udp ports */ - if (!is_ip6 && !udp_is_valid_dst_port (UDP_DST_PORT_vxlan, 1)) - udp_register_dst_port (vxm->vlib_main, UDP_DST_PORT_vxlan, + if (!is_ip6 && !udp_is_valid_dst_port (a->src_port, 1)) + udp_register_dst_port (vxm->vlib_main, a->src_port, vxlan4_input_node.index, 1); - if (is_ip6 && !udp_is_valid_dst_port (UDP_DST_PORT_vxlan6, 0)) - udp_register_dst_port (vxm->vlib_main, UDP_DST_PORT_vxlan6, + if (is_ip6 && !udp_is_valid_dst_port (a->src_port, 0)) + udp_register_dst_port (vxm->vlib_main, a->src_port, vxlan6_input_node.index, 0); } @@ -704,11 +729,14 @@ vxlan_add_del_tunnel_command_fn (vlib_main_t * vm, u8 grp_set = 0; u8 ipv4_set = 0; u8 ipv6_set = 0; + u8 is_l3 = 0; u32 instance = ~0; u32 encap_fib_index = 0; u32 mcast_sw_if_index = ~0; u32 decap_next_index = VXLAN_INPUT_NEXT_L2_INPUT; u32 vni = 0; + u32 src_port = 0; + u32 dst_port = 0; u32 table_id; clib_error_t *parse_error = NULL; @@ -749,11 +777,17 @@ vxlan_add_del_tunnel_command_fn (vlib_main_t * vm, encap_fib_index = fib_table_find (fib_ip_proto (ipv6_set), table_id); } + else if (unformat (line_input, "l3")) + is_l3 = 1; else if (unformat (line_input, "decap-next %U", unformat_decap_next, &decap_next_index, ipv4_set)) ; else if (unformat (line_input, "vni %d", &vni)) ; + else if (unformat (line_input, "src_port %d", &src_port)) + ; + else if (unformat (line_input, "dst_port %d", &dst_port)) + ; else { parse_error = clib_error_return (0, "parse error: '%U'", @@ -767,6 +801,13 @@ vxlan_add_del_tunnel_command_fn (vlib_main_t * vm, if (parse_error) return parse_error; + if (is_l3 && decap_next_index == VXLAN_INPUT_NEXT_L2_INPUT) + { + vlib_node_t *node = vlib_get_node_by_name ( + vm, (u8 *) (ipv4_set ? "ip4-input" : "ip6-input")); + decap_next_index = get_decap_next_for_node (node->index, ipv4_set); + } + if (encap_fib_index == ~0) return clib_error_return (0, "nonexistent encap-vrf-id %d", table_id); @@ -800,12 +841,12 @@ vxlan_add_del_tunnel_command_fn (vlib_main_t * vm, if (vni >> 24) return clib_error_return (0, "vni %d out of range", vni); - vnet_vxlan_add_del_tunnel_args_t a = { - .is_add = is_add, - .is_ip6 = ipv6_set, - .instance = instance, + vnet_vxlan_add_del_tunnel_args_t a = { .is_add = is_add, + .is_ip6 = ipv6_set, + .is_l3 = is_l3, + .instance = instance, #define _(x) .x = x, - foreach_copy_field + foreach_copy_field #undef _ }; @@ -853,11 +894,17 @@ vxlan_add_del_tunnel_command_fn (vlib_main_t * vm, * * @cliexpar * Example of how to create a VXLAN Tunnel: - * @cliexcmd{create vxlan tunnel src 10.0.3.1 dst 10.0.3.3 vni 13 encap-vrf-id 7} + * @cliexcmd{create vxlan tunnel src 10.0.3.1 dst 10.0.3.3 vni 13 encap-vrf-id + 7} * Example of how to create a VXLAN Tunnel with a known name, vxlan_tunnel42: * @cliexcmd{create vxlan tunnel src 10.0.3.1 dst 10.0.3.3 instance 42} - * Example of how to create a multicast VXLAN Tunnel with a known name, vxlan_tunnel23: - * @cliexcmd{create vxlan tunnel src 10.0.3.1 group 239.1.1.1 GigabitEthernet0/8/0 instance 23} + * Example of how to create a multicast VXLAN Tunnel with a known name, + vxlan_tunnel23: + * @cliexcmd{create vxlan tunnel src 10.0.3.1 group 239.1.1.1 + GigabitEthernet0/8/0 instance 23} + * Example of how to create a VXLAN Tunnel with custom udp-ports: + * @cliexcmd{create vxlan tunnel src 10.0.3.1 dst 10.0.3.3 vni 13 src_port + 59000 dst_port 59001} * Example of how to delete a VXLAN Tunnel: * @cliexcmd{create vxlan tunnel src 10.0.3.1 dst 10.0.3.3 vni 13 del} ?*/ @@ -865,10 +912,11 @@ vxlan_add_del_tunnel_command_fn (vlib_main_t * vm, VLIB_CLI_COMMAND (create_vxlan_tunnel_command, static) = { .path = "create vxlan tunnel", .short_help = - "create vxlan tunnel src " - " {dst |group } vni " - " [instance ]" - " [encap-vrf-id ] [decap-next [l2|node ]] [del]", + "create vxlan tunnel src " + " {dst |group } vni " + " [instance ]" + " [encap-vrf-id ] [decap-next [l2|node ]] [del] [l3]" + " [src_port ] [dst_port ]", .function = vxlan_add_del_tunnel_command_fn, }; /* *INDENT-ON* */ @@ -920,7 +968,8 @@ show_vxlan_tunnel_command_fn (vlib_main_t * vm, * @cliexpar * Example of how to display the VXLAN Tunnel entries: * @cliexstart{show vxlan tunnel} - * [0] src 10.0.3.1 dst 10.0.3.3 vni 13 encap_fib_index 0 sw_if_index 5 decap_next l2 + * [0] src 10.0.3.1 dst 10.0.3.3 src_port 4789 dst_port 4789 vni 13 + encap_fib_index 0 sw_if_index 5 decap_next l2 * @cliexend ?*/ /* *INDENT-OFF* */ @@ -1153,7 +1202,7 @@ vnet_vxlan_add_del_rx_flow (u32 hw_if_index, u32 t_index, int is_add) .dst_addr.addr = t->src.ip4, .src_addr.mask.as_u32 = ~0, .dst_addr.mask.as_u32 = ~0, - .dst_port.port = UDP_DST_PORT_vxlan, + .dst_port.port = t->src_port, .dst_port.mask = 0xFF, .vni = t->vni, }