X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fvxlan%2Fvxlan.c;h=a6e799f7649661006635ddd71347549e947943ff;hb=630b9741659b9a4b68c64ebbeb675761c6f26842;hp=abf0182f91fdbd9ea61a221268b0f30e37d74dbe;hpb=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727;p=vpp.git diff --git a/src/vnet/vxlan/vxlan.c b/src/vnet/vxlan/vxlan.c index abf0182f91f..a6e799f7649 100644 --- a/src/vnet/vxlan/vxlan.c +++ b/src/vnet/vxlan/vxlan.c @@ -16,7 +16,9 @@ #include #include #include -#include +#include +#include +#include #include /** @@ -91,10 +93,9 @@ static uword dummy_interface_tx (vlib_main_t * vm, static clib_error_t * vxlan_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags) { - if (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) - vnet_hw_interface_set_flags (vnm, hw_if_index, VNET_HW_INTERFACE_FLAG_LINK_UP); - else - vnet_hw_interface_set_flags (vnm, hw_if_index, 0); + u32 hw_flags = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? + VNET_HW_INTERFACE_FLAG_LINK_UP : 0; + vnet_hw_interface_set_flags (vnm, hw_if_index, hw_flags); return /* no error */ 0; } @@ -137,9 +138,7 @@ vxlan_tunnel_restack_dpo(vxlan_tunnel_t * t) static vxlan_tunnel_t * vxlan_tunnel_from_fib_node (fib_node_t *node) { -#if (CLIB_DEBUG > 0) ASSERT(FIB_NODE_TYPE_VXLAN_TUNNEL == node->fn_type); -#endif return ((vxlan_tunnel_t*) (((char*)node) - STRUCT_OFFSET_OF(vxlan_tunnel_t, node))); } @@ -202,150 +201,160 @@ _(decap_next_index) \ _(src) \ _(dst) -static int vxlan4_rewrite (vxlan_tunnel_t * t) +static int +vxlan_rewrite (vxlan_tunnel_t * t, bool is_ip6) { - u8 *rw = 0; - ip4_header_t * ip0; - ip4_vxlan_header_t * h0; - int len = sizeof (*h0); - - vec_validate_aligned (rw, len-1, CLIB_CACHE_LINE_BYTES); - - h0 = (ip4_vxlan_header_t *) rw; - - /* Fixed portion of the (outer) ip4 header */ - ip0 = &h0->ip4; - ip0->ip_version_and_header_length = 0x45; - ip0->ttl = 254; - ip0->protocol = IP_PROTOCOL_UDP; - - /* we fix up the ip4 header length and checksum after-the-fact */ - ip0->src_address.as_u32 = t->src.ip4.as_u32; - ip0->dst_address.as_u32 = t->dst.ip4.as_u32; - ip0->checksum = ip4_header_checksum (ip0); + union { + ip4_vxlan_header_t * h4; + ip6_vxlan_header_t * h6; + u8 *rw; + } r = { .rw = 0 }; + int len = is_ip6 ? sizeof *r.h6 : sizeof *r.h4; + + vec_validate_aligned (r.rw, len-1, CLIB_CACHE_LINE_BYTES); + + udp_header_t * udp; + vxlan_header_t * vxlan; + /* Fixed portion of the (outer) ip header */ + if (!is_ip6) + { + ip4_header_t * ip = &r.h4->ip4; + udp = &r.h4->udp, vxlan = &r.h4->vxlan; + ip->ip_version_and_header_length = 0x45; + ip->ttl = 254; + ip->protocol = IP_PROTOCOL_UDP; + + ip->src_address = t->src.ip4; + ip->dst_address = t->dst.ip4; + + /* we fix up the ip4 header length and checksum after-the-fact */ + ip->checksum = ip4_header_checksum (ip); + } + else + { + ip6_header_t * ip = &r.h6->ip6; + udp = &r.h6->udp, vxlan = &r.h6->vxlan; + ip->ip_version_traffic_class_and_flow_label = clib_host_to_net_u32(6 << 28); + ip->hop_limit = 255; + ip->protocol = IP_PROTOCOL_UDP; + + ip->src_address = t->src.ip6; + ip->dst_address = t->dst.ip6; + } /* UDP header, randomize src port on something, maybe? */ - h0->udp.src_port = clib_host_to_net_u16 (4789); - h0->udp.dst_port = clib_host_to_net_u16 (UDP_DST_PORT_vxlan); + udp->src_port = clib_host_to_net_u16 (4789); + udp->dst_port = clib_host_to_net_u16 (UDP_DST_PORT_vxlan); /* VXLAN header */ - vnet_set_vni_and_flags(&h0->vxlan, t->vni); + vnet_set_vni_and_flags(vxlan, t->vni); - t->rewrite = rw; + t->rewrite = r.rw; return (0); } -static int vxlan6_rewrite (vxlan_tunnel_t * t) +static bool +vxlan_decap_next_is_valid (vxlan_main_t * vxm, u32 is_ip6, u32 decap_next_index) { - u8 *rw = 0; - ip6_header_t * ip0; - ip6_vxlan_header_t * h0; - int len = sizeof (*h0); - - vec_validate_aligned (rw, len-1, CLIB_CACHE_LINE_BYTES); - - h0 = (ip6_vxlan_header_t *) rw; - - /* Fixed portion of the (outer) ip6 header */ - ip0 = &h0->ip6; - ip0->ip_version_traffic_class_and_flow_label = clib_host_to_net_u32(6 << 28); - ip0->hop_limit = 255; - ip0->protocol = IP_PROTOCOL_UDP; - - ip0->src_address.as_u64[0] = t->src.ip6.as_u64[0]; - ip0->src_address.as_u64[1] = t->src.ip6.as_u64[1]; - ip0->dst_address.as_u64[0] = t->dst.ip6.as_u64[0]; - ip0->dst_address.as_u64[1] = t->dst.ip6.as_u64[1]; - - /* UDP header, randomize src port on something, maybe? */ - h0->udp.src_port = clib_host_to_net_u16 (4789); - h0->udp.dst_port = clib_host_to_net_u16 (UDP_DST_PORT_vxlan); - - /* VXLAN header */ - vnet_set_vni_and_flags(&h0->vxlan, t->vni); + vlib_main_t * vm = vxm->vlib_main; + u32 input_idx = (!is_ip6) ? vxlan4_input_node.index : vxlan6_input_node.index; + vlib_node_runtime_t *r = vlib_node_get_runtime (vm, input_idx); - t->rewrite = rw; - return (0); + return decap_next_index < r->n_next_nodes; } -static int vxlan_check_decap_next(vxlan_main_t * vxm, u32 is_ip6, u32 decap_next_index) -{ - vlib_main_t * vm = vxm->vlib_main; - vlib_node_runtime_t *r; - - if(!is_ip6) - { - r = vlib_node_get_runtime (vm, vxlan4_input_node.index); - if(decap_next_index >= r->n_next_nodes) - return 1; - } - else - { - r = vlib_node_get_runtime (vm, vxlan6_input_node.index); - if(decap_next_index >= r->n_next_nodes) - return 1; - } +static void +hash_set_key_copy (uword ** h, void * key, uword v) { + size_t ksz = hash_header(*h)->user; + void * copy = clib_mem_alloc (ksz); + clib_memcpy (copy, key, ksz); + hash_set_mem (*h, copy, v); +} - return 0; +static void +hash_unset_key_free (uword ** h, void * key) { + hash_pair_t * hp = hash_get_pair_mem (*h, key); + ASSERT (hp); + key = uword_to_pointer (hp->key, void *); + hash_unset_mem (*h, key); + clib_mem_free (key); } static uword vtep_addr_ref(ip46_address_t *ip) { - if (!ip46_address_is_ip4(ip)) - return 1; /* always create */ - uword *pvtep = hash_get (vxlan_main.vtep4, ip->ip4.as_u32); - if (pvtep) - return ++pvtep[0]; - hash_set (vxlan_main.vtep4, ip->ip4.as_u32, 1); + uword *vtep = ip46_address_is_ip4(ip) ? + hash_get (vxlan_main.vtep4, ip->ip4.as_u32) : + hash_get_mem (vxlan_main.vtep6, &ip->ip6); + if (vtep) + return ++(*vtep); + ip46_address_is_ip4(ip) ? + hash_set (vxlan_main.vtep4, ip->ip4.as_u32, 1) : + hash_set_key_copy (&vxlan_main.vtep6, &ip->ip6, 1); return 1; } static uword vtep_addr_unref(ip46_address_t *ip) { - if (!ip46_address_is_ip4(ip)) - return 0; /* alwways destroy */ - uword *pvtep = hash_get (vxlan_main.vtep4, ip->ip4.as_u32); - ASSERT(pvtep); - if (!(--pvtep[0])) - hash_unset (vxlan_main.vtep4, ip->ip4.as_u32); - return pvtep[0]; + uword *vtep = ip46_address_is_ip4(ip) ? + hash_get (vxlan_main.vtep4, ip->ip4.as_u32) : + hash_get_mem (vxlan_main.vtep6, &ip->ip6); + ASSERT(vtep); + if (--(*vtep) != 0) + return *vtep; + ip46_address_is_ip4(ip) ? + hash_unset (vxlan_main.vtep4, ip->ip4.as_u32) : + hash_unset_key_free (&vxlan_main.vtep6, &ip->ip6); + return 0; } -static -mcast_remote_t * -mcast_ep_get(ip46_address_t * ip) +typedef CLIB_PACKED(union { + struct { + fib_node_index_t mfib_entry_index; + adj_index_t mcast_adj_index; + }; + u64 as_u64; +}) mcast_shared_t; + +static inline mcast_shared_t +mcast_shared_get(ip46_address_t * ip) { ASSERT(ip46_address_is_multicast(ip)); - uword * ep_idx = hash_get_mem (vxlan_main.mcast_ep_by_ip, ip); - ASSERT(ep_idx); - return pool_elt_at_index(vxlan_main.mcast_eps, *ep_idx); + uword * p = hash_get_mem (vxlan_main.mcast_shared, ip); + ASSERT(p); + return (mcast_shared_t) { .as_u64 = *p }; } -static void -mcast_ep_add(mcast_remote_t * new_ep) +static inline void +mcast_shared_add(ip46_address_t *dst, + fib_node_index_t mfei, + adj_index_t ai) { - mcast_remote_t * ep; + mcast_shared_t new_ep = { + .mcast_adj_index = ai, + .mfib_entry_index = mfei, + }; - pool_get_aligned (vxlan_main.mcast_eps, ep, CLIB_CACHE_LINE_BYTES); - *ep = *new_ep; - hash_set_mem (vxlan_main.mcast_ep_by_ip, &ep->ip, ep - vxlan_main.mcast_eps); + hash_set_key_copy (&vxlan_main.mcast_shared, dst, new_ep.as_u64); } -static void -mcast_ep_remove(mcast_remote_t * ep) +static inline void +mcast_shared_remove(ip46_address_t *dst) { - hash_unset_mem (vxlan_main.mcast_ep_by_ip, &ep->ip); - pool_put (vxlan_main.mcast_eps, ep); + mcast_shared_t ep = mcast_shared_get(dst); + + adj_unlock(ep.mcast_adj_index); + mfib_table_entry_delete_index(ep.mfib_entry_index, + MFIB_SOURCE_VXLAN); + + hash_unset_key_free (&vxlan_main.mcast_shared, dst); } -static void -ip46_multicast_ethernet_address(u8 * ethernet_address, ip46_address_t * ip) { - if (ip46_address_is_ip4(ip)) - ip4_multicast_ethernet_address(ethernet_address, &ip->ip4); - else - ip6_multicast_ethernet_address(ethernet_address, ip->ip6.as_u32[0]); +static inline fib_protocol_t +fib_ip_proto(bool is_ip6) +{ + return (is_ip6) ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4; } int vnet_vxlan_add_del_tunnel @@ -370,8 +379,7 @@ int vnet_vxlan_add_del_tunnel } else { - key6.src.as_u64[0] = a->dst.ip6.as_u64[0]; - key6.src.as_u64[1] = a->dst.ip6.as_u64[1]; + key6.src = a->dst.ip6; key6.vni = clib_host_to_net_u32 (a->vni << 8); p = hash_get_mem (vxm->vxlan6_tunnel_by_key, &key6); } @@ -387,7 +395,7 @@ int vnet_vxlan_add_del_tunnel /*if not set explicitly, default to l2 */ if(a->decap_next_index == ~0) a->decap_next_index = VXLAN_INPUT_NEXT_L2_INPUT; - if (vxlan_check_decap_next(vxm, is_ip6, a->decap_next_index)) + if (!vxlan_decap_next_is_valid(vxm, is_ip6, a->decap_next_index)) return VNET_API_ERROR_INVALID_DECAP_NEXT; pool_get_aligned (vxm->tunnels, t, CLIB_CACHE_LINE_BYTES); @@ -397,33 +405,19 @@ int vnet_vxlan_add_del_tunnel #define _(x) t->x = a->x; foreach_copy_field; #undef _ - - /* copy the key */ - if (is_ip6) - { - t->key6 = clib_mem_alloc (sizeof(vxlan6_tunnel_key_t)); - clib_memcpy (t->key6, &key6, sizeof(key6)); - } - else - { - t->key4 = 0; /* not yet used */ - } - - if (!is_ip6) - rv = vxlan4_rewrite (t); - else - rv = vxlan6_rewrite (t); + rv = vxlan_rewrite (t, is_ip6); if (rv) { pool_put (vxm->tunnels, t); return rv; } - if (!is_ip6) - hash_set (vxm->vxlan4_tunnel_by_key, key4.as_u64, t - vxm->tunnels); + /* copy the key */ + if (is_ip6) + hash_set_key_copy (&vxm->vxlan6_tunnel_by_key, &key6, t - vxm->tunnels); else - hash_set_mem (vxm->vxlan6_tunnel_by_key, t->key6, t - vxm->tunnels); + hash_set (vxm->vxlan4_tunnel_by_key, key4.as_u64, t - vxm->tunnels); vnet_hw_interface_t * hi; if (vec_len (vxm->free_vxlan_tunnel_hw_if_indices) > 0) @@ -467,8 +461,11 @@ int vnet_vxlan_add_del_tunnel l2im->configs[sw_if_index].feature_bitmap = L2INPUT_FEAT_DROP; l2im->configs[sw_if_index].bd_index = 0; + vnet_sw_interface_t * si = vnet_get_sw_interface (vnm, sw_if_index); + si->flags &= ~VNET_SW_INTERFACE_FLAG_HIDDEN; vnet_sw_interface_set_flags (vnm, sw_if_index, VNET_SW_INTERFACE_FLAG_ADMIN_UP); + fib_node_init(&t->node, FIB_NODE_TYPE_VXLAN_TUNNEL); fib_prefix_t tun_dst_pfx; u32 encap_index = !is_ip6 ? @@ -484,10 +481,10 @@ int vnet_vxlan_add_del_tunnel * when the forwarding for the entry updates, and the tunnel can * re-stack accordingly */ - vtep_addr_ref(&t->src); + vtep_addr_ref(&t->src); t->fib_entry_index = fib_table_entry_special_add (t->encap_fib_index, &tun_dst_pfx, FIB_SOURCE_RR, - FIB_ENTRY_FLAG_NONE, ADJ_INDEX_INVALID); + FIB_ENTRY_FLAG_NONE); t->sibling_index = fib_entry_child_add (t->fib_entry_index, FIB_NODE_TYPE_VXLAN_TUNNEL, t - vxm->tunnels); vxlan_tunnel_restack_dpo(t); @@ -499,31 +496,66 @@ int vnet_vxlan_add_del_tunnel * with different VNIs, create the output fib adjecency only if * it does not already exist */ - fib_protocol_t fp = (is_ip6) ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4; - dpo_id_t dpo = DPO_INVALID; - dpo_proto_t dproto = fib_proto_to_dpo(fp); + fib_protocol_t fp = fib_ip_proto(is_ip6); if (vtep_addr_ref(&t->dst) == 1) - { - u8 mcast_mac[6]; - - ip46_multicast_ethernet_address(mcast_mac, &t->dst); - receive_dpo_add_or_lock(dproto, ~0, NULL, &dpo); - mcast_remote_t new_ep = { - .ip = t->dst, - .mcast_adj_index = adj_rewrite_add_and_lock - (fp, fib_proto_to_link(fp), a->mcast_sw_if_index, mcast_mac), - /* Add VRF local mcast adj. */ - .fib_entry_index = fib_table_entry_special_dpo_add - (t->encap_fib_index, &tun_dst_pfx, - FIB_SOURCE_SPECIAL, FIB_ENTRY_FLAG_NONE, &dpo) - }; - mcast_ep_add(&new_ep); - dpo_reset(&dpo); - } + { + fib_node_index_t mfei; + adj_index_t ai; + fib_route_path_t path = { + .frp_proto = fib_proto_to_dpo(fp), + .frp_addr = zero_addr, + .frp_sw_if_index = 0xffffffff, + .frp_fib_index = ~0, + .frp_weight = 0, + .frp_flags = FIB_ROUTE_PATH_LOCAL, + }; + const mfib_prefix_t mpfx = { + .fp_proto = fp, + .fp_len = (is_ip6 ? 128 : 32), + .fp_grp_addr = tun_dst_pfx.fp_addr, + }; + + /* + * Setup the (*,G) to receive traffic on the mcast group + * - the forwarding interface is for-us + * - the accepting interface is that from the API + */ + mfib_table_entry_path_update(t->encap_fib_index, + &mpfx, + MFIB_SOURCE_VXLAN, + &path, + MFIB_ITF_FLAG_FORWARD); + + path.frp_sw_if_index = a->mcast_sw_if_index; + path.frp_flags = FIB_ROUTE_PATH_FLAG_NONE; + mfei = mfib_table_entry_path_update(t->encap_fib_index, + &mpfx, + MFIB_SOURCE_VXLAN, + &path, + MFIB_ITF_FLAG_ACCEPT); + + /* + * Create the mcast adjacency to send traffic to the group + */ + ai = adj_mcast_add_or_lock(fp, + fib_proto_to_link(fp), + a->mcast_sw_if_index); + + /* + * create a new end-point + */ + mcast_shared_add(&t->dst, mfei, ai); + } + + dpo_id_t dpo = DPO_INVALID; + mcast_shared_t ep = mcast_shared_get(&t->dst); + /* Stack shared mcast dst mac addr rewrite on encap */ - dpo_set (&dpo, DPO_ADJACENCY, dproto, - mcast_ep_get(&t->dst)->mcast_adj_index); + dpo_set (&dpo, DPO_ADJACENCY_MCAST, + fib_proto_to_dpo(fp), + ep.mcast_adj_index); + dpo_stack_from_node (encap_index, &t->next_dpo, &dpo); dpo_reset (&dpo); flood_class = VNET_FLOOD_CLASS_TUNNEL_MASTER; @@ -542,7 +574,11 @@ int vnet_vxlan_add_del_tunnel t = pool_elt_at_index (vxm->tunnels, p[0]); + sw_if_index = t->sw_if_index; vnet_sw_interface_set_flags (vnm, t->sw_if_index, 0 /* down */); + vnet_sw_interface_t * si = vnet_get_sw_interface (vnm, t->sw_if_index); + si->flags |= VNET_SW_INTERFACE_FLAG_HIDDEN; + /* make sure tunnel is removed from l2 bd or xconnect */ set_int_l2_mode(vxm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0, 0, 0, 0); vec_add1 (vxm->free_vxlan_tunnel_hw_if_indices, t->hw_if_index); @@ -552,23 +588,17 @@ int vnet_vxlan_add_del_tunnel if (!is_ip6) hash_unset (vxm->vxlan4_tunnel_by_key, key4.as_u64); else - { - hash_unset_mem (vxm->vxlan6_tunnel_by_key, t->key6); - clib_mem_free (t->key6); - } + hash_unset_key_free (&vxm->vxlan6_tunnel_by_key, &key6); if (!ip46_address_is_multicast(&t->dst)) { - vtep_addr_unref(&a->src); + 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); } else if (vtep_addr_unref(&t->dst) == 0) { - mcast_remote_t* ep = mcast_ep_get(&t->dst); - adj_unlock(ep->mcast_adj_index); - fib_table_entry_delete_index(ep->fib_entry_index, FIB_SOURCE_SPECIAL); - mcast_ep_remove(ep); + mcast_shared_remove(&t->dst); } fib_node_deinit(&t->node); @@ -582,46 +612,14 @@ int vnet_vxlan_add_del_tunnel return 0; } -static u32 fib4_index_from_fib_id (u32 fib_id) -{ - ip4_main_t * im = &ip4_main; - uword * p; - - p = hash_get (im->fib_index_by_table_id, fib_id); - if (!p) - return ~0; - - return p[0]; -} - -static u32 fib6_index_from_fib_id (u32 fib_id) -{ - ip6_main_t * im = &ip6_main; - uword * p; - - p = hash_get (im->fib_index_by_table_id, fib_id); - if (!p) - return ~0; - - return p[0]; -} - static uword get_decap_next_for_node(u32 node_index, u32 ipv4_set) { vxlan_main_t * vxm = &vxlan_main; vlib_main_t * vm = vxm->vlib_main; - uword next_index = ~0; + uword input_node = (ipv4_set) ? vxlan4_input_node.index : + vxlan6_input_node.index; - if (ipv4_set) - { - next_index = vlib_node_add_next (vm, vxlan4_input_node.index, node_index); - } - else - { - next_index = vlib_node_add_next (vm, vxlan6_input_node.index, node_index); - } - - return next_index; + return vlib_node_add_next (vm, input_node, node_index); } static uword unformat_decap_next (unformat_input_t * input, va_list * args) @@ -665,6 +663,7 @@ vxlan_add_del_tunnel_command_fn (vlib_main_t * vm, int rv; vnet_vxlan_add_del_tunnel_args_t _a, * a = &_a; u32 tunnel_sw_if_index; + clib_error_t *error = NULL; /* Cant "universally zero init" (={0}) due to GCC bug 53119 */ memset(&src, 0, sizeof src); @@ -721,12 +720,12 @@ vxlan_add_del_tunnel_command_fn (vlib_main_t * vm, } else if (unformat (line_input, "encap-vrf-id %d", &tmp)) { - if (ipv6_set) - encap_fib_index = fib6_index_from_fib_id (tmp); - else - encap_fib_index = fib4_index_from_fib_id (tmp); + encap_fib_index = fib_table_find (fib_ip_proto (ipv6_set), tmp); if (encap_fib_index == ~0) - return clib_error_return (0, "nonexistent encap-vrf-id %d", tmp); + { + error = clib_error_return (0, "nonexistent encap-vrf-id %d", tmp); + goto done; + } } else if (unformat (line_input, "decap-next %U", unformat_decap_next, &decap_next_index, ipv4_set)) @@ -734,41 +733,72 @@ vxlan_add_del_tunnel_command_fn (vlib_main_t * vm, else if (unformat (line_input, "vni %d", &vni)) { if (vni >> 24) - return clib_error_return (0, "vni %d out of range", vni); + { + error = clib_error_return (0, "vni %d out of range", vni); + goto done; + } } else - return clib_error_return (0, "parse error: '%U'", - format_unformat_error, line_input); + { + error = clib_error_return (0, "parse error: '%U'", + format_unformat_error, line_input); + goto done; + } } - unformat_free (line_input); - if (src_set == 0) - return clib_error_return (0, "tunnel src address not specified"); + { + error = clib_error_return (0, "tunnel src address not specified"); + goto done; + } if (dst_set == 0) - return clib_error_return (0, "tunnel dst address not specified"); + { + error = clib_error_return (0, "tunnel dst address not specified"); + goto done; + } if (grp_set && !ip46_address_is_multicast(&dst)) - return clib_error_return (0, "tunnel group address not multicast"); + { + error = clib_error_return (0, "tunnel group address not multicast"); + goto done; + } if (grp_set == 0 && ip46_address_is_multicast(&dst)) - return clib_error_return (0, "dst address must be unicast"); + { + error = clib_error_return (0, "dst address must be unicast"); + goto done; + } if (grp_set && mcast_sw_if_index == ~0) - return clib_error_return (0, "tunnel nonexistent multicast device"); + { + error = clib_error_return (0, "tunnel nonexistent multicast device"); + goto done; + } if (ipv4_set && ipv6_set) - return clib_error_return (0, "both IPv4 and IPv6 addresses specified"); + { + error = clib_error_return (0, "both IPv4 and IPv6 addresses specified"); + goto done; + } if (ip46_address_cmp(&src, &dst) == 0) - return clib_error_return (0, "src and dst addresses are identical"); + { + error = clib_error_return (0, "src and dst addresses are identical"); + goto done; + } if (decap_next_index == ~0) - return clib_error_return (0, "next node not found"); + { + error = clib_error_return (0, "next node not found"); + goto done; + } if (vni == 0) - return clib_error_return (0, "vni not specified"); + { + error = clib_error_return (0, "vni not specified"); + goto done; + } memset (a, 0, sizeof (*a)); @@ -790,17 +820,23 @@ vxlan_add_del_tunnel_command_fn (vlib_main_t * vm, break; case VNET_API_ERROR_TUNNEL_EXIST: - return clib_error_return (0, "tunnel already exists..."); + error = clib_error_return (0, "tunnel already exists..."); + goto done; case VNET_API_ERROR_NO_SUCH_ENTRY: - return clib_error_return (0, "tunnel does not exist..."); + error = clib_error_return (0, "tunnel does not exist..."); + goto done; default: - return clib_error_return + error = clib_error_return (0, "vnet_vxlan_add_del_tunnel returned %d", rv); + goto done; } - return 0; +done: + unformat_free (line_input); + + return error; } /*? @@ -871,6 +907,179 @@ VLIB_CLI_COMMAND (show_vxlan_tunnel_command, static) = { /* *INDENT-ON* */ +void vnet_int_vxlan_bypass_mode (u32 sw_if_index, + u8 is_ip6, + u8 is_enable) +{ + if (is_ip6) + vnet_feature_enable_disable ("ip6-unicast", "ip6-vxlan-bypass", + sw_if_index, is_enable, 0, 0); + else + vnet_feature_enable_disable ("ip4-unicast", "ip4-vxlan-bypass", + sw_if_index, is_enable, 0, 0); +} + + +static clib_error_t * +set_ip_vxlan_bypass (u32 is_ip6, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + unformat_input_t _line_input, * line_input = &_line_input; + vnet_main_t * vnm = vnet_get_main(); + clib_error_t * error = 0; + u32 sw_if_index, is_enable; + + sw_if_index = ~0; + is_enable = 1; + + if (! unformat_user (input, unformat_line_input, line_input)) + return 0; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat_user (line_input, unformat_vnet_sw_interface, vnm, &sw_if_index)) + ; + else if (unformat (line_input, "del")) + is_enable = 0; + else + { + error = unformat_parse_error (line_input); + goto done; + } + } + + if (~0 == sw_if_index) + { + error = clib_error_return (0, "unknown interface `%U'", + format_unformat_error, line_input); + goto done; + } + + vnet_int_vxlan_bypass_mode (sw_if_index, is_ip6, is_enable); + + done: + unformat_free (line_input); + + return error; +} + +static clib_error_t * +set_ip4_vxlan_bypass (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + return set_ip_vxlan_bypass (0, input, cmd); +} + +/*? + * This command adds the 'ip4-vxlan-bypass' graph node for a given interface. + * By adding the IPv4 vxlan-bypass graph node to an interface, the node checks + * for and validate input vxlan packet and bypass ip4-lookup, ip4-local, + * ip4-udp-lookup nodes to speedup vxlan packet forwarding. This node will + * cause extra overhead to for non-vxlan packets which is kept at a minimum. + * + * @cliexpar + * @parblock + * Example of graph node before ip4-vxlan-bypass is enabled: + * @cliexstart{show vlib graph ip4-vxlan-bypass} + * Name Next Previous + * ip4-vxlan-bypass error-drop [0] + * vxlan4-input [1] + * ip4-lookup [2] + * @cliexend + * + * Example of how to enable ip4-vxlan-bypass on an interface: + * @cliexcmd{set interface ip vxlan-bypass GigabitEthernet2/0/0} + * + * Example of graph node after ip4-vxlan-bypass is enabled: + * @cliexstart{show vlib graph ip4-vxlan-bypass} + * Name Next Previous + * ip4-vxlan-bypass error-drop [0] ip4-input + * vxlan4-input [1] ip4-input-no-checksum + * ip4-lookup [2] + * @cliexend + * + * Example of how to display the feature enabed on an interface: + * @cliexstart{show ip interface features GigabitEthernet2/0/0} + * IP feature paths configured on GigabitEthernet2/0/0... + * ... + * ipv4 unicast: + * ip4-vxlan-bypass + * ip4-lookup + * ... + * @cliexend + * + * Example of how to disable ip4-vxlan-bypass on an interface: + * @cliexcmd{set interface ip vxlan-bypass GigabitEthernet2/0/0 del} + * @endparblock +?*/ +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (set_interface_ip_vxlan_bypass_command, static) = { + .path = "set interface ip vxlan-bypass", + .function = set_ip4_vxlan_bypass, + .short_help = "set interface ip vxlan-bypass [del]", +}; +/* *INDENT-ON* */ + +static clib_error_t * +set_ip6_vxlan_bypass (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + return set_ip_vxlan_bypass (1, input, cmd); +} + +/*? + * This command adds the 'ip6-vxlan-bypass' graph node for a given interface. + * By adding the IPv6 vxlan-bypass graph node to an interface, the node checks + * for and validate input vxlan packet and bypass ip6-lookup, ip6-local, + * ip6-udp-lookup nodes to speedup vxlan packet forwarding. This node will + * cause extra overhead to for non-vxlan packets which is kept at a minimum. + * + * @cliexpar + * @parblock + * Example of graph node before ip6-vxlan-bypass is enabled: + * @cliexstart{show vlib graph ip6-vxlan-bypass} + * Name Next Previous + * ip6-vxlan-bypass error-drop [0] + * vxlan6-input [1] + * ip6-lookup [2] + * @cliexend + * + * Example of how to enable ip6-vxlan-bypass on an interface: + * @cliexcmd{set interface ip6 vxlan-bypass GigabitEthernet2/0/0} + * + * Example of graph node after ip6-vxlan-bypass is enabled: + * @cliexstart{show vlib graph ip6-vxlan-bypass} + * Name Next Previous + * ip6-vxlan-bypass error-drop [0] ip6-input + * vxlan6-input [1] ip4-input-no-checksum + * ip6-lookup [2] + * @cliexend + * + * Example of how to display the feature enabed on an interface: + * @cliexstart{show ip interface features GigabitEthernet2/0/0} + * IP feature paths configured on GigabitEthernet2/0/0... + * ... + * ipv6 unicast: + * ip6-vxlan-bypass + * ip6-lookup + * ... + * @cliexend + * + * Example of how to disable ip6-vxlan-bypass on an interface: + * @cliexcmd{set interface ip6 vxlan-bypass GigabitEthernet2/0/0 del} + * @endparblock +?*/ +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (set_interface_ip6_vxlan_bypass_command, static) = { + .path = "set interface ip6 vxlan-bypass", + .function = set_ip6_vxlan_bypass, + .short_help = "set interface ip vxlan-bypass [del]", +}; +/* *INDENT-ON* */ + clib_error_t *vxlan_init (vlib_main_t *vm) { vxlan_main_t * vxm = &vxlan_main; @@ -882,9 +1091,12 @@ clib_error_t *vxlan_init (vlib_main_t *vm) vxm->vxlan6_tunnel_by_key = hash_create_mem(0, sizeof(vxlan6_tunnel_key_t), sizeof(uword)); - vxm->mcast_ep_by_ip = hash_create_mem(0, - sizeof(ip46_address_t), + vxm->vtep6 = hash_create_mem(0, + sizeof(ip6_address_t), sizeof(uword)); + vxm->mcast_shared = hash_create_mem(0, + sizeof(ip46_address_t), + sizeof(mcast_shared_t)); udp_register_dst_port (vm, UDP_DST_PORT_vxlan, vxlan4_input_node.index, /* is_ip4 */ 1);