ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vxlan:ip4 decap:remove access to tunnel object

Browse Source 
store local/remote addresses + vrf + vni in hash key
store complete decap info in hash value (sw_if_index + next_index +
error)

this removes the need to access the tunnel object when matching both
unicast and mcast.

however for mcast handling it requires 3 hash lookups:
* one failed unicast lookup (by src+dst addrs)
* lookup by mcast(dst) addr .
* unicast lookup (tunnel local ip as dst + pkt's src addr)

where previously it needed 2:
* lookup by src to find unicast tunnel + compare dst to local addr
(failing for mcast)
* lookup by mcast to find the mcast tunnel

Change-Id: I7a3485d130a54194b8f7e2df0431258db36eceeb
Signed-off-by: Eyal Bari <ebari@cisco.com>
This commit is contained in:
Eyal Bari
2018-10-02 12:23:06 +03:00
committed by John Lo
parent dc7b1aa1e3
commit efd9cf302f
3 changed files with 203 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

315
src/vnet/vxlan/decap.c
View File

File diff suppressed because it is too large Load Diff

66
src/vnet/vxlan/vxlan.c
View File

@ -367,9 +367,8 @@ int vnet_vxlan_add_del_tunnel
(vnet_vxlan_add_del_tunnel_args_t * a, u32 * sw_if_indexp)
{
vxlan_main_t *vxm = &vxlan_main;
vxlan_tunnel_t *t = 0;
vnet_main_t *vnm = vxm->vnet_main;
u64 *p;
vxlan_decap_info_t *p;
u32 sw_if_index = ~0;
vxlan4_tunnel_key_t key4;
vxlan6_tunnel_key_t key6;
@ -378,12 +377,15 @@ int vnet_vxlan_add_del_tunnel
int not_found;
if (!is_ip6)
{
key4.key[0] = a->dst.ip4.as_u32;
/* 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);
not_found =
clib_bihash_search_inline_16_8 (&vxm->vxlan4_tunnel_by_key, &key4);
p = &key4.value;
p = (void *) &key4.value;
}
else
{
@ -393,7 +395,7 @@ int vnet_vxlan_add_del_tunnel
| clib_host_to_net_u32 (a->vni << 8);
not_found =
clib_bihash_search_inline_24_8 (&vxm->vxlan6_tunnel_by_key, &key6);
p = &key6.value;
p = (void *) &key6.value;
}
if (not_found)
@ -415,6 +417,7 @@ int vnet_vxlan_add_del_tunnel
if (!vxlan_decap_next_is_valid (vxm, is_ip6, a->decap_next_index))
return VNET_API_ERROR_INVALID_DECAP_NEXT;
vxlan_tunnel_t *t;
pool_get_aligned (vxm->tunnels, t, CLIB_CACHE_LINE_BYTES);
memset (t, 0, sizeof (*t));
dev_instance = t - vxm->tunnels;
@ -442,27 +445,6 @@ int vnet_vxlan_add_del_tunnel
t->user_instance = user_instance; /* name */
t->flow_index = ~0;
/* copy the key */
int add_failed;
if (is_ip6)
{
key6.value = (u64) dev_instance;
add_failed = clib_bihash_add_del_24_8 (&vxm->vxlan6_tunnel_by_key,
&key6, 1 /*add */ );
}
else
{
key4.value = (u64) dev_instance;
add_failed = clib_bihash_add_del_16_8 (&vxm->vxlan4_tunnel_by_key,
&key4, 1 /*add */ );
}
if (add_failed)
{
pool_put (vxm->tunnels, t);
return VNET_API_ERROR_INVALID_REGISTRATION;
}
t->hw_if_index = vnet_register_interface
(vnm, vxlan_device_class.index, dev_instance,
vxlan_hw_class.index, dev_instance);
@ -475,6 +457,34 @@ int vnet_vxlan_add_del_tunnel
t->sw_if_index = sw_if_index = hi->sw_if_index;
/* copy the key */
int add_failed;
if (is_ip6)
{
key6.value = (u64) dev_instance;
add_failed = clib_bihash_add_del_24_8 (&vxm->vxlan6_tunnel_by_key,
&key6, 1 /*add */ );
}
else
{
vxlan_decap_info_t di = {.sw_if_index = t->sw_if_index, };
if (ip46_address_is_multicast (&t->dst))
di.local_ip = t->src.ip4;
else
di.next_index = t->decap_next_index;
key4.value = di.as_u64;
add_failed = clib_bihash_add_del_16_8 (&vxm->vxlan4_tunnel_by_key,
&key4, 1 /*add */ );
}
if (add_failed)
{
vnet_delete_hw_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;
}
vec_validate_init_empty (vxm->tunnel_index_by_sw_if_index, sw_if_index,
~0);
vxm->tunnel_index_by_sw_if_index[sw_if_index] = dev_instance;
@ -589,8 +599,8 @@ int vnet_vxlan_add_del_tunnel
if (!p)
return VNET_API_ERROR_NO_SUCH_ENTRY;
u32 instance = p[0];
t = pool_elt_at_index (vxm->tunnels, instance);
u32 instance = vxm->tunnel_index_by_sw_if_index[p->sw_if_index];
vxlan_tunnel_t *t = pool_elt_at_index (vxm->tunnels, instance);
sw_if_index = t->sw_if_index;
vnet_sw_interface_set_flags (vnm, sw_if_index, 0 /* down */ );

18
src/vnet/vxlan/vxlan.h
View File

@ -59,6 +59,24 @@ typedef clib_bihash_kv_16_8_t vxlan4_tunnel_key_t;
*/
typedef clib_bihash_kv_24_8_t vxlan6_tunnel_key_t;
typedef union
{
struct
{
u32 sw_if_index; /* unicast - input interface / mcast - stats interface */
union
{
struct /* unicast action */
{
u16 next_index;
u8 error;
};
ip4_address_t local_ip; /* used as dst ip for mcast pkts to assign them to unicast tunnel */
};
};
u64 as_u64;
} vxlan_decap_info_t;
typedef struct
{
/* Required for pool_get_aligned */