X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fgre%2Finterface.c;h=553c89aeb514fc34375b72506a26e3a5ed7fecf2;hb=e5b94dded;hp=927f34ef694cdbf476e9e3a00697934412c20b35;hpb=5f8f6173328f8d77feea5fd100e150c3094c11f0;p=vpp.git diff --git a/src/vnet/gre/interface.c b/src/vnet/gre/interface.c index 927f34ef694..553c89aeb51 100644 --- a/src/vnet/gre/interface.c +++ b/src/vnet/gre/interface.c @@ -25,6 +25,7 @@ #include #include #include +#include u8 * format_gre_tunnel_type (u8 * s, va_list * args) @@ -43,23 +44,6 @@ format_gre_tunnel_type (u8 * s, va_list * args) return (s); } -u8 * -format_gre_tunnel_mode (u8 * s, va_list * args) -{ - gre_tunnel_mode_t mode = va_arg (*args, int); - - switch (mode) - { -#define _(n, v) case GRE_TUNNEL_MODE_##n: \ - s = format (s, "%s", v); \ - break; - foreach_gre_tunnel_mode -#undef _ - } - - return (s); -} - static u8 * format_gre_tunnel (u8 * s, va_list * args) { @@ -72,7 +56,7 @@ format_gre_tunnel (u8 * s, va_list * args) t->outer_fib_index, t->sw_if_index); s = format (s, "payload %U ", format_gre_tunnel_type, t->type); - s = format (s, "%U ", format_gre_tunnel_mode, t->mode); + s = format (s, "%U ", format_tunnel_mode, t->mode); if (t->type == GRE_TUNNEL_TYPE_ERSPAN) s = format (s, "session %d ", t->session_id); @@ -93,13 +77,13 @@ gre_tunnel_db_find (const vnet_gre_tunnel_add_del_args_t * a, if (!a->is_ipv6) { gre_mk_key4 (a->src.ip4, a->dst.ip4, outer_fib_index, - a->type, a->session_id, &key->gtk_v4); + a->type, a->mode, a->session_id, &key->gtk_v4); p = hash_get_mem (gm->tunnel_by_key4, &key->gtk_v4); } else { gre_mk_key6 (&a->src.ip6, &a->dst.ip6, outer_fib_index, - a->type, a->session_id, &key->gtk_v6); + a->type, a->mode, a->session_id, &key->gtk_v6); p = hash_get_mem (gm->tunnel_by_key6, &key->gtk_v6); } @@ -114,35 +98,29 @@ gre_tunnel_db_add (gre_tunnel_t * t, gre_tunnel_key_t * key) { gre_main_t *gm = &gre_main; - t->key = clib_mem_alloc (sizeof (*t->key)); - clib_memcpy (t->key, key, sizeof (*key)); - if (t->tunnel_dst.fp_proto == FIB_PROTOCOL_IP6) { - hash_set_mem (gm->tunnel_by_key6, &t->key->gtk_v6, t->dev_instance); + hash_set_mem_alloc (&gm->tunnel_by_key6, &key->gtk_v6, t->dev_instance); } else { - hash_set_mem (gm->tunnel_by_key4, &t->key->gtk_v4, t->dev_instance); + hash_set_mem_alloc (&gm->tunnel_by_key4, &key->gtk_v4, t->dev_instance); } } static void -gre_tunnel_db_remove (gre_tunnel_t * t) +gre_tunnel_db_remove (gre_tunnel_t * t, gre_tunnel_key_t * key) { gre_main_t *gm = &gre_main; if (t->tunnel_dst.fp_proto == FIB_PROTOCOL_IP6) { - hash_unset_mem (gm->tunnel_by_key6, &t->key->gtk_v6); + hash_unset_mem_free (&gm->tunnel_by_key6, &key->gtk_v6); } else { - hash_unset_mem (gm->tunnel_by_key4, &t->key->gtk_v4); + hash_unset_mem_free (&gm->tunnel_by_key4, &key->gtk_v4); } - - clib_mem_free (t->key); - t->key = NULL; } /** @@ -204,6 +182,131 @@ gre_tunnel_restack (gre_tunnel_t * gt) } } +static void +gre_nhrp_mk_key (const gre_tunnel_t * t, + const nhrp_entry_t * ne, gre_tunnel_key_t * key) +{ + const fib_prefix_t *nh; + + nh = nhrp_entry_get_nh (ne); + + /* construct the key using mode P2P so it can be found in the DP */ + if (FIB_PROTOCOL_IP4 == nh->fp_proto) + gre_mk_key4 (t->tunnel_src.ip4, + nh->fp_addr.ip4, + nhrp_entry_get_fib_index (ne), + t->type, TUNNEL_MODE_P2P, 0, &key->gtk_v4); + else + gre_mk_key6 (&t->tunnel_src.ip6, + &nh->fp_addr.ip6, + nhrp_entry_get_fib_index (ne), + t->type, TUNNEL_MODE_P2P, 0, &key->gtk_v6); +} + +/** + * An NHRP entry has been added + */ +static void +gre_nhrp_entry_added (const nhrp_entry_t * ne) +{ + gre_main_t *gm = &gre_main; + const ip46_address_t *nh; + gre_tunnel_key_t key; + gre_tunnel_t *t; + u32 sw_if_index; + u32 t_idx; + + sw_if_index = nhrp_entry_get_sw_if_index (ne); + if (vec_len (gm->tunnel_index_by_sw_if_index) < sw_if_index) + return; + + t_idx = gm->tunnel_index_by_sw_if_index[sw_if_index]; + + if (INDEX_INVALID == t_idx) + return; + + /* entry has been added on an interface for which there is a GRE tunnel */ + t = pool_elt_at_index (gm->tunnels, t_idx); + + if (t->mode != TUNNEL_MODE_MP) + return; + + /* the next-hop (underlay) of the NHRP entry will form part of the key for + * ingress lookup to match packets to this interface */ + gre_nhrp_mk_key (t, ne, &key); + gre_tunnel_db_add (t, &key); + + /* update the rewrites for each of the adjacencies for this peer (overlay) + * using the next-hop (underlay) */ + mgre_walk_ctx_t ctx = { + .t = t, + .ne = ne + }; + nh = nhrp_entry_get_peer (ne); + adj_nbr_walk_nh (nhrp_entry_get_sw_if_index (ne), + (ip46_address_is_ip4 (nh) ? + FIB_PROTOCOL_IP4 : + FIB_PROTOCOL_IP6), nh, mgre_mk_complete_walk, &ctx); +} + +static void +gre_nhrp_entry_deleted (const nhrp_entry_t * ne) +{ + gre_main_t *gm = &gre_main; + const ip46_address_t *nh; + gre_tunnel_key_t key; + gre_tunnel_t *t; + u32 sw_if_index; + u32 t_idx; + + sw_if_index = nhrp_entry_get_sw_if_index (ne); + if (vec_len (gm->tunnel_index_by_sw_if_index) < sw_if_index) + return; + + t_idx = gm->tunnel_index_by_sw_if_index[sw_if_index]; + + if (INDEX_INVALID == t_idx) + return; + + t = pool_elt_at_index (gm->tunnels, t_idx); + + /* remove the next-hop as an ingress lookup key */ + gre_nhrp_mk_key (t, ne, &key); + gre_tunnel_db_remove (t, &key); + + nh = nhrp_entry_get_peer (ne); + + /* make all the adjacencies incomplete */ + adj_nbr_walk_nh (nhrp_entry_get_sw_if_index (ne), + (ip46_address_is_ip4 (nh) ? + FIB_PROTOCOL_IP4 : + FIB_PROTOCOL_IP6), nh, mgre_mk_incomplete_walk, t); +} + +static walk_rc_t +gre_tunnel_delete_nhrp_walk (index_t nei, void *ctx) +{ + gre_tunnel_t *t = ctx; + gre_tunnel_key_t key; + + gre_nhrp_mk_key (t, nhrp_entry_get (nei), &key); + gre_tunnel_db_remove (t, &key); + + return (WALK_CONTINUE); +} + +static walk_rc_t +gre_tunnel_add_nhrp_walk (index_t nei, void *ctx) +{ + gre_tunnel_t *t = ctx; + gre_tunnel_key_t key; + + gre_nhrp_mk_key (t, nhrp_entry_get (nei), &key); + gre_tunnel_db_add (t, &key); + + return (WALK_CONTINUE); +} + static int vnet_gre_tunnel_add (vnet_gre_tunnel_add_del_args_t * a, u32 outer_fib_index, u32 * sw_if_indexp) @@ -243,12 +346,13 @@ vnet_gre_tunnel_add (vnet_gre_tunnel_add_del_args_t * a, t->type = a->type; t->mode = a->mode; + t->flags = a->flags; if (t->type == GRE_TUNNEL_TYPE_ERSPAN) t->session_id = a->session_id; if (t->type == GRE_TUNNEL_TYPE_L3) { - if (t->mode == GRE_TUNNEL_MODE_P2P) + if (t->mode == TUNNEL_MODE_P2P) hw_if_index = vnet_register_interface (vnm, gre_device_class.index, t_idx, gre_hw_interface_class.index, t_idx); @@ -315,6 +419,10 @@ vnet_gre_tunnel_add (vnet_gre_tunnel_add_del_args_t * a, t->tunnel_dst.fp_addr = a->dst; gre_tunnel_db_add (t, &key); + + if (t->mode == TUNNEL_MODE_MP) + nhrp_walk_itf (t->sw_if_index, gre_tunnel_add_nhrp_walk, t); + if (t->type == GRE_TUNNEL_TYPE_ERSPAN) { gre_sn_key_t skey; @@ -368,6 +476,9 @@ vnet_gre_tunnel_delete (vnet_gre_tunnel_add_del_args_t * a, if (NULL == t) return VNET_API_ERROR_NO_SUCH_ENTRY; + if (t->mode == TUNNEL_MODE_MP) + nhrp_walk_itf (t->sw_if_index, gre_tunnel_delete_nhrp_walk, t); + sw_if_index = t->sw_if_index; vnet_sw_interface_set_flags (vnm, sw_if_index, 0 /* down */ ); @@ -397,7 +508,7 @@ vnet_gre_tunnel_delete (vnet_gre_tunnel_add_del_args_t * a, } hash_unset (gm->instance_used, t->user_instance); - gre_tunnel_db_remove (t); + gre_tunnel_db_remove (t, &key); pool_put (gm->tunnels, t); if (sw_if_indexp) @@ -423,6 +534,9 @@ vnet_gre_tunnel_add_del (vnet_gre_tunnel_add_del_args_t * a, if (a->session_id > GTK_SESSION_ID_MAX) return VNET_API_ERROR_INVALID_SESSION_ID; + if (a->mode == TUNNEL_MODE_MP && !ip46_address_is_zero (&a->dst)) + return (VNET_API_ERROR_INVALID_DST_ADDRESS); + if (a->is_add) return (vnet_gre_tunnel_add (a, outer_fib_index, sw_if_indexp)); else @@ -474,7 +588,7 @@ create_gre_tunnel_command_fn (vlib_main_t * vm, u32 instance = ~0; u32 outer_table_id = 0; gre_tunnel_type_t t_type = GRE_TUNNEL_TYPE_L3; - gre_tunnel_mode_t t_mode = GRE_TUNNEL_MODE_P2P; + tunnel_mode_t t_mode = TUNNEL_MODE_P2P; u32 session_id = 0; int rv; u8 is_add = 1; @@ -498,7 +612,7 @@ create_gre_tunnel_command_fn (vlib_main_t * vm, else if (unformat (line_input, "outer-table-id %d", &outer_table_id)) ; else if (unformat (line_input, "multipoint")) - t_mode = GRE_TUNNEL_MODE_MP; + t_mode = TUNNEL_MODE_MP; else if (unformat (line_input, "teb")) t_type = GRE_TUNNEL_TYPE_TEB; else if (unformat (line_input, "erspan %d", &session_id)) @@ -517,7 +631,7 @@ create_gre_tunnel_command_fn (vlib_main_t * vm, goto done; } - if (t_mode != GRE_TUNNEL_MODE_MP && ip46_address_is_zero (&dst)) + if (t_mode != TUNNEL_MODE_MP && ip46_address_is_zero (&dst)) { error = clib_error_return (0, "destination address not specified"); goto done; @@ -639,10 +753,17 @@ VLIB_CLI_COMMAND (show_gre_tunnel_command, static) = { }; /* *INDENT-ON* */ +const static nhrp_vft_t gre_nhrp_vft = { + .nv_added = gre_nhrp_entry_added, + .nv_deleted = gre_nhrp_entry_deleted, +}; + /* force inclusion from application's main.c */ clib_error_t * gre_interface_init (vlib_main_t * vm) { + nhrp_register (&gre_nhrp_vft); + return (NULL); }