summaryrefslogtreecommitdiffstats
path: root/src/vnet/geneve/geneve.c
diff options
context:
space:
mode:
authorNick Zavaritsky <nick.zavaritsky@emnify.com>2020-02-27 15:54:58 +0000
committerJohn Lo <loj@cisco.com>2020-03-03 16:15:15 +0000
commit27518c2ffd0ef75e973a64870da0e3339f39ccce (patch)
tree3fb7afdb06963ae3ef36cc74bfe33e10b8668d5d /src/vnet/geneve/geneve.c
parent297d288ed653abac9d719013c4ead5215230e7da (diff)
geneve gtpu vxlan vxlan-gpe: VRF-aware bypass node
Bypass node MUST NOT intercept a packet if destination IP doesn’t match a local address. However IP address interpretation depends on the VRF, hence bypass node must take that into account. This patch also factors-out common VTEP management and checking code. Type: improvement Signed-off-by: Nick Zavaritsky <nick.zavaritsky@emnify.com> Change-Id: I5665d94882bbf45d15f8da140c7ada528ec7fa94
Diffstat (limited to 'src/vnet/geneve/geneve.c')
-rw-r--r--src/vnet/geneve/geneve.c41
1 files changed, 7 insertions, 34 deletions
diff --git a/src/vnet/geneve/geneve.c b/src/vnet/geneve/geneve.c
index 501ab7f9845..52664b389a4 100644
--- a/src/vnet/geneve/geneve.c
+++ b/src/vnet/geneve/geneve.c
@@ -292,35 +292,6 @@ geneve_decap_next_is_valid (geneve_main_t * vxm, u32 is_ip6,
return decap_next_index < r->n_next_nodes;
}
-static uword
-vtep_addr_ref (ip46_address_t * ip)
-{
- uword *vtep = ip46_address_is_ip4 (ip) ?
- hash_get (geneve_main.vtep4, ip->ip4.as_u32) :
- hash_get_mem (geneve_main.vtep6, &ip->ip6);
- if (vtep)
- return ++(*vtep);
- ip46_address_is_ip4 (ip) ?
- hash_set (geneve_main.vtep4, ip->ip4.as_u32, 1) :
- hash_set_mem_alloc (&geneve_main.vtep6, &ip->ip6, 1);
- return 1;
-}
-
-static uword
-vtep_addr_unref (ip46_address_t * ip)
-{
- uword *vtep = ip46_address_is_ip4 (ip) ?
- hash_get (geneve_main.vtep4, ip->ip4.as_u32) :
- hash_get_mem (geneve_main.vtep6, &ip->ip6);
- ALWAYS_ASSERT (vtep);
- if (--(*vtep) != 0)
- return *vtep;
- ip46_address_is_ip4 (ip) ?
- hash_unset (geneve_main.vtep4, ip->ip4.as_u32) :
- hash_unset_mem_free (&geneve_main.vtep6, &ip->ip6);
- return 0;
-}
-
typedef CLIB_PACKED (union
{
struct
@@ -498,7 +469,7 @@ int vnet_geneve_add_del_tunnel
* when the forwarding for the entry updates, and the tunnel can
* re-stack accordingly
*/
- vtep_addr_ref (&t->local);
+ vtep_addr_ref (&vxm->vtep_table, t->encap_fib_index, &t->local);
t->fib_entry_index = fib_entry_track (t->encap_fib_index,
&tun_remote_pfx,
FIB_NODE_TYPE_GENEVE_TUNNEL,
@@ -515,7 +486,8 @@ int vnet_geneve_add_del_tunnel
*/
fib_protocol_t fp = fib_ip_proto (is_ip6);
- if (vtep_addr_ref (&t->remote) == 1)
+ if (vtep_addr_ref (&vxm->vtep_table,
+ t->encap_fib_index, &t->remote) == 1)
{
fib_node_index_t mfei;
adj_index_t ai;
@@ -604,10 +576,11 @@ int vnet_geneve_add_del_tunnel
if (!ip46_address_is_multicast (&t->remote))
{
- vtep_addr_unref (&t->local);
+ vtep_addr_unref (&vxm->vtep_table, t->encap_fib_index, &t->local);
fib_entry_untrack (t->fib_entry_index, t->sibling_index);
}
- else if (vtep_addr_unref (&t->remote) == 0)
+ else if (vtep_addr_unref (&vxm->vtep_table,
+ t->encap_fib_index, &t->remote) == 0)
{
mcast_shared_remove (&t->remote);
}
@@ -1118,7 +1091,7 @@ geneve_init (vlib_main_t * vm)
vxm->geneve6_tunnel_by_key = hash_create_mem (0,
sizeof (geneve6_tunnel_key_t),
sizeof (uword));
- vxm->vtep6 = hash_create_mem (0, sizeof (ip6_address_t), sizeof (uword));
+ vxm->vtep_table = vtep_table_create ();
vxm->mcast_shared = hash_create_mem (0,
sizeof (ip46_address_t),
sizeof (mcast_shared_t));