X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fgre%2Finterface.c;h=6be934af56c0fd14cb5f6db4db103d1ed609a54b;hb=b7b929931a07fbb27b43d5cd105f366c3e29807e;hp=c17d22e9ee0dac963c5a90b662b272ae88eab97c;hpb=9ff647a995ba43dcee898c1904d9ec8298b069c8;p=vpp.git diff --git a/src/vnet/gre/interface.c b/src/vnet/gre/interface.c index c17d22e9ee0..6be934af56c 100644 --- a/src/vnet/gre/interface.c +++ b/src/vnet/gre/interface.c @@ -24,70 +24,50 @@ #include #include #include +#include static const char *gre_tunnel_type_names[] = GRE_TUNNEL_TYPE_NAMES; -static inline u64 -gre4_mk_key (const ip4_address_t * src, - const ip4_address_t * dst, u32 out_fib_index) -{ - // FIXME. the fib index should be part of the key - return ((u64) src->as_u32 << 32 | (u64) dst->as_u32); -} - -static u8 * -format_gre_tunnel_type (u8 * s, va_list * args) -{ - gre_tunnel_type_t type = va_arg (*args, gre_tunnel_type_t); - - return (format (s, "%s", gre_tunnel_type_names[type])); -} - static u8 * format_gre_tunnel (u8 * s, va_list * args) { gre_tunnel_t *t = va_arg (*args, gre_tunnel_t *); - gre_main_t *gm = &gre_main; - u8 is_ipv6 = t->tunnel_dst.fp_proto == FIB_PROTOCOL_IP6 ? 1 : 0; - if (!is_ipv6) - s = format (s, - "[%d] %U (src) %U (dst) payload %U outer_fib_index %d", - t - gm->tunnels, - format_ip4_address, &t->tunnel_src.ip4, - format_ip4_address, &t->tunnel_dst.fp_addr.ip4, - format_gre_tunnel_type, t->type, t->outer_fib_index); - else - s = format (s, - "[%d] %U (src) %U (dst) payload %U outer_fib_index %d", - t - gm->tunnels, - format_ip6_address, &t->tunnel_src.ip6, - format_ip6_address, &t->tunnel_dst.fp_addr.ip6, - format_gre_tunnel_type, t->type, t->outer_fib_index); + s = format (s, "[%d] instance %d src %U dst %U fib-idx %d sw-if-idx %d ", + t->dev_instance, t->user_instance, + format_ip46_address, &t->tunnel_src, IP46_TYPE_ANY, + format_ip46_address, &t->tunnel_dst.fp_addr, IP46_TYPE_ANY, + t->outer_fib_index, t->sw_if_index); + + s = format (s, "payload %s ", gre_tunnel_type_names[t->type]); + + if (t->type == GRE_TUNNEL_TYPE_ERSPAN) + s = format (s, "session %d ", t->session_id); + + if (t->type != GRE_TUNNEL_TYPE_L3) + s = format (s, "l2-adj-idx %d ", t->l2_adj_index); return s; } static gre_tunnel_t * -gre_tunnel_db_find (const ip46_address_t * src, - const ip46_address_t * dst, u32 out_fib_index, u8 is_ipv6) +gre_tunnel_db_find (const vnet_gre_add_del_tunnel_args_t * a, + u32 outer_fib_index, gre_tunnel_key_t * key) { gre_main_t *gm = &gre_main; uword *p; - u64 key4, key6[4]; - if (!is_ipv6) + if (!a->is_ipv6) { - key4 = gre4_mk_key (&src->ip4, &dst->ip4, out_fib_index); - p = hash_get (gm->tunnel_by_key4, key4); + gre_mk_key4 (a->src.ip4, a->dst.ip4, outer_fib_index, + a->tunnel_type, a->session_id, &key->gtk_v4); + p = hash_get_mem (gm->tunnel_by_key4, &key->gtk_v4); } else { - key6[0] = src->ip6.as_u64[0]; - key6[1] = src->ip6.as_u64[1]; - key6[2] = dst->ip6.as_u64[0]; - key6[3] = dst->ip6.as_u64[1]; - p = hash_get_mem (gm->tunnel_by_key6, key6); + gre_mk_key6 (&a->src.ip6, &a->dst.ip6, outer_fib_index, + a->tunnel_type, a->session_id, &key->gtk_v6); + p = hash_get_mem (gm->tunnel_by_key6, &key->gtk_v6); } if (NULL == p) @@ -97,52 +77,39 @@ gre_tunnel_db_find (const ip46_address_t * src, } static void -gre_tunnel_db_add (const gre_tunnel_t * t) +gre_tunnel_db_add (gre_tunnel_t * t, gre_tunnel_key_t * key) { gre_main_t *gm = &gre_main; - u64 key4, key6[4], *key6_copy; - u8 is_ipv6 = t->tunnel_dst.fp_proto == FIB_PROTOCOL_IP6 ? 1 : 0; - if (!is_ipv6) + t->key = clib_mem_alloc (sizeof (*t->key)); + clib_memcpy (t->key, key, sizeof (*key)); + + if (t->tunnel_dst.fp_proto == FIB_PROTOCOL_IP6) { - key4 = gre4_mk_key (&t->tunnel_src.ip4, &t->tunnel_dst.fp_addr.ip4, - t->outer_fib_index); - hash_set (gm->tunnel_by_key4, key4, t - gm->tunnels); + hash_set_mem (gm->tunnel_by_key6, &t->key->gtk_v6, t->dev_instance); } else { - key6[0] = t->tunnel_src.ip6.as_u64[0]; - key6[1] = t->tunnel_src.ip6.as_u64[1]; - key6[2] = t->tunnel_dst.fp_addr.ip6.as_u64[0]; - key6[3] = t->tunnel_dst.fp_addr.ip6.as_u64[1]; - key6_copy = clib_mem_alloc (sizeof (key6)); - clib_memcpy (key6_copy, key6, sizeof (key6)); - hash_set_mem (gm->tunnel_by_key6, key6_copy, t - gm->tunnels); + hash_set_mem (gm->tunnel_by_key4, &t->key->gtk_v4, t->dev_instance); } } static void -gre_tunnel_db_remove (const gre_tunnel_t * t) +gre_tunnel_db_remove (gre_tunnel_t * t) { gre_main_t *gm = &gre_main; - u64 key4, key6[4]; - u8 is_ipv6 = t->tunnel_dst.fp_proto == FIB_PROTOCOL_IP6 ? 1 : 0; - if (!is_ipv6) + if (t->tunnel_dst.fp_proto == FIB_PROTOCOL_IP6) { - key4 = gre4_mk_key (&t->tunnel_src.ip4, &t->tunnel_dst.fp_addr.ip4, - t->outer_fib_index); - hash_unset (gm->tunnel_by_key4, key4); + hash_unset_mem (gm->tunnel_by_key6, &t->key->gtk_v6); } else { - key6[0] = t->tunnel_src.ip6.as_u64[0]; - key6[1] = t->tunnel_src.ip6.as_u64[1]; - key6[2] = t->tunnel_dst.fp_addr.ip6.as_u64[0]; - key6[3] = t->tunnel_dst.fp_addr.ip6.as_u64[1]; - hash_unset_mem (gm->tunnel_by_key6, key6); + hash_unset_mem (gm->tunnel_by_key4, &t->key->gtk_v4); } + clib_mem_free (t->key); + t->key = NULL; } static gre_tunnel_t * @@ -161,7 +128,9 @@ gre_tunnel_from_fib_node (fib_node_t * node) void gre_tunnel_stack (adj_index_t ai) { + fib_forward_chain_type_t fib_fwd; gre_main_t *gm = &gre_main; + dpo_id_t tmp = DPO_INVALID; ip_adjacency_t *adj; gre_tunnel_t *gt; u32 sw_if_index; @@ -169,30 +138,53 @@ gre_tunnel_stack (adj_index_t ai) adj = adj_get (ai); sw_if_index = adj->rewrite_header.sw_if_index; - if ((vec_len (gm->tunnel_index_by_sw_if_index) < sw_if_index) || + if ((vec_len (gm->tunnel_index_by_sw_if_index) <= sw_if_index) || (~0 == gm->tunnel_index_by_sw_if_index[sw_if_index])) return; gt = pool_elt_at_index (gm->tunnels, gm->tunnel_index_by_sw_if_index[sw_if_index]); - /* - * find the adjacency that is contributed by the FIB entry - * that this tunnel resovles via, and use it as the next adj - * in the midchain - */ - if (vnet_hw_interface_get_flags (vnet_get_main (), - gt->hw_if_index) & - VNET_HW_INTERFACE_FLAG_LINK_UP) + if ((vnet_hw_interface_get_flags (vnet_get_main (), gt->hw_if_index) & + VNET_HW_INTERFACE_FLAG_LINK_UP) == 0) { - adj_nbr_midchain_stack (ai, - fib_entry_contribute_ip_forwarding - (gt->fib_entry_index)); + adj_nbr_midchain_unstack (ai); + return; } - else + + fib_fwd = fib_forw_chain_type_from_fib_proto (gt->tunnel_dst.fp_proto); + + fib_entry_contribute_forwarding (gt->fib_entry_index, fib_fwd, &tmp); + if (DPO_LOAD_BALANCE == tmp.dpoi_type) { - adj_nbr_midchain_unstack (ai); + /* + * post GRE rewrite we will load-balance. However, the GRE encap + * is always the same for this adjacency/tunnel and hence the IP/GRE + * src,dst hash is always the same result too. So we do that hash now and + * stack on the choice. + * If the choice is an incomplete adj then we will need a poke when + * it becomes complete. This happens since the adj update walk propagates + * as far a recursive paths. + */ + const dpo_id_t *choice; + load_balance_t *lb; + int hash; + + lb = load_balance_get (tmp.dpoi_index); + + if (fib_fwd == FIB_FORW_CHAIN_TYPE_UNICAST_IP4) + hash = ip4_compute_flow_hash ((ip4_header_t *) adj_get_rewrite (ai), + lb->lb_hash_config); + else + hash = ip6_compute_flow_hash ((ip6_header_t *) adj_get_rewrite (ai), + lb->lb_hash_config); + choice = + load_balance_get_bucket_i (lb, hash & lb->lb_n_buckets_minus_1); + dpo_copy (&tmp, choice); } + + adj_nbr_midchain_stack (ai, &tmp); + dpo_reset (&tmp); } /** @@ -270,7 +262,8 @@ const static fib_node_vft_t gre_vft = { }; static int -vnet_gre_tunnel_add (vnet_gre_add_del_tunnel_args_t * a, u32 * sw_if_indexp) +vnet_gre_tunnel_add (vnet_gre_add_del_tunnel_args_t * a, + u32 outer_fib_index, u32 * sw_if_indexp) { gre_main_t *gm = &gre_main; vnet_main_t *vnm = gm->vnet_main; @@ -279,110 +272,69 @@ vnet_gre_tunnel_add (vnet_gre_add_del_tunnel_args_t * a, u32 * sw_if_indexp) gre_tunnel_t *t; vnet_hw_interface_t *hi; u32 hw_if_index, sw_if_index; - u32 outer_fib_index; - u8 address[6]; clib_error_t *error; u8 is_ipv6 = a->is_ipv6; + gre_tunnel_key_t key; - if (!is_ipv6) - outer_fib_index = ip4_fib_index_from_table_id (a->outer_fib_id); - else - outer_fib_index = ip6_fib_index_from_table_id (a->outer_fib_id); - - if (~0 == outer_fib_index) - return VNET_API_ERROR_NO_SUCH_FIB; - - t = gre_tunnel_db_find (&a->src, &a->dst, a->outer_fib_id, a->is_ipv6); - + t = gre_tunnel_db_find (a, outer_fib_index, &key); if (NULL != t) - return VNET_API_ERROR_INVALID_VALUE; + return VNET_API_ERROR_IF_ALREADY_EXISTS; pool_get_aligned (gm->tunnels, t, CLIB_CACHE_LINE_BYTES); - memset (t, 0, sizeof (*t)); + clib_memset (t, 0, sizeof (*t)); + + /* Reconcile the real dev_instance and a possible requested instance */ + u32 t_idx = t - gm->tunnels; /* tunnel index (or instance) */ + u32 u_idx = a->instance; /* user specified instance */ + if (u_idx == ~0) + u_idx = t_idx; + if (hash_get (gm->instance_used, u_idx)) + { + pool_put (gm->tunnels, t); + return VNET_API_ERROR_INSTANCE_IN_USE; + } + hash_set (gm->instance_used, u_idx, 1); + + t->dev_instance = t_idx; /* actual */ + t->user_instance = u_idx; /* name */ fib_node_init (&t->node, FIB_NODE_TYPE_GRE_TUNNEL); - if (a->teb) - t->type = GRE_TUNNEL_TYPE_TEB; - else - t->type = GRE_TUNNEL_TYPE_L3; + t->type = a->tunnel_type; + if (t->type == GRE_TUNNEL_TYPE_ERSPAN) + t->session_id = a->session_id; - if (vec_len (gm->free_gre_tunnel_hw_if_indices[t->type]) > 0) - { - vnet_interface_main_t *im = &vnm->interface_main; - - hw_if_index = gm->free_gre_tunnel_hw_if_indices[t->type] - [vec_len (gm->free_gre_tunnel_hw_if_indices[t->type]) - 1]; - _vec_len (gm->free_gre_tunnel_hw_if_indices[t->type]) -= 1; - - hi = vnet_get_hw_interface (vnm, hw_if_index); - hi->dev_instance = t - gm->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); - if (GRE_TUNNEL_TYPE_TEB == t->type) - { - t->l2_tx_arc = vlib_node_add_named_next (vlib_get_main (), - hi->tx_node_index, - "adj-l2-midchain"); - } - } + if (t->type == GRE_TUNNEL_TYPE_L3) + hw_if_index = vnet_register_interface (vnm, gre_device_class.index, t_idx, + gre_hw_interface_class.index, + t_idx); else { - if (GRE_TUNNEL_TYPE_TEB == t->type) - { - /* Default MAC address (d00b:eed0:0000 + sw_if_index) */ - memset (address, 0, sizeof (address)); - address[0] = 0xd0; - address[1] = 0x0b; - address[2] = 0xee; - address[3] = 0xd0; - address[4] = t - gm->tunnels; - - error = ethernet_register_interface (vnm, - gre_device_teb_class.index, - t - gm->tunnels, address, - &hw_if_index, 0); - - if (error) - { - clib_error_report (error); - return VNET_API_ERROR_INVALID_REGISTRATION; - } - hi = vnet_get_hw_interface (vnm, hw_if_index); - - t->l2_tx_arc = vlib_node_add_named_next (vlib_get_main (), - hi->tx_node_index, - "adj-l2-midchain"); - } - else + /* Default MAC address (d00b:eed0:0000 + sw_if_index) */ + u8 address[6] = + { 0xd0, 0x0b, 0xee, 0xd0, (u8) (t_idx >> 8), (u8) t_idx }; + error = + ethernet_register_interface (vnm, gre_device_class.index, t_idx, + address, &hw_if_index, 0); + if (error) { - hw_if_index = vnet_register_interface (vnm, - gre_device_class.index, - t - gm->tunnels, - gre_hw_interface_class.index, - t - gm->tunnels); + clib_error_report (error); + return VNET_API_ERROR_INVALID_REGISTRATION; } - hi = vnet_get_hw_interface (vnm, hw_if_index); - sw_if_index = hi->sw_if_index; } + /* Set GRE tunnel interface output node (not used for L3 payload) */ + vnet_set_interface_output_node (vnm, hw_if_index, gre_encap_node.index); + + hi = vnet_get_hw_interface (vnm, hw_if_index); + sw_if_index = hi->sw_if_index; + t->hw_if_index = hw_if_index; t->outer_fib_index = outer_fib_index; t->sw_if_index = sw_if_index; t->l2_adj_index = ADJ_INDEX_INVALID; vec_validate_init_empty (gm->tunnel_index_by_sw_if_index, sw_if_index, ~0); - gm->tunnel_index_by_sw_if_index[sw_if_index] = t - gm->tunnels; + gm->tunnel_index_by_sw_if_index[sw_if_index] = t_idx; if (!is_ipv6) { @@ -397,11 +349,8 @@ vnet_gre_tunnel_add (vnet_gre_add_del_tunnel_args_t * a, u32 * sw_if_indexp) 64 + sizeof (gre_header_t) + sizeof (ip6_header_t); } - hi->per_packet_overhead_bytes = - /* preamble */ 8 + /* inter frame gap */ 12; - /* Standard default gre MTU. */ - hi->max_l3_packet_bytes[VLIB_RX] = hi->max_l3_packet_bytes[VLIB_TX] = 9000; + vnet_sw_interface_set_mtu (vnm, sw_if_index, 9000); /* * source the FIB entry for the tunnel's destination @@ -415,21 +364,38 @@ vnet_gre_tunnel_add (vnet_gre_add_del_tunnel_args_t * a, u32 * sw_if_indexp) t->tunnel_dst.fp_proto = !is_ipv6 ? FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6; t->tunnel_dst.fp_addr = a->dst; - gre_tunnel_db_add (t); + gre_tunnel_db_add (t, &key); + if (t->type == GRE_TUNNEL_TYPE_ERSPAN) + { + gre_sn_key_t skey; + gre_sn_t *gre_sn; + + gre_mk_sn_key (t, &skey); + gre_sn = (gre_sn_t *) hash_get_mem (gm->seq_num_by_key, &skey); + if (gre_sn != NULL) + { + gre_sn->ref_count++; + t->gre_sn = gre_sn; + } + else + { + gre_sn = clib_mem_alloc (sizeof (gre_sn_t)); + gre_sn->seq_num = 0; + gre_sn->ref_count = 1; + t->gre_sn = gre_sn; + hash_set_mem_alloc (&gm->seq_num_by_key, &skey, (uword) gre_sn); + } + } - t->fib_entry_index = - fib_table_entry_special_add (outer_fib_index, - &t->tunnel_dst, - FIB_SOURCE_RR, FIB_ENTRY_FLAG_NONE); - t->sibling_index = - fib_entry_child_add (t->fib_entry_index, - FIB_NODE_TYPE_GRE_TUNNEL, t - gm->tunnels); + t->fib_entry_index = fib_table_entry_special_add + (outer_fib_index, &t->tunnel_dst, FIB_SOURCE_RR, FIB_ENTRY_FLAG_NONE); + t->sibling_index = fib_entry_child_add + (t->fib_entry_index, FIB_NODE_TYPE_GRE_TUNNEL, t_idx); - if (GRE_TUNNEL_TYPE_TEB == t->type) + if (t->type != GRE_TUNNEL_TYPE_L3) { - t->l2_adj_index = adj_nbr_add_or_lock (t->tunnel_dst.fp_proto, - VNET_LINK_ETHERNET, - &zero_addr, sw_if_index); + t->l2_adj_index = adj_nbr_add_or_lock + (t->tunnel_dst.fp_proto, VNET_LINK_ETHERNET, &zero_addr, sw_if_index); gre_update_adj (vnm, t->sw_if_index, t->l2_adj_index); } @@ -441,27 +407,30 @@ vnet_gre_tunnel_add (vnet_gre_add_del_tunnel_args_t * a, u32 * sw_if_indexp) static int vnet_gre_tunnel_delete (vnet_gre_add_del_tunnel_args_t * a, - u32 * sw_if_indexp) + u32 outer_fib_index, u32 * sw_if_indexp) { gre_main_t *gm = &gre_main; vnet_main_t *vnm = gm->vnet_main; gre_tunnel_t *t; + gre_tunnel_key_t key; u32 sw_if_index; - t = gre_tunnel_db_find (&a->src, &a->dst, a->outer_fib_id, a->is_ipv6); - + t = gre_tunnel_db_find (a, outer_fib_index, &key); if (NULL == t) return VNET_API_ERROR_NO_SUCH_ENTRY; sw_if_index = t->sw_if_index; vnet_sw_interface_set_flags (vnm, sw_if_index, 0 /* down */ ); + /* make sure tunnel is removed from l2 bd or xconnect */ - set_int_l2_mode (gm->vlib_main, vnm, MODE_L3, sw_if_index, 0, 0, 0, 0); - vec_add1 (gm->free_gre_tunnel_hw_if_indices[t->type], t->hw_if_index); + set_int_l2_mode (gm->vlib_main, vnm, MODE_L3, sw_if_index, 0, + L2_BD_PORT_TYPE_NORMAL, 0, 0); gm->tunnel_index_by_sw_if_index[sw_if_index] = ~0; - if (GRE_TUNNEL_TYPE_TEB == t->type) - adj_unlock (t->l2_adj_index); + if (t->type == GRE_TUNNEL_TYPE_L3) + vnet_delete_hw_interface (vnm, t->hw_if_index); + else + ethernet_delete_interface (vnm, t->hw_if_index); if (t->l2_adj_index != ADJ_INDEX_INVALID) adj_unlock (t->l2_adj_index); @@ -469,6 +438,16 @@ vnet_gre_tunnel_delete (vnet_gre_add_del_tunnel_args_t * a, fib_entry_child_remove (t->fib_entry_index, t->sibling_index); fib_table_entry_delete_index (t->fib_entry_index, FIB_SOURCE_RR); + ASSERT ((t->type != GRE_TUNNEL_TYPE_ERSPAN) || (t->gre_sn != NULL)); + if ((t->type == GRE_TUNNEL_TYPE_ERSPAN) && (t->gre_sn->ref_count-- == 1)) + { + gre_sn_key_t skey; + gre_mk_sn_key (t, &skey); + hash_unset_mem_free (&gm->seq_num_by_key, &skey); + clib_mem_free (t->gre_sn); + } + + hash_unset (gm->instance_used, t->user_instance); gre_tunnel_db_remove (t); fib_node_deinit (&t->node); pool_put (gm->tunnels, t); @@ -483,10 +462,23 @@ int vnet_gre_add_del_tunnel (vnet_gre_add_del_tunnel_args_t * a, u32 * sw_if_indexp) { + u32 outer_fib_index; + + if (!a->is_ipv6) + outer_fib_index = ip4_fib_index_from_table_id (a->outer_fib_id); + else + outer_fib_index = ip6_fib_index_from_table_id (a->outer_fib_id); + + if (~0 == outer_fib_index) + return VNET_API_ERROR_NO_SUCH_FIB; + + if (a->session_id > GTK_SESSION_ID_MAX) + return VNET_API_ERROR_INVALID_SESSION_ID; + if (a->is_add) - return (vnet_gre_tunnel_add (a, sw_if_indexp)); + return (vnet_gre_tunnel_add (a, outer_fib_index, sw_if_indexp)); else - return (vnet_gre_tunnel_delete (a, sw_if_indexp)); + return (vnet_gre_tunnel_delete (a, outer_fib_index, sw_if_indexp)); } clib_error_t * @@ -530,8 +522,10 @@ create_gre_tunnel_command_fn (vlib_main_t * vm, unformat_input_t _line_input, *line_input = &_line_input; vnet_gre_add_del_tunnel_args_t _a, *a = &_a; ip46_address_t src, dst; + u32 instance = ~0; u32 outer_fib_id = 0; - u8 teb = 0; + gre_tunnel_type_t t_type = GRE_TUNNEL_TYPE_L3; + u32 session_id = 0; int rv; u32 num_m_args = 0; u8 is_add = 1; @@ -548,6 +542,8 @@ create_gre_tunnel_command_fn (vlib_main_t * vm, { if (unformat (line_input, "del")) is_add = 0; + else if (unformat (line_input, "instance %d", &instance)) + ; else if (unformat (line_input, "src %U", unformat_ip4_address, &src.ip4)) { @@ -575,7 +571,9 @@ create_gre_tunnel_command_fn (vlib_main_t * vm, else if (unformat (line_input, "outer-fib-id %d", &outer_fib_id)) ; else if (unformat (line_input, "teb")) - teb = 1; + t_type = GRE_TUNNEL_TYPE_TEB; + else if (unformat (line_input, "erspan %d", &session_id)) + t_type = GRE_TUNNEL_TYPE_ERSPAN; else { error = clib_error_return (0, "unknown input `%U'", @@ -608,10 +606,13 @@ create_gre_tunnel_command_fn (vlib_main_t * vm, goto done; } - memset (a, 0, sizeof (*a)); + clib_memset (a, 0, sizeof (*a)); + a->is_add = is_add; a->outer_fib_id = outer_fib_id; - a->teb = teb; + a->tunnel_type = t_type; + a->session_id = session_id; a->is_ipv6 = ipv6_set; + a->instance = instance; if (!ipv6_set) { clib_memcpy (&a->src.ip4, &src.ip4, sizeof (src.ip4)); @@ -623,10 +624,7 @@ create_gre_tunnel_command_fn (vlib_main_t * vm, clib_memcpy (&a->dst.ip6, &dst.ip6, sizeof (dst.ip6)); } - if (is_add) - rv = vnet_gre_tunnel_add (a, &sw_if_index); - else - rv = vnet_gre_tunnel_delete (a, &sw_if_index); + rv = vnet_gre_add_del_tunnel (a, &sw_if_index); switch (rv) { @@ -634,13 +632,23 @@ create_gre_tunnel_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "%U\n", format_vnet_sw_if_index_name, vnet_get_main (), sw_if_index); break; - case VNET_API_ERROR_INVALID_VALUE: + case VNET_API_ERROR_IF_ALREADY_EXISTS: error = clib_error_return (0, "GRE tunnel already exists..."); goto done; case VNET_API_ERROR_NO_SUCH_FIB: error = clib_error_return (0, "outer fib ID %d doesn't exist\n", outer_fib_id); goto done; + case VNET_API_ERROR_NO_SUCH_ENTRY: + error = clib_error_return (0, "GRE tunnel doesn't exist"); + goto done; + case VNET_API_ERROR_INVALID_SESSION_ID: + error = clib_error_return (0, "session ID %d out of range\n", + session_id); + goto done; + case VNET_API_ERROR_INSTANCE_IN_USE: + error = clib_error_return (0, "Instance is in use"); + goto done; default: error = clib_error_return (0, "vnet_gre_add_del_tunnel returned %d", rv); @@ -656,8 +664,8 @@ done: /* *INDENT-OFF* */ VLIB_CLI_COMMAND (create_gre_tunnel_command, static) = { .path = "create gre tunnel", - .short_help = "create gre tunnel src dst " - "[outer-fib-id ] [teb] [del]", + .short_help = "create gre tunnel src dst [instance ] " + "[outer-fib-id ] [teb | erspan ] [del]", .function = create_gre_tunnel_command_fn, }; /* *INDENT-ON* */