X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fvxlan%2Fvxlan.c;h=9ed42875a35d17460f4b577bd95adc9bf74f4441;hb=32e1c010b0c34fd0984f7fc45fae648a182025c5;hp=7d364be3863484e445ebe60788ad2af2b9235c93;hpb=5ac9bf53b3360f7987ee31ab7377d801e6c713db;p=vpp.git diff --git a/src/vnet/vxlan/vxlan.c b/src/vnet/vxlan/vxlan.c index 7d364be3863..9ed42875a35 100644 --- a/src/vnet/vxlan/vxlan.c +++ b/src/vnet/vxlan/vxlan.c @@ -16,7 +16,8 @@ #include #include #include -#include +#include +#include #include /** @@ -289,66 +290,92 @@ static int vxlan_check_decap_next(vxlan_main_t * vxm, u32 is_ip6, u32 decap_next return 0; } +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); +} + +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); - 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 0; - } - return *pvtep; + 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); -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]); + 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); } int vnet_vxlan_add_del_tunnel @@ -414,16 +441,9 @@ int vnet_vxlan_add_del_tunnel /* copy the key */ if (is_ip6) - { - t->key6 = clib_mem_alloc (sizeof(vxlan6_tunnel_key_t)); - clib_memcpy (t->key6, &key6, sizeof(key6)); - hash_set_mem (vxm->vxlan6_tunnel_by_key, t->key6, t - vxm->tunnels); - } + hash_set_key_copy (&vxm->vxlan6_tunnel_by_key, &key6, t - vxm->tunnels); else - { - t->key4 = 0; /* not yet used */ - hash_set (vxm->vxlan4_tunnel_by_key, key4.as_u64, 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) @@ -484,7 +504,7 @@ 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); @@ -501,31 +521,65 @@ int vnet_vxlan_add_del_tunnel */ 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); + mcast_shared_t ep; 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); - ip46_address_t * dst_copy = clib_mem_alloc (sizeof(ip46_address_t)); - *dst_copy = t->dst; - mcast_remote_t new_ep = { - .ip = dst_copy, - .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 = 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); + } + + 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, + 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; @@ -554,10 +608,7 @@ 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)) { @@ -567,12 +618,7 @@ int vnet_vxlan_add_del_tunnel } else if (vtep_addr_unref(&t->dst) == 0) { - mcast_remote_t * ep = mcast_ep_get(&t->dst); - ip46_address_t * ip = ep->ip; - adj_unlock(ep->mcast_adj_index); - fib_table_entry_delete_index(ep->fib_entry_index, FIB_SOURCE_SPECIAL); - mcast_ep_remove(ep); - clib_mem_free(ip); + mcast_shared_remove(&t->dst); } fib_node_deinit(&t->node); @@ -886,9 +932,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);