u8 * format_vxlan_tunnel (u8 * s, va_list * args)
{
vxlan_tunnel_t * t = va_arg (*args, vxlan_tunnel_t *);
- vxlan_main_t * ngm = &vxlan_main;
- s = format (s, "[%d] src %U dst %U vni %d fib-idx %d sw-if-idx %d ",
- t - ngm->tunnels,
+ s = format (s,
+ "[%d] instance %d src %U dst %U vni %d fib-idx %d sw-if-idx %d ",
+ t->dev_instance, t->user_instance,
format_ip46_address, &t->src, IP46_TYPE_ANY,
format_ip46_address, &t->dst, IP46_TYPE_ANY,
t->vni, t->encap_fib_index, t->sw_if_index);
static u8 * format_vxlan_name (u8 * s, va_list * args)
{
u32 dev_instance = va_arg (*args, u32);
- return format (s, "vxlan_tunnel%d", dev_instance);
+ vxlan_main_t * vxm = &vxlan_main;
+ vxlan_tunnel_t *t;
+
+ if (dev_instance == ~0)
+ return format(s, "<cached-unused>");
+
+ if (dev_instance >= vec_len(vxm->tunnels))
+ return format(s, "<improperly-referenced>");
+
+ t = pool_elt_at_index(vxm->tunnels, dev_instance);
+
+ return format (s, "vxlan_tunnel%d", t->user_instance);
}
static clib_error_t *
static void
vxlan_tunnel_restack_dpo(vxlan_tunnel_t * t)
{
- dpo_id_t dpo = DPO_INVALID;
- u32 encap_index = ip46_address_is_ip4(&t->dst) ?
- vxlan4_encap_node.index : vxlan6_encap_node.index;
- fib_forward_chain_type_t forw_type = ip46_address_is_ip4(&t->dst) ?
- FIB_FORW_CHAIN_TYPE_UNICAST_IP4 : FIB_FORW_CHAIN_TYPE_UNICAST_IP6;
-
- fib_entry_contribute_forwarding (t->fib_entry_index, forw_type, &dpo);
- dpo_stack_from_node (encap_index, &t->next_dpo, &dpo);
- dpo_reset(&dpo);
+ u8 is_ip4 = ip46_address_is_ip4(&t->dst);
+ dpo_id_t dpo = DPO_INVALID;
+ fib_forward_chain_type_t forw_type = is_ip4 ?
+ FIB_FORW_CHAIN_TYPE_UNICAST_IP4 : FIB_FORW_CHAIN_TYPE_UNICAST_IP6;
+
+ fib_entry_contribute_forwarding (t->fib_entry_index, forw_type, &dpo);
+
+ /* vxlan uses the payload hash as the udp source port
+ * hence the packet's hash is unknown
+ * skip single bucket load balance dpo's */
+ while (DPO_LOAD_BALANCE == dpo.dpoi_type)
+ {
+ load_balance_t *lb = load_balance_get (dpo.dpoi_index);
+ if (lb->lb_n_buckets > 1)
+ break;
+
+ dpo_copy (&dpo, load_balance_get_bucket_i (lb, 0));
+ }
+
+ u32 encap_index = is_ip4 ?
+ vxlan4_encap_node.index : vxlan6_encap_node.index;
+ dpo_stack_from_node (encap_index, &t->next_dpo, &dpo);
+ dpo_reset(&dpo);
}
static vxlan_tunnel_t *
_(src) \
_(dst)
-static int
+static void
vxlan_rewrite (vxlan_tunnel_t * t, bool is_ip6)
{
union {
vnet_set_vni_and_flags(vxlan, t->vni);
t->rewrite = r.rw;
- return (0);
}
static bool
vxlan_tunnel_t *t = 0;
vnet_main_t * vnm = vxm->vnet_main;
uword * p;
- u32 hw_if_index = ~0;
u32 sw_if_index = ~0;
- int rv;
vxlan4_tunnel_key_t key4;
vxlan6_tunnel_key_t key6;
u32 is_ip6 = a->is_ip6;
key6.vni = clib_host_to_net_u32 (a->vni << 8);
p = hash_get_mem (vxm->vxlan6_tunnel_by_key, &key6);
}
-
+
if (a->is_add)
{
l2input_main_t * l2im = &l2input_main;
+ u32 dev_instance; /* real dev instance tunnel index */
+ u32 user_instance; /* request and actual instance number */
/* adding a tunnel: tunnel must not already exist */
if (p)
return VNET_API_ERROR_INVALID_DECAP_NEXT;
pool_get_aligned (vxm->tunnels, t, CLIB_CACHE_LINE_BYTES);
- memset (t, 0, sizeof (*t));
-
+ *t = (vxlan_tunnel_t){ 0 };
+ dev_instance = t - vxm->tunnels;
+
/* copy from arg structure */
#define _(x) t->x = a->x;
foreach_copy_field;
#undef _
- rv = vxlan_rewrite (t, is_ip6);
- if (rv)
- {
- pool_put (vxm->tunnels, t);
- return rv;
- }
+ vxlan_rewrite (t, is_ip6);
+ /*
+ * Reconcile the real dev_instance and a possible requested instance.
+ */
+ user_instance = a->instance;
+ if (user_instance == ~0)
+ user_instance = dev_instance;
+ if (hash_get (vxm->instance_used, user_instance))
+ {
+ pool_put (vxm->tunnels, t);
+ return VNET_API_ERROR_INSTANCE_IN_USE;
+ }
+ hash_set (vxm->instance_used, user_instance, 1);
+
+ t->dev_instance = dev_instance; /* actual */
+ t->user_instance = user_instance; /* name */
/* copy the key */
if (is_ip6)
- hash_set_mem_alloc (&vxm->vxlan6_tunnel_by_key, &key6,
- t - vxm->tunnels);
+ hash_set_mem_alloc (&vxm->vxlan6_tunnel_by_key, &key6, dev_instance);
else
- hash_set (vxm->vxlan4_tunnel_by_key, key4.as_u64, t - vxm->tunnels);
+ hash_set (vxm->vxlan4_tunnel_by_key, key4.as_u64, dev_instance);
- vnet_hw_interface_t * hi;
- if (vec_len (vxm->free_vxlan_tunnel_hw_if_indices) > 0)
- {
- vnet_interface_main_t * im = &vnm->interface_main;
- hw_if_index = vxm->free_vxlan_tunnel_hw_if_indices
- [vec_len (vxm->free_vxlan_tunnel_hw_if_indices)-1];
- _vec_len (vxm->free_vxlan_tunnel_hw_if_indices) -= 1;
-
- hi = vnet_get_hw_interface (vnm, hw_if_index);
- hi->dev_instance = t - vxm->tunnels;
- hi->hw_instance = hi->dev_instance;
-
- /* clear old stats of freed tunnel before reuse */
- sw_if_index = hi->sw_if_index;
- vnet_interface_counter_lock(im);
- vlib_zero_combined_counter
- (&im->combined_sw_if_counters[VNET_INTERFACE_COUNTER_TX], sw_if_index);
- vlib_zero_combined_counter
- (&im->combined_sw_if_counters[VNET_INTERFACE_COUNTER_RX], sw_if_index);
- vlib_zero_simple_counter
- (&im->sw_if_counters[VNET_INTERFACE_COUNTER_DROP], sw_if_index);
- vnet_interface_counter_unlock(im);
- }
- else
- {
- hw_if_index = vnet_register_interface
- (vnm, vxlan_device_class.index, t - vxm->tunnels,
- vxlan_hw_class.index, t - vxm->tunnels);
- hi = vnet_get_hw_interface (vnm, hw_if_index);
- }
+ 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, hw_if_index, encap_index);
+ vnet_set_interface_output_node (vnm, t->hw_if_index, encap_index);
- t->hw_if_index = hw_if_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] = t - vxm->tunnels;
+ vxm->tunnel_index_by_sw_if_index[sw_if_index] = dev_instance;
/* setup l2 input config with l2 feature and bd 0 to drop packet */
vec_validate (l2im->configs, sw_if_index);
(t->encap_fib_index, &tun_dst_pfx, FIB_SOURCE_RR,
FIB_ENTRY_FLAG_NONE);
t->sibling_index = fib_entry_child_add
- (t->fib_entry_index, FIB_NODE_TYPE_VXLAN_TUNNEL, t - vxm->tunnels);
+ (t->fib_entry_index, FIB_NODE_TYPE_VXLAN_TUNNEL, dev_instance);
vxlan_tunnel_restack_dpo(t);
}
else
if (!p)
return VNET_API_ERROR_NO_SUCH_ENTRY;
- t = pool_elt_at_index (vxm->tunnels, p[0]);
+ u32 instance = p[0];
+ t = pool_elt_at_index (vxm->tunnels, instance);
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);
+ vnet_sw_interface_set_flags (vnm, sw_if_index, 0 /* down */);
- vxm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0;
+ vxm->tunnel_index_by_sw_if_index[sw_if_index] = ~0;
if (!is_ip6)
hash_unset (vxm->vxlan4_tunnel_by_key, key4.as_u64);
mcast_shared_remove(&t->dst);
}
+ vnet_delete_hw_interface (vnm, t->hw_if_index);
+ hash_unset (vxm->instance_used, t->user_instance);
+
fib_node_deinit(&t->node);
vec_free (t->rewrite);
pool_put (vxm->tunnels, t);
vlib_cli_command_t * cmd)
{
unformat_input_t _line_input, * line_input = &_line_input;
- ip46_address_t src , dst;
+ ip46_address_t src = ip46_address_initializer, dst = ip46_address_initializer;
u8 is_add = 1;
u8 src_set = 0;
u8 dst_set = 0;
u8 grp_set = 0;
u8 ipv4_set = 0;
u8 ipv6_set = 0;
+ u32 instance = ~0;
u32 encap_fib_index = 0;
u32 mcast_sw_if_index = ~0;
u32 decap_next_index = VXLAN_INPUT_NEXT_L2_INPUT;
u32 vni = 0;
- u32 tmp;
- int rv;
- vnet_vxlan_add_del_tunnel_args_t _a, * a = &_a;
- u32 tunnel_sw_if_index;
+ u32 table_id;
clib_error_t *error = NULL;
- /* Cant "universally zero init" (={0}) due to GCC bug 53119 */
- memset(&src, 0, sizeof src);
- memset(&dst, 0, sizeof dst);
-
/* Get a line of input. */
if (! unformat_user (input, unformat_line_input, line_input))
return 0;
{
is_add = 0;
}
+ else if (unformat (line_input, "instance %d", &instance))
+ ;
else if (unformat (line_input, "src %U",
- unformat_ip4_address, &src.ip4))
+ unformat_ip46_address, &src, IP46_TYPE_ANY))
{
src_set = 1;
- ipv4_set = 1;
+ ip46_address_is_ip4(&src) ? (ipv4_set = 1) : (ipv6_set = 1);
}
else if (unformat (line_input, "dst %U",
- unformat_ip4_address, &dst.ip4))
+ unformat_ip46_address, &dst, IP46_TYPE_ANY))
{
dst_set = 1;
- ipv4_set = 1;
- }
- else if (unformat (line_input, "src %U",
- unformat_ip6_address, &src.ip6))
- {
- src_set = 1;
- ipv6_set = 1;
- }
- else if (unformat (line_input, "dst %U",
- unformat_ip6_address, &dst.ip6))
- {
- dst_set = 1;
- ipv6_set = 1;
+ ip46_address_is_ip4(&dst) ? (ipv4_set = 1) : (ipv6_set = 1);
}
else if (unformat (line_input, "group %U %U",
- unformat_ip4_address, &dst.ip4,
+ unformat_ip46_address, &dst, IP46_TYPE_ANY,
unformat_vnet_sw_interface,
vnet_get_main(), &mcast_sw_if_index))
{
grp_set = dst_set = 1;
- ipv4_set = 1;
+ ip46_address_is_ip4(&dst) ? (ipv4_set = 1) : (ipv6_set = 1);
}
- else if (unformat (line_input, "group %U %U",
- unformat_ip6_address, &dst.ip6,
- unformat_vnet_sw_interface,
- vnet_get_main(), &mcast_sw_if_index))
+ else if (unformat (line_input, "encap-vrf-id %d", &table_id))
{
- grp_set = dst_set = 1;
- ipv6_set = 1;
- }
- else if (unformat (line_input, "encap-vrf-id %d", &tmp))
- {
- encap_fib_index = fib_table_find (fib_ip_proto (ipv6_set), tmp);
+ encap_fib_index = fib_table_find (fib_ip_proto (ipv6_set), table_id);
if (encap_fib_index == ~0)
{
- error = clib_error_return (0, "nonexistent encap-vrf-id %d", tmp);
- goto done;
+ error = clib_error_return (0, "nonexistent encap-vrf-id %d", table_id);
+ break;
}
}
else if (unformat (line_input, "decap-next %U", unformat_decap_next,
&decap_next_index, ipv4_set))
;
else if (unformat (line_input, "vni %d", &vni))
- {
- if (vni >> 24)
- {
- error = clib_error_return (0, "vni %d out of range", vni);
- goto done;
- }
- }
+ ;
else
{
error = clib_error_return (0, "parse error: '%U'",
format_unformat_error, line_input);
- goto done;
+ break;
}
}
+ unformat_free (line_input);
+
+ if (error)
+ return error;
+
if (src_set == 0)
- {
- error = clib_error_return (0, "tunnel src address not specified");
- goto done;
- }
+ return clib_error_return (0, "tunnel src address not specified");
if (dst_set == 0)
- {
- error = clib_error_return (0, "tunnel dst address not specified");
- goto done;
- }
+ return clib_error_return (0, "tunnel dst address not specified");
if (grp_set && !ip46_address_is_multicast(&dst))
- {
- error = clib_error_return (0, "tunnel group address not multicast");
- goto done;
- }
+ return clib_error_return (0, "tunnel group address not multicast");
if (grp_set == 0 && ip46_address_is_multicast(&dst))
- {
- error = clib_error_return (0, "dst address must be unicast");
- goto done;
- }
+ return clib_error_return (0, "dst address must be unicast");
if (grp_set && mcast_sw_if_index == ~0)
- {
- error = clib_error_return (0, "tunnel nonexistent multicast device");
- goto done;
- }
+ return clib_error_return (0, "tunnel nonexistent multicast device");
if (ipv4_set && ipv6_set)
- {
- error = clib_error_return (0, "both IPv4 and IPv6 addresses specified");
- goto done;
- }
+ return clib_error_return (0, "both IPv4 and IPv6 addresses specified");
if (ip46_address_cmp(&src, &dst) == 0)
- {
- error = clib_error_return (0, "src and dst addresses are identical");
- goto done;
- }
+ return clib_error_return (0, "src and dst addresses are identical");
if (decap_next_index == ~0)
- {
- error = clib_error_return (0, "next node not found");
- goto done;
- }
+ return clib_error_return (0, "next node not found");
if (vni == 0)
- {
- error = clib_error_return (0, "vni not specified");
- goto done;
- }
+ return clib_error_return (0, "vni not specified");
- memset (a, 0, sizeof (*a));
+ if (vni >> 24)
+ return clib_error_return (0, "vni %d out of range", vni);
- a->is_add = is_add;
- a->is_ip6 = ipv6_set;
-
-#define _(x) a->x = x;
- foreach_copy_field;
+ vnet_vxlan_add_del_tunnel_args_t a = {
+ .is_add = is_add,
+ .is_ip6 = ipv6_set,
+ .instance = instance,
+#define _(x) .x = x,
+ foreach_copy_field
#undef _
-
- rv = vnet_vxlan_add_del_tunnel (a, &tunnel_sw_if_index);
+ };
+
+ u32 tunnel_sw_if_index;
+ int rv = vnet_vxlan_add_del_tunnel (&a, &tunnel_sw_if_index);
switch(rv)
{
break;
case VNET_API_ERROR_TUNNEL_EXIST:
- error = clib_error_return (0, "tunnel already exists...");
- goto done;
+ return clib_error_return (0, "tunnel already exists...");
case VNET_API_ERROR_NO_SUCH_ENTRY:
- error = clib_error_return (0, "tunnel does not exist...");
- goto done;
+ return clib_error_return (0, "tunnel does not exist...");
+
+ case VNET_API_ERROR_INSTANCE_IN_USE:
+ return clib_error_return (0, "Instance is in use");
default:
- error = clib_error_return
+ return clib_error_return
(0, "vnet_vxlan_add_del_tunnel returned %d", rv);
- goto done;
}
-done:
- unformat_free (line_input);
-
return error;
}
* @cliexpar
* Example of how to create a VXLAN Tunnel:
* @cliexcmd{create vxlan tunnel src 10.0.3.1 dst 10.0.3.3 vni 13 encap-vrf-id 7}
+ * Example of how to create a VXLAN Tunnel with a known name, vxlan_tunnel42:
+ * @cliexcmd{create vxlan tunnel src 10.0.3.1 dst 10.0.3.3 instance 42}
* Example of how to delete a VXLAN Tunnel:
* @cliexcmd{create vxlan tunnel src 10.0.3.1 dst 10.0.3.3 vni 13 del}
?*/
.short_help =
"create vxlan tunnel src <local-vtep-addr>"
" {dst <remote-vtep-addr>|group <mcast-vtep-addr> <intf-name>} vni <nn>"
+ " [instance <id>]"
" [encap-vrf-id <nn>] [decap-next [l2|node <name>]] [del]",
.function = vxlan_add_del_tunnel_command_fn,
};
}
VLIB_INIT_FUNCTION(vxlan_init);
+
+/*
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
Code Review / vpp.git / blobdiff