aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEyal Bari <ebari@cisco.com>2018-10-02 12:23:06 +0300
committerJohn Lo <loj@cisco.com>2018-10-05 03:25:39 +0000
commitefd9cf302ff6cbaf3c51e69bb9ea6c29e2325a10 (patch)
treeef945cf9c7a19f46720b3a1aa9d9619743ca698e /src
parentdc7b1aa1e3c451b0ffc18543f06aa03eae56a087 (diff)
vxlan:ip4 decap:remove access to tunnel object
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>
Diffstat (limited to 'src')
-rw-r--r--src/vnet/vxlan/decap.c305
-rw-r--r--src/vnet/vxlan/vxlan.c50
-rw-r--r--src/vnet/vxlan/vxlan.h18
3 files changed, 190 insertions, 183 deletions
diff --git a/src/vnet/vxlan/decap.c b/src/vnet/vxlan/decap.c
index 3ae70c9f011..387539d8f4a 100644
--- a/src/vnet/vxlan/decap.c
+++ b/src/vnet/vxlan/decap.c
@@ -62,73 +62,90 @@ buf_fib_index (vlib_buffer_t * b, u32 is_ip4)
typedef vxlan4_tunnel_key_t last_tunnel_cache4;
-always_inline vxlan_tunnel_t *
+static const vxlan_decap_info_t decap_not_found = {
+ .sw_if_index = ~0,
+ .next_index = VXLAN_INPUT_NEXT_DROP,
+ .error = VXLAN_ERROR_NO_SUCH_TUNNEL
+};
+
+static const vxlan_decap_info_t decap_bad_flags = {
+ .sw_if_index = ~0,
+ .next_index = VXLAN_INPUT_NEXT_DROP,
+ .error = VXLAN_ERROR_BAD_FLAGS
+};
+
+always_inline vxlan_decap_info_t
vxlan4_find_tunnel (vxlan_main_t * vxm, last_tunnel_cache4 * cache,
u32 fib_index, ip4_header_t * ip4_0,
- vxlan_header_t * vxlan0, vxlan_tunnel_t ** stats_t0)
+ vxlan_header_t * vxlan0, u32 * stats_sw_if_index)
{
- /* Make sure VXLAN tunnel exist according to packet SIP and VNI */
- vxlan4_tunnel_key_t key4;
- key4.key[1] = ((u64) fib_index << 32) | vxlan0->vni_reserved;
+ if (PREDICT_FALSE (vxlan0->flags != VXLAN_FLAGS_I))
+ return decap_bad_flags;
+
+ /* Make sure VXLAN tunnel exist according to packet S/D IP, VRF, and VNI */
+ u32 dst = ip4_0->dst_address.as_u32;
+ u32 src = ip4_0->src_address.as_u32;
+ vxlan4_tunnel_key_t key4 = {
+ .key[0] = ((u64) dst << 32) | src,
+ .key[1] = ((u64) fib_index << 32) | vxlan0->vni_reserved,
+ };
- if (PREDICT_FALSE (key4.key[1] != cache->key[1] ||
- ip4_0->src_address.as_u32 != (u32) cache->key[0]))
+ if (PREDICT_TRUE
+ (key4.key[0] == cache->key[0] || key4.key[1] == cache->key[1]))
{
- key4.key[0] = ip4_0->src_address.as_u32;
- int rv =
- clib_bihash_search_inline_16_8 (&vxm->vxlan4_tunnel_by_key, &key4);
- if (PREDICT_FALSE (rv != 0))
- {
- *stats_t0 = 0;
- return 0;
- }
-
- *cache = key4;
+ /* cache hit */
+ vxlan_decap_info_t di = {.as_u64 = cache->value };
+ *stats_sw_if_index = di.sw_if_index;
+ return di;
}
- vxlan_tunnel_t *t0 = pool_elt_at_index (vxm->tunnels, cache->value);
- /* Validate VXLAN tunnel SIP against packet DIP */
- if (PREDICT_TRUE (ip4_0->dst_address.as_u32 == t0->src.ip4.as_u32))
- *stats_t0 = t0;
- else
+ int rv = clib_bihash_search_inline_16_8 (&vxm->vxlan4_tunnel_by_key, &key4);
+ if (PREDICT_TRUE (rv == 0))
{
- /* try multicast */
- if (PREDICT_TRUE (!ip4_address_is_multicast (&ip4_0->dst_address)))
- {
- *stats_t0 = 0;
- return 0;
- }
-
- key4.key[0] = ip4_0->dst_address.as_u32;
- /* Make sure mcast VXLAN tunnel exist by packet DIP and VNI */
- int rv =
- clib_bihash_search_inline_16_8 (&vxm->vxlan4_tunnel_by_key, &key4);
- if (PREDICT_FALSE (rv != 0))
- {
- *stats_t0 = 0;
- return 0;
- }
-
- *stats_t0 = pool_elt_at_index (vxm->tunnels, key4.value);
+ *cache = key4;
+ vxlan_decap_info_t di = {.as_u64 = key4.value };
+ *stats_sw_if_index = di.sw_if_index;
+ return di;
}
- return t0;
+ /* try multicast */
+ if (PREDICT_TRUE (!ip4_address_is_multicast (&ip4_0->dst_address)))
+ return decap_not_found;
+
+ /* search for mcast decap info by mcast address */
+ key4.key[0] = dst;
+ rv = clib_bihash_search_inline_16_8 (&vxm->vxlan4_tunnel_by_key, &key4);
+ if (rv != 0)
+ return decap_not_found;
+
+ /* search for unicast tunnel using the mcast tunnel local(src) ip */
+ vxlan_decap_info_t mdi = {.as_u64 = key4.value };
+ key4.key[0] = ((u64) mdi.local_ip.as_u32 << 32) | src;
+ rv = clib_bihash_search_inline_16_8 (&vxm->vxlan4_tunnel_by_key, &key4);
+ if (PREDICT_FALSE (rv != 0))
+ return decap_not_found;
+
+ /* mcast traffic does not update the cache */
+ *stats_sw_if_index = mdi.sw_if_index;
+ vxlan_decap_info_t di = {.as_u64 = key4.value };
+ return di;
}
typedef vxlan6_tunnel_key_t last_tunnel_cache6;
-always_inline vxlan_tunnel_t *
+always_inline vxlan_decap_info_t
vxlan6_find_tunnel (vxlan_main_t * vxm, last_tunnel_cache6 * cache,
u32 fib_index, ip6_header_t * ip6_0,
- vxlan_header_t * vxlan0, vxlan_tunnel_t ** stats_t0)
+ vxlan_header_t * vxlan0, u32 * stats_sw_if_index)
{
+ if (PREDICT_FALSE (vxlan0->flags != VXLAN_FLAGS_I))
+ return decap_bad_flags;
+
/* Make sure VXLAN tunnel exist according to packet SIP and VNI */
vxlan6_tunnel_key_t key6 = {
- .key = {
- [0] = ip6_0->src_address.as_u64[0],
- [1] = ip6_0->src_address.as_u64[1],
- [2] = (((u64) fib_index) << 32) | vxlan0->vni_reserved,
- }
+ .key[0] = ip6_0->src_address.as_u64[0],
+ .key[1] = ip6_0->src_address.as_u64[1],
+ .key[2] = (((u64) fib_index) << 32) | vxlan0->vni_reserved,
};
if (PREDICT_FALSE
@@ -137,10 +154,7 @@ vxlan6_find_tunnel (vxlan_main_t * vxm, last_tunnel_cache6 * cache,
int rv =
clib_bihash_search_inline_24_8 (&vxm->vxlan6_tunnel_by_key, &key6);
if (PREDICT_FALSE (rv != 0))
- {
- *stats_t0 = 0;
- return 0;
- }
+ return decap_not_found;
*cache = key6;
}
@@ -148,15 +162,12 @@ vxlan6_find_tunnel (vxlan_main_t * vxm, last_tunnel_cache6 * cache,
/* Validate VXLAN tunnel SIP against packet DIP */
if (PREDICT_TRUE (ip6_address_is_equal (&ip6_0->dst_address, &t0->src.ip6)))
- *stats_t0 = t0;
+ *stats_sw_if_index = t0->sw_if_index;
else
{
/* try multicast */
if (PREDICT_TRUE (!ip6_address_is_multicast (&ip6_0->dst_address)))
- {
- *stats_t0 = 0;
- return 0;
- }
+ return decap_not_found;
/* Make sure mcast VXLAN tunnel exist by packet DIP and VNI */
key6.key[0] = ip6_0->dst_address.as_u64[0];
@@ -164,15 +175,17 @@ vxlan6_find_tunnel (vxlan_main_t * vxm, last_tunnel_cache6 * cache,
int rv =
clib_bihash_search_inline_24_8 (&vxm->vxlan6_tunnel_by_key, &key6);
if (PREDICT_FALSE (rv != 0))
- {
- *stats_t0 = 0;
- return 0;
- }
+ return decap_not_found;
- *stats_t0 = pool_elt_at_index (vxm->tunnels, key6.value);
+ vxlan_tunnel_t *mcast_t0 = pool_elt_at_index (vxm->tunnels, key6.value);
+ *stats_sw_if_index = mcast_t0->sw_if_index;
}
- return t0;
+ vxlan_decap_info_t di = {
+ .sw_if_index = t0->sw_if_index,
+ .next_index = t0->decap_next_index,
+ };
+ return di;
}
always_inline uword
@@ -185,8 +198,6 @@ vxlan_input (vlib_main_t * vm,
vnet_interface_main_t *im = &vnm->interface_main;
vlib_combined_counter_main_t *rx_counter =
im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX;
- vlib_combined_counter_main_t *drop_counter =
- im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_DROP;
last_tunnel_cache4 last4;
last_tunnel_cache6 last6;
u32 pkts_dropped = 0;
@@ -203,6 +214,7 @@ vxlan_input (vlib_main_t * vm,
vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b = bufs;
vlib_get_buffers (vm, from, bufs, n_left_from);
+ u32 stats_if0 = ~0, stats_if1 = ~0;
u16 nexts[VLIB_FRAME_SIZE], *next = nexts;
while (n_left_from >= 4)
{
@@ -216,8 +228,6 @@ vxlan_input (vlib_main_t * vm,
vxlan_header_t *vxlan0 = cur0;
vxlan_header_t *vxlan1 = cur1;
- u8 error0 = vxlan0->flags != VXLAN_FLAGS_I ? VXLAN_ERROR_BAD_FLAGS : 0;
- u8 error1 = vxlan1->flags != VXLAN_FLAGS_I ? VXLAN_ERROR_BAD_FLAGS : 0;
ip4_header_t *ip4_0, *ip4_1;
ip6_header_t *ip6_0, *ip6_1;
@@ -239,25 +249,12 @@ vxlan_input (vlib_main_t * vm,
u32 fi0 = buf_fib_index (b[0], is_ip4);
u32 fi1 = buf_fib_index (b[1], is_ip4);
- vxlan_tunnel_t *t0, *stats_t0;
- vxlan_tunnel_t *t1, *stats_t1;
- if (is_ip4)
- {
- t0 =
- vxlan4_find_tunnel (vxm, &last4, fi0, ip4_0, vxlan0, &stats_t0);
- t1 =
- vxlan4_find_tunnel (vxm, &last4, fi1, ip4_1, vxlan1, &stats_t1);
- }
- else
- {
- t0 =
- vxlan6_find_tunnel (vxm, &last6, fi0, ip6_0, vxlan0, &stats_t0);
- t1 =
- vxlan6_find_tunnel (vxm, &last6, fi1, ip6_1, vxlan1, &stats_t1);
- }
-
- error0 = t0 == 0 ? VXLAN_ERROR_NO_SUCH_TUNNEL : error0;
- error1 = t1 == 0 ? VXLAN_ERROR_NO_SUCH_TUNNEL : error1;
+ vxlan_decap_info_t di0 = is_ip4 ?
+ vxlan4_find_tunnel (vxm, &last4, fi0, ip4_0, vxlan0, &stats_if0) :
+ vxlan6_find_tunnel (vxm, &last6, fi0, ip6_0, vxlan0, &stats_if0);
+ vxlan_decap_info_t di1 = is_ip4 ?
+ vxlan4_find_tunnel (vxm, &last4, fi1, ip4_1, vxlan1, &stats_if1) :
+ vxlan6_find_tunnel (vxm, &last6, fi1, ip6_1, vxlan1, &stats_if1);
/* Prefetch next iteration. */
CLIB_PREFETCH (b[2]->data, CLIB_CACHE_LINE_BYTES, LOAD);
@@ -266,59 +263,50 @@ vxlan_input (vlib_main_t * vm,
u32 len0 = vlib_buffer_length_in_chain (vm, b[0]);
u32 len1 = vlib_buffer_length_in_chain (vm, b[1]);
- /* Validate VXLAN tunnel encap-fib index against packet */
- if (PREDICT_FALSE (error0 != 0))
- {
- next[0] = VXLAN_INPUT_NEXT_DROP;
+ next[0] = di0.next_index;
+ next[1] = di1.next_index;
- if (error0 == VXLAN_ERROR_BAD_FLAGS)
- {
- vlib_increment_combined_counter
- (drop_counter, thread_index, stats_t0->sw_if_index, 1, len0);
- }
- b[0]->error = node->errors[error0];
- pkts_dropped++;
- }
- else
+ u8 any_error = di0.error | di1.error;
+ if (PREDICT_TRUE (any_error == 0))
{
- next[0] = t0->decap_next_index;
-
/* Required to make the l2 tag push / pop code work on l2 subifs */
- if (PREDICT_TRUE (next[0] == VXLAN_INPUT_NEXT_L2_INPUT))
- vnet_update_l2_len (b[0]);
-
+ vnet_update_l2_len (b[0]);
+ vnet_update_l2_len (b[1]);
/* Set packet input sw_if_index to unicast VXLAN tunnel for learning */
- vnet_buffer (b[0])->sw_if_index[VLIB_RX] = t0->sw_if_index;
- vlib_increment_combined_counter
- (rx_counter, thread_index, stats_t0->sw_if_index, 1, len0);
+ vnet_buffer (b[0])->sw_if_index[VLIB_RX] = di0.sw_if_index;
+ vnet_buffer (b[1])->sw_if_index[VLIB_RX] = di1.sw_if_index;
+ vlib_increment_combined_counter (rx_counter, thread_index,
+ stats_if0, 1, len0);
+ vlib_increment_combined_counter (rx_counter, thread_index,
+ stats_if1, 1, len1);
}
-
- /* Validate VXLAN tunnel encap-fib index against packet */
- if (PREDICT_FALSE (error1 != 0))
+ else
{
- next[1] = VXLAN_INPUT_NEXT_DROP;
-
- if (error1 == VXLAN_ERROR_BAD_FLAGS)
+ if (di0.error == 0)
{
- vlib_increment_combined_counter
- (drop_counter, thread_index, stats_t1->sw_if_index, 1, len1);
+ vnet_update_l2_len (b[0]);
+ vnet_buffer (b[0])->sw_if_index[VLIB_RX] = di0.sw_if_index;
+ vlib_increment_combined_counter (rx_counter, thread_index,
+ stats_if0, 1, len0);
+ }
+ else
+ {
+ b[0]->error = node->errors[di0.error];
+ pkts_dropped++;
}
- b[1]->error = node->errors[error1];
- pkts_dropped++;
- }
- else
- {
- next[1] = t1->decap_next_index;
-
- /* Required to make the l2 tag push / pop code work on l2 subifs */
- if (PREDICT_TRUE (next[1] == VXLAN_INPUT_NEXT_L2_INPUT))
- vnet_update_l2_len (b[1]);
-
- /* Set packet input sw_if_index to unicast VXLAN tunnel for learning */
- vnet_buffer (b[1])->sw_if_index[VLIB_RX] = t1->sw_if_index;
- vlib_increment_combined_counter
- (rx_counter, thread_index, stats_t1->sw_if_index, 1, len1);
+ if (di1.error == 0)
+ {
+ vnet_update_l2_len (b[1]);
+ vnet_buffer (b[1])->sw_if_index[VLIB_RX] = di1.sw_if_index;
+ vlib_increment_combined_counter (rx_counter, thread_index,
+ stats_if1, 1, len1);
+ }
+ else
+ {
+ b[1]->error = node->errors[di1.error];
+ pkts_dropped++;
+ }
}
if (PREDICT_FALSE (b[0]->flags & VLIB_BUFFER_IS_TRACED))
@@ -326,8 +314,9 @@ vxlan_input (vlib_main_t * vm,
vxlan_rx_trace_t *tr =
vlib_add_trace (vm, node, b[0], sizeof (*tr));
tr->next_index = next[0];
- tr->error = error0;
- tr->tunnel_index = t0 == 0 ? ~0 : t0 - vxm->tunnels;
+ tr->error = di0.error;
+ tr->tunnel_index = di0.sw_if_index == ~0 ?
+ ~0 : vxm->tunnel_index_by_sw_if_index[di0.sw_if_index];
tr->vni = vnet_get_vni (vxlan0);
}
if (PREDICT_FALSE (b[1]->flags & VLIB_BUFFER_IS_TRACED))
@@ -335,8 +324,9 @@ vxlan_input (vlib_main_t * vm,
vxlan_rx_trace_t *tr =
vlib_add_trace (vm, node, b[1], sizeof (*tr));
tr->next_index = next[1];
- tr->error = error1;
- tr->tunnel_index = t1 == 0 ? ~0 : t1 - vxm->tunnels;
+ tr->error = di1.error;
+ tr->tunnel_index = di1.sw_if_index == ~0 ?
+ ~0 : vxm->tunnel_index_by_sw_if_index[di1.sw_if_index];
tr->vni = vnet_get_vni (vxlan1);
}
b += 2;
@@ -349,7 +339,6 @@ vxlan_input (vlib_main_t * vm,
/* udp leaves current_data pointing at the vxlan header */
void *cur0 = vlib_buffer_get_current (b[0]);
vxlan_header_t *vxlan0 = cur0;
- u8 error0 = vxlan0->flags != VXLAN_FLAGS_I ? VXLAN_ERROR_BAD_FLAGS : 0;
ip4_header_t *ip4_0;
ip6_header_t *ip6_0;
if (is_ip4)
@@ -362,41 +351,30 @@ vxlan_input (vlib_main_t * vm,
u32 fi0 = buf_fib_index (b[0], is_ip4);
- vxlan_tunnel_t *t0, *stats_t0;
- if (is_ip4)
- t0 = vxlan4_find_tunnel (vxm, &last4, fi0, ip4_0, vxlan0, &stats_t0);
- else
- t0 = vxlan6_find_tunnel (vxm, &last6, fi0, ip6_0, vxlan0, &stats_t0);
+ vxlan_decap_info_t di0 = is_ip4 ?
+ vxlan4_find_tunnel (vxm, &last4, fi0, ip4_0, vxlan0, &stats_if0) :
+ vxlan6_find_tunnel (vxm, &last6, fi0, ip6_0, vxlan0, &stats_if0);
- error0 = t0 == 0 ? VXLAN_ERROR_NO_SUCH_TUNNEL : error0;
uword len0 = vlib_buffer_length_in_chain (vm, b[0]);
- /* Validate VXLAN tunnel encap-fib index against packet */
- if (PREDICT_FALSE (error0 != 0))
- {
- next[0] = VXLAN_INPUT_NEXT_DROP;
+ next[0] = di0.next_index;
- if (error0 == VXLAN_ERROR_BAD_FLAGS)
- {
- vlib_increment_combined_counter
- (drop_counter, thread_index, stats_t0->sw_if_index, 1, len0);
- }
- b[0]->error = node->errors[error0];
- pkts_dropped++;
- }
- else
+ /* Validate VXLAN tunnel encap-fib index against packet */
+ if (di0.error == 0)
{
- next[0] = t0->decap_next_index;
-
/* Required to make the l2 tag push / pop code work on l2 subifs */
- if (PREDICT_TRUE (next[0] == VXLAN_INPUT_NEXT_L2_INPUT))
- vnet_update_l2_len (b[0]);
+ vnet_update_l2_len (b[0]);
/* Set packet input sw_if_index to unicast VXLAN tunnel for learning */
- vnet_buffer (b[0])->sw_if_index[VLIB_RX] = t0->sw_if_index;
+ vnet_buffer (b[0])->sw_if_index[VLIB_RX] = di0.sw_if_index;
- vlib_increment_combined_counter
- (rx_counter, thread_index, stats_t0->sw_if_index, 1, len0);
+ vlib_increment_combined_counter (rx_counter, thread_index,
+ stats_if0, 1, len0);
+ }
+ else
+ {
+ b[0]->error = node->errors[di0.error];
+ pkts_dropped++;
}
if (PREDICT_FALSE (b[0]->flags & VLIB_BUFFER_IS_TRACED))
@@ -404,8 +382,9 @@ vxlan_input (vlib_main_t * vm,
vxlan_rx_trace_t *tr
= vlib_add_trace (vm, node, b[0], sizeof (*tr));
tr->next_index = next[0];
- tr->error = error0;
- tr->tunnel_index = t0 == 0 ? ~0 : t0 - vxm->tunnels;
+ tr->error = di0.error;
+ tr->tunnel_index = di0.sw_if_index == ~0 ?
+ ~0 : vxm->tunnel_index_by_sw_if_index[di0.sw_if_index];
tr->vni = vnet_get_vni (vxlan0);
}
b += 1;
diff --git a/src/vnet/vxlan/vxlan.c b/src/vnet/vxlan/vxlan.c
index 0d5337ea146..93a4e263579 100644
--- a/src/vnet/vxlan/vxlan.c
+++ b/src/vnet/vxlan/vxlan.c
@@ -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,6 +445,18 @@ int vnet_vxlan_add_del_tunnel
t->user_instance = user_instance; /* name */
t->flow_index = ~0;
+ t->hw_if_index = vnet_register_interface
+ (vnm, vxlan_device_class.index, dev_instance,
+ vxlan_hw_class.index, dev_instance);
+ vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, t->hw_if_index);
+
+ /* Set vxlan tunnel output node */
+ u32 encap_index = !is_ip6 ?
+ vxlan4_encap_node.index : vxlan6_encap_node.index;
+ vnet_set_interface_output_node (vnm, t->hw_if_index, encap_index);
+
+ t->sw_if_index = sw_if_index = hi->sw_if_index;
+
/* copy the key */
int add_failed;
if (is_ip6)
@@ -452,29 +467,24 @@ int vnet_vxlan_add_del_tunnel
}
else
{
- key4.value = (u64) dev_instance;
+ 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;
}
- t->hw_if_index = vnet_register_interface
- (vnm, vxlan_device_class.index, dev_instance,
- vxlan_hw_class.index, dev_instance);
- vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, t->hw_if_index);
-
- /* Set vxlan tunnel output node */
- u32 encap_index = !is_ip6 ?
- vxlan4_encap_node.index : vxlan6_encap_node.index;
- vnet_set_interface_output_node (vnm, t->hw_if_index, encap_index);
-
- t->sw_if_index = sw_if_index = hi->sw_if_index;
-
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 */ );
diff --git a/src/vnet/vxlan/vxlan.h b/src/vnet/vxlan/vxlan.h
index 7399b19e387..73052278a48 100644
--- a/src/vnet/vxlan/vxlan.h
+++ b/src/vnet/vxlan/vxlan.h
@@ -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 */