X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2Fvnet%2Flisp-cp%2Fcontrol.c;h=1e3b98ff5c68ebdc184bd3be9a8ac466e4d693ec;hb=b0ccf03b6e1d29b473e092d42768ced9f2ae8508;hp=9a88402e417558e29c6fd0ebc08b38bb181b4222;hpb=beceab90520d38aa0b90427d0c829d67ca843161;p=vpp.git diff --git a/vnet/vnet/lisp-cp/control.c b/vnet/vnet/lisp-cp/control.c index 9a88402e417..1e3b98ff5c6 100644 --- a/vnet/vnet/lisp-cp/control.c +++ b/vnet/vnet/lisp-cp/control.c @@ -18,6 +18,16 @@ #include #include +static void +add_fwd_entry (lisp_cp_main_t* lcm, u32 src_map_index, u32 dst_map_index); + +static void +del_fwd_entry (lisp_cp_main_t * lcm, u32 src_map_index, u32 dst_map_index); + +static u8 +compare_locators (lisp_cp_main_t *lcm, u32 * old_ls_indexes, + locator_t * new_locators); + /* Stores mapping in map-cache. It does NOT program data plane forwarding for * remote/learned mappings. */ int @@ -26,24 +36,27 @@ vnet_lisp_add_del_mapping (vnet_lisp_add_del_mapping_args_t * a, { lisp_cp_main_t * lcm = vnet_lisp_cp_get_main(); u32 mi, * map_indexp, map_index, i; - mapping_t * m; + mapping_t * m, * old_map; u32 ** eid_indexes; mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &a->deid); + old_map = mi != ~0 ? pool_elt_at_index (lcm->mapping_pool, mi) : 0; if (a->is_add) { /* TODO check if overwriting and take appropriate actions */ - if (mi != GID_LOOKUP_MISS) + if (mi != GID_LOOKUP_MISS && !gid_address_cmp (&old_map->eid, + &a->deid)) { - clib_warning("eid %U found in the eid-table", format_ip_address, + clib_warning ("eid %U found in the eid-table", format_gid_address, &a->deid); return VNET_API_ERROR_VALUE_EXIST; } pool_get(lcm->mapping_pool, m); - m->eid = a->deid; + gid_address_copy (&m->eid, &a->deid); m->locator_set_index = a->locator_set_index; m->ttl = a->ttl; + m->action = a->action; m->local = a->local; map_index = m - lcm->mapping_pool; @@ -74,7 +87,7 @@ vnet_lisp_add_del_mapping (vnet_lisp_add_del_mapping_args_t * a, { if (mi == GID_LOOKUP_MISS) { - clib_warning("eid %U not found in the eid-table", format_ip_address, + clib_warning("eid %U not found in the eid-table", format_gid_address, &a->deid); return VNET_API_ERROR_INVALID_VALUE; } @@ -110,6 +123,7 @@ vnet_lisp_add_del_mapping (vnet_lisp_add_del_mapping_args_t * a, /* remove mapping from dictionary */ gid_dictionary_add_del (&lcm->mapping_index_by_gid, &a->deid, 0, 0); + gid_address_free (&m->eid); pool_put_index (lcm->mapping_pool, mi); } @@ -122,24 +136,32 @@ vnet_lisp_add_del_local_mapping (vnet_lisp_add_del_mapping_args_t * a, u32 * map_index_result) { uword * table_id, * refc; - u32 rv; + u32 rv, vni; vnet_lisp_gpe_add_del_iface_args_t _ai, *ai = &_ai; lisp_cp_main_t * lcm = vnet_lisp_cp_get_main (); + if (vnet_lisp_enable_disable_status () == 0) + { + clib_warning ("LISP is disabled!"); + return VNET_API_ERROR_LISP_DISABLED; + } + + vni = gid_address_vni(&a->deid); + /* store/remove mapping from map-cache */ rv = vnet_lisp_add_del_mapping (a, map_index_result); if (rv) return rv; - table_id = hash_get(lcm->table_id_by_vni, /* default for now */ 0); + table_id = hash_get(lcm->table_id_by_vni, vni); if (!table_id) { - clib_warning ("vni %d not associated to a vrf!", 0); + clib_warning ("vni %d not associated to a vrf!", vni); return VNET_API_ERROR_INVALID_VALUE; } - refc = hash_get(lcm->dp_if_refcount_by_vni, 0); + refc = hash_get(lcm->dp_if_refcount_by_vni, vni); /* enable/disable data-plane interface */ if (a->is_add) @@ -148,11 +170,12 @@ vnet_lisp_add_del_local_mapping (vnet_lisp_add_del_mapping_args_t * a, if (!refc) { ai->is_add = 1; - ai->vni = 0; /* default for now, pass vni as parameter */ + ai->vni = vni; ai->table_id = table_id[0]; vnet_lisp_gpe_add_del_iface (ai, 0); - hash_set(lcm->dp_if_refcount_by_vni, 0 /* table_id */, 1); + /* counts the number of eids in a vni that use the interface */ + hash_set(lcm->dp_if_refcount_by_vni, vni, 1); } else { @@ -169,9 +192,10 @@ vnet_lisp_add_del_local_mapping (vnet_lisp_add_del_mapping_args_t * a, if (refc[0] == 0) { ai->is_add = 0; - ai->vni = 0; /* default for now, pass vni as parameter */ + ai->vni = vni; ai->table_id = table_id[0]; vnet_lisp_gpe_add_del_iface (ai, 0); + hash_unset (lcm->dp_if_refcount_by_vni, vni); } } @@ -189,13 +213,14 @@ lisp_add_del_local_eid_command_fn (vlib_main_t * vm, unformat_input_t * input, ip_prefix_t * prefp = &gid_address_ippref(&eid); gid_address_t * eids = 0; clib_error_t * error = 0; - u8 * locator_set_name; + u8 * locator_set_name = 0; u32 locator_set_index = 0, map_index = 0; uword * p; vnet_lisp_add_del_mapping_args_t _a, * a = &_a; + int rv = 0; + u32 vni = 0; - gid_address_type (&eid) = GID_ADDR_IP_PREFIX; - + memset (&eid, 0, sizeof (eid)); /* Get a line of input. */ if (! unformat_user (input, unformat_line_input, line_input)) return 0; @@ -206,6 +231,8 @@ lisp_add_del_local_eid_command_fn (vlib_main_t * vm, unformat_input_t * input, is_add = 1; else if (unformat (line_input, "del")) is_add = 0; + else if (unformat (line_input, "vni %d", &vni)) + gid_address_vni (&eid) = vni; else if (unformat (line_input, "eid %U", unformat_ip_prefix, prefp)) { vec_add1(eids, eid); @@ -227,290 +254,961 @@ lisp_add_del_local_eid_command_fn (vlib_main_t * vm, unformat_input_t * input, goto done; } } - /* XXX treat batch configuration */ + + gid_address_type (&eid) = GID_ADDR_IP_PREFIX; a->deid = eid; a->is_add = is_add; a->locator_set_index = locator_set_index; a->local = 1; - vnet_lisp_add_del_local_mapping (a, &map_index); + rv = vnet_lisp_add_del_local_mapping (a, &map_index); + if (0 != rv) + { + error = clib_error_return(0, "failed to %s eid-table!", + is_add ? "add" : "delete"); + } done: vec_free(eids); + if (locator_set_name) + vec_free (locator_set_name); + gid_address_free (&a->deid); return error; } VLIB_CLI_COMMAND (lisp_add_del_local_eid_command) = { .path = "lisp eid-table", - .short_help = "lisp eid-table add/del eid locator-set ", + .short_help = "lisp eid-table add/del [vni ] eid " + "locator-set ", .function = lisp_add_del_local_eid_command_fn, }; -static clib_error_t * -lisp_show_local_eid_table_command_fn (vlib_main_t * vm, - unformat_input_t * input, - vlib_cli_command_t * cmd) +int +vnet_lisp_eid_table_map (u32 vni, u32 vrf, u8 is_add) { - lisp_cp_main_t * lcm = vnet_lisp_cp_get_main(); - mapping_t * mapit; + lisp_cp_main_t * lcm = vnet_lisp_cp_get_main (); + uword * table_id, * vnip; - vlib_cli_output (vm, "%=20s%=16s", "EID", "Locator"); - pool_foreach (mapit, lcm->mapping_pool, - ({ - u8 * msg = 0; - locator_set_t * ls = pool_elt_at_index (lcm->locator_set_pool, - mapit->locator_set_index); - vlib_cli_output (vm, "%-16U%16v", format_gid_address, &mapit->eid, - ls->name); - vec_free (msg); - })); + if (vnet_lisp_enable_disable_status () == 0) + { + clib_warning ("LISP is disabled!"); + return -1; + } - return 0; -} + if (vni == 0 || vrf == 0) + { + clib_warning ("can't add/del default vni-vrf mapping!"); + return -1; + } -VLIB_CLI_COMMAND (lisp_cp_show_local_eid_table_command) = { - .path = "show lisp eid-table", - .short_help = "Shows local EID table", - .function = lisp_show_local_eid_table_command_fn, -}; + table_id = hash_get (lcm->table_id_by_vni, vni); + vnip = hash_get (lcm->vni_by_table_id, vrf); -/* cleans locator to locator-set data and removes locators not part of - * any locator-set */ -static void -clean_locator_to_locator_set (lisp_cp_main_t * lcm, u32 lsi) -{ - u32 i, j, *loc_indexp, *ls_indexp, **ls_indexes; - locator_set_t * ls = pool_elt_at_index(lcm->locator_set_pool, lsi); - for (i = 0; i < vec_len(ls->locator_indices); i++) + if (is_add) { - loc_indexp = vec_elt_at_index(ls->locator_indices, i); - ls_indexes = vec_elt_at_index(lcm->locator_to_locator_sets, - loc_indexp[0]); - for (j = 0; j < vec_len(ls_indexes[0]); j++) + if (table_id || vnip) { - ls_indexp = vec_elt_at_index(ls_indexes[0], j); - if (ls_indexp[0] == lsi) - break; + clib_warning ("vni %d or vrf %d already used in any vrf/vni " + "mapping!", vni, vrf); + return -1; } - - /* delete index for removed locator-set*/ - vec_del1(ls_indexes[0], j); - - /* delete locator if it's part of no locator-set */ - if (vec_len (ls_indexes[0]) == 0) - pool_put_index(lcm->locator_pool, loc_indexp[0]); + hash_set (lcm->table_id_by_vni, vni, vrf); + hash_set (lcm->vni_by_table_id, vrf, vni); + } + else + { + if (!table_id || !vnip) + { + clib_warning ("vni %d or vrf %d not used in any vrf/vni! " + "mapping!", vni, vrf); + return -1; + } + hash_unset (lcm->table_id_by_vni, vni); + hash_unset (lcm->vni_by_table_id, vrf); } + return 0; } -int -vnet_lisp_add_del_locator_set (vnet_lisp_add_del_locator_set_args_t * a, - u32 * ls_result) + +static clib_error_t * +lisp_eid_table_map_command_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) { - lisp_cp_main_t * lcm = vnet_lisp_cp_get_main(); - locator_set_t * ls; - locator_t * loc, * itloc; - uword _p = (u32)~0, * p = &_p; - u32 loc_index, ls_index, ** ls_indexes; - u32 **eid_indexes; + u8 is_add = 1; + u32 vni = 0, vrf = 0; + unformat_input_t _line_input, * line_input = &_line_input; - if (a->is_add) + /* Get a line of input. */ + if (! unformat_user (input, unformat_line_input, line_input)) + return 0; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - /* check if overwrite */ - if (a->local) - p = hash_get_mem(lcm->locator_set_index_by_name, a->name); + if (unformat (line_input, "del")) + is_add = 0; + else if (unformat (line_input, "vni %d", &vni)) + ; + else if (unformat (line_input, "vrf %d", &vrf)) + ; else - *p = a->index; - - /* overwrite */ - if (p && p[0] != (u32)~0) { - ls = pool_elt_at_index(lcm->locator_set_pool, p[0]); - if (!ls) - { - clib_warning("locator-set %d to be overwritten doesn't exist!", - p[0]); - return -1; - } - - /* clean locator to locator-set vectors and remove locators if - * they're not part of another locator-set */ - clean_locator_to_locator_set (lcm, p[0]); - - /* remove locator indices from locator set */ - vec_free(ls->locator_indices); + return unformat_parse_error (line_input); + } + } + vnet_lisp_eid_table_map (vni, vrf, is_add); + return 0; +} - ls_index = p[0]; +VLIB_CLI_COMMAND (lisp_eid_table_map_command) = { + .path = "lisp eid-table map", + .short_help = "lisp eid-table map [del] vni vrf ", + .function = lisp_eid_table_map_command_fn, +}; - if (ls_result) - ls_result[0] = p[0]; - } - /* new locator-set */ - else - { - pool_get(lcm->locator_set_pool, ls); - ls_index = ls - lcm->locator_set_pool; +static int +lisp_add_del_negative_static_mapping (gid_address_t * deid, + vnet_lisp_add_del_locator_set_args_t * ls, u8 action, u8 is_add) +{ + uword * p; + mapping_t * map; + u32 mi = ~0; + lisp_cp_main_t * lcm = vnet_lisp_cp_get_main (); + uword * refc; + vnet_lisp_add_del_mapping_args_t _dm_args, * dm_args = &_dm_args; + int rv = 0; + u32 ls_index = 0, dst_map_index; + vnet_lisp_gpe_add_del_iface_args_t _ai, *ai = &_ai; - if (a->local) - { - ls->name = vec_dup(a->name); + memset (dm_args, 0, sizeof (dm_args[0])); + u32 vni = gid_address_vni (deid); + refc = hash_get (lcm->dp_if_refcount_by_vni, vni); - if (!lcm->locator_set_index_by_name) - lcm->locator_set_index_by_name = hash_create_vec( - /* size */0, sizeof(ls->name[0]), sizeof(uword)); - hash_set_mem(lcm->locator_set_index_by_name, ls->name, ls_index); + p = hash_get (lcm->table_id_by_vni, vni); + if (!p) + { + clib_warning ("vni %d not associated to a vrf!", vni); + return VNET_API_ERROR_INVALID_VALUE; + } - /* mark as local locator-set */ - vec_add1(lcm->local_locator_set_indexes, ls_index); - } - ls->local = a->local; - if (ls_result) - ls_result[0] = ls_index; - } + if (is_add) + { + vnet_lisp_add_del_locator_set (ls, &ls_index); + /* add mapping */ + gid_address_copy (&dm_args->deid, deid); + dm_args->is_add = 1; + dm_args->action = action; + dm_args->locator_set_index = ls_index; - /* allocate locators */ - vec_foreach (itloc, a->locators) + /* create interface or update refcount */ + if (!refc) { - pool_get(lcm->locator_pool, loc); - loc[0] = itloc[0]; - loc_index = loc - lcm->locator_pool; - - vec_add1(ls->locator_indices, loc_index); + vnet_lisp_gpe_add_del_iface_args_t _ai, *ai = &_ai; + ai->is_add = 1; + ai->vni = vni; + ai->table_id = p[0]; + vnet_lisp_gpe_add_del_iface (ai, 0); - vec_validate (lcm->locator_to_locator_sets, loc_index); - ls_indexes = vec_elt_at_index(lcm->locator_to_locator_sets, - loc_index); - vec_add1(ls_indexes[0], ls_index); + /* counts the number of eids in a vni that use the interface */ + hash_set (lcm->dp_if_refcount_by_vni, vni, 1); } + else + refc[0]++; + + rv = vnet_lisp_add_del_local_mapping (dm_args, &dst_map_index); + if (!rv) + add_fwd_entry (lcm, lcm->pitr_map_index, dst_map_index); } else { - /* find locator-set */ - if (a->local) + mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, deid); + if ((u32)~0 == mi) { - p = hash_get_mem(lcm->locator_set_index_by_name, a->name); - if (!p) - { - clib_warning("locator-set %v doesn't exists", a->name); - return -1; - } + clib_warning ("eid %U marked for removal, but not found in " + "map-cache!", unformat_gid_address, deid); + return VNET_API_ERROR_INVALID_VALUE; } - else - *p = a->index; - ls = pool_elt_at_index(lcm->locator_set_pool, p[0]); - if (!ls) - { - clib_warning("locator-set with index %d doesn't exists", p[0]); - return -1; - } -// /* XXX what happens when a mapping is configured to use the loc-set ? */ -// if (vec_len (vec_elt_at_index(lcm->locator_set_to_eids, p[0])) != 0) -// { -// clib_warning ("Can't delete a locator that supports a mapping!"); -// return -1; -// } + /* delete forwarding entry */ + del_fwd_entry (lcm, 0, mi); - if (vec_len(lcm->locator_set_to_eids) != 0) - { - eid_indexes = vec_elt_at_index(lcm->locator_set_to_eids, p[0]); - if (vec_len(eid_indexes[0]) != 0) - { - clib_warning ("Can't delete a locator that supports a mapping!"); - return -1; - } - } + dm_args->is_add = 0; + gid_address_copy (&dm_args->deid, deid); + map = pool_elt_at_index (lcm->mapping_pool, mi); + dm_args->locator_set_index = map->locator_set_index; - /* clean locator to locator-sets data */ - clean_locator_to_locator_set (lcm, p[0]); + /* delete mapping associated to fwd entry */ + vnet_lisp_add_del_mapping (dm_args, 0); - if (ls->local) - { - u32 it, lsi; + refc = hash_get (lcm->dp_if_refcount_by_vni, vni); + ASSERT(refc != 0); + refc[0]--; - vec_foreach_index(it, lcm->local_locator_set_indexes) - { - lsi = vec_elt(lcm->local_locator_set_indexes, it); - if (lsi == p[0]) - { - vec_del1(lcm->local_locator_set_indexes, it); - break; - } - } - hash_unset_mem(lcm->locator_set_index_by_name, ls->name); - vec_free(ls->name); + /* remove iface if needed */ + if (refc[0] == 0) + { + ai->is_add = 0; + ai->vni = vni; + ai->table_id = p[0]; + vnet_lisp_gpe_add_del_iface (ai, 0); + hash_unset (lcm->dp_if_refcount_by_vni, vni); } - pool_put(lcm->locator_set_pool, ls); } - return 0; + return rv; } -static inline -uword *vnet_lisp_get_locator(vnet_lisp_add_del_locator_set_args_t * a, - uword *p) +/** + * Adds/removes/updates static remote mapping. + * + * This function also modifies forwarding entries if needed. + * + * @param deid destination EID + * @param seid source EID + * @param rlocs vector of remote locators + * @param action action for negative map-reply + * @param is_add add mapping if non-zero, delete otherwise + * @param del_all if set, delete all remote mappings + * @return return code + */ +int +vnet_lisp_add_del_remote_mapping (gid_address_t * deid, gid_address_t * seid, + ip_address_t * rlocs, u8 action, u8 is_add, + u8 del_all) { - lisp_cp_main_t * lcm = vnet_lisp_cp_get_main(); + vnet_lisp_add_del_mapping_args_t _dm_args, * dm_args = &_dm_args; + vnet_lisp_add_del_mapping_args_t _sm_args, * sm_args = &_sm_args; + vnet_lisp_add_del_locator_set_args_t _ls, * ls = &_ls; + lisp_cp_main_t * lcm = vnet_lisp_cp_get_main (); + u32 mi, ls_index = 0, dst_map_index, src_map_index; + locator_t loc; + ip_address_t * dl; + int rc = -1; - ASSERT(a != NULL); - ASSERT(p != NULL); + if (vnet_lisp_enable_disable_status() == 0) + { + clib_warning ("LISP is disabled!"); + return VNET_API_ERROR_LISP_DISABLED; + } - /* find locator-set */ - if (a->local) - { - p = hash_get_mem(lcm->locator_set_index_by_name, a->name); - } - else - { - *p = a->index; - } + if (del_all) + return vnet_lisp_clear_all_remote_mappings (); - return p; -} + memset (sm_args, 0, sizeof (sm_args[0])); + memset (dm_args, 0, sizeof (dm_args[0])); + memset (ls, 0, sizeof (ls[0])); -int -vnet_lisp_add_del_locator_set_name (vnet_lisp_add_del_locator_set_args_t * a, - u32 * ls_result) -{ - lisp_cp_main_t * lcm = vnet_lisp_cp_get_main(); - locator_set_t * ls; - uword _p = (u32)~0, * p = &_p; - u32 ls_index = ~0; - u32 **eid_indexes = NULL; + /* prepare remote locator set */ + vec_foreach (dl, rlocs) + { + memset (&loc, 0, sizeof (loc)); + gid_address_ip (&loc.address) = dl[0]; + vec_add1 (ls->locators, loc); + } + src_map_index = gid_dictionary_lookup (&lcm->mapping_index_by_gid, seid); - ASSERT(a != NULL); - ASSERT(ls_result != NULL); + mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, deid); + /* new mapping */ + if ((u32)~0 == mi) + { + ls->is_add = 1; + ls->index = ~0; - p = vnet_lisp_get_locator(a, p); + /* process a negative mapping */ + if (0 == vec_len (rlocs)) + return lisp_add_del_negative_static_mapping (deid, ls, + action, is_add); - if (a->is_add) - { - /* overwrite */ - if (p && p[0] != (u32)~0) + if ((u32)~0 == src_map_index) { - ls = pool_elt_at_index(lcm->locator_set_pool, p[0]); - if (!ls) - { - clib_warning("locator-set %d to be overwritten doesn't exist!", - p[0]); - return VNET_API_ERROR_UNSPECIFIED; - } + clib_warning ("seid %U not found!", format_gid_address, seid); + goto done; + } - /* clean locator to locator-set vectors and remove locators if - * they're not part of another locator-set */ - clean_locator_to_locator_set (lcm, p[0]); + if (!is_add) + { + clib_warning ("deid %U marked for removal but not " + "found!", format_gid_address, deid); + goto done; + } - /* remove locator indices from locator set */ - vec_free(ls->locator_indices); + vnet_lisp_add_del_locator_set (ls, &ls_index); - ls_index = p[0]; + /* add mapping */ + gid_address_copy (&dm_args->deid, deid); + dm_args->is_add = 1; + dm_args->action = action; + dm_args->locator_set_index = ls_index; + vnet_lisp_add_del_mapping (dm_args, &dst_map_index); - if (ls_result) - ls_result[0] = p[0]; + /* add fwd tunnel */ + add_fwd_entry (lcm, src_map_index, dst_map_index); + } + else + { + /* delete mapping */ + if (!is_add) + { + /* delete forwarding entry */ + del_fwd_entry (lcm, 0, mi); + dm_args->is_add = 0; + gid_address_copy (&dm_args->deid, deid); + mapping_t * map = pool_elt_at_index (lcm->mapping_pool, mi); + dm_args->locator_set_index = map->locator_set_index; + + /* delete mapping associated to fwd entry */ + vnet_lisp_add_del_mapping (dm_args, 0); + + ls->is_add = 0; + ls->index = map->locator_set_index; + /* delete locator set */ + vnet_lisp_add_del_locator_set (ls, 0); } - /* new locator-set */ + /* update existing locator set */ else { - pool_get(lcm->locator_set_pool, ls); - ls_index = ls - lcm->locator_set_pool; - + if ((u32)~0 == src_map_index) + { + clib_warning ("seid %U not found!", format_gid_address, seid); + goto done; + } + + mapping_t * old_map; + locator_set_t * old_ls; + old_map = pool_elt_at_index (lcm->mapping_pool, mi); + + /* update mapping attributes */ + old_map->action = action; + + old_ls = pool_elt_at_index(lcm->locator_set_pool, + old_map->locator_set_index); + if (compare_locators (lcm, old_ls->locator_indices, + ls->locators)) + { + /* set locator-set index to overwrite */ + ls->is_add = 1; + ls->index = old_map->locator_set_index; + vnet_lisp_add_del_locator_set (ls, 0); + add_fwd_entry (lcm, src_map_index, mi); + } + } + } + /* success */ + rc = 0; +done: + vec_free (ls->locators); + return rc; +} + +int +vnet_lisp_clear_all_remote_mappings (void) +{ + int rv = 0; + u32 mi, * map_indices = 0, * map_indexp; + lisp_cp_main_t * lcm = vnet_lisp_cp_get_main (); + vnet_lisp_add_del_mapping_args_t _dm_args, * dm_args = &_dm_args; + vnet_lisp_add_del_locator_set_args_t _ls, * ls = &_ls; + + pool_foreach_index (mi, lcm->mapping_pool, + ({ + vec_add1 (map_indices, mi); + })); + + vec_foreach (map_indexp, map_indices) + { + mapping_t * map = pool_elt_at_index (lcm->mapping_pool, map_indexp[0]); + if (!map->local) + { + del_fwd_entry (lcm, 0, map_indexp[0]); + + dm_args->is_add = 0; + gid_address_copy (&dm_args->deid, &map->eid); + dm_args->locator_set_index = map->locator_set_index; + + /* delete mapping associated to fwd entry */ + vnet_lisp_add_del_mapping (dm_args, 0); + + ls->is_add = 0; + ls->local = 0; + ls->index = map->locator_set_index; + /* delete locator set */ + rv = vnet_lisp_add_del_locator_set (ls, 0); + if (rv != 0) + goto cleanup; + } + } + +cleanup: + if (map_indices) + vec_free (map_indices); + return rv; +} + +/** + * Handler for add/del remote mapping CLI. + * + * @param vm vlib context + * @param input input from user + * @param cmd cmd + * @return pointer to clib error structure + */ +static clib_error_t * +lisp_add_del_remote_mapping_command_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + clib_error_t * error = 0; + unformat_input_t _line_input, * line_input = &_line_input; + u8 is_add = 1, del_all = 0; + ip_address_t rloc, * rlocs = 0; + ip_prefix_t * deid_ippref, * seid_ippref; + gid_address_t seid, deid; + u8 deid_set = 0, seid_set = 0; + u8 * s = 0; + u32 vni, action = ~0; + + /* Get a line of input. */ + if (! unformat_user (input, unformat_line_input, line_input)) + return 0; + + memset (&deid, 0, sizeof (deid)); + memset (&seid, 0, sizeof (seid)); + + seid_ippref = &gid_address_ippref(&seid); + deid_ippref = &gid_address_ippref(&deid); + + gid_address_type (&deid) = GID_ADDR_IP_PREFIX; + gid_address_type (&seid) = GID_ADDR_IP_PREFIX; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (line_input, "del-all")) + del_all = 1; + else if (unformat (line_input, "del")) + is_add = 0; + else if (unformat (line_input, "add")) + ; + else if (unformat (line_input, "deid %U", + unformat_ip_prefix, deid_ippref)) + { + deid_set = 1; + } + else if (unformat (line_input, "vni %u", &vni)) + { + gid_address_vni (&seid) = vni; + gid_address_vni (&deid) = vni; + } + else if (unformat (line_input, "seid %U", + unformat_ip_prefix, seid_ippref)) + { + seid_set = 1; + } + else if (unformat (line_input, "rloc %U", unformat_ip_address, &rloc)) + vec_add1 (rlocs, rloc); + else if (unformat (line_input, "action %s", &s)) + { + if (!strcmp ((char *)s, "no-action")) + action = ACTION_NONE; + if (!strcmp ((char *)s, "natively-forward")) + action = ACTION_NATIVELY_FORWARDED; + if (!strcmp ((char *)s, "send-map-request")) + action = ACTION_SEND_MAP_REQUEST; + else if (!strcmp ((char *)s, "drop")) + action = ACTION_DROP; + else + { + clib_warning ("invalid action: '%s'", s); + goto done; + } + } + else + { + clib_warning ("parse error"); + goto done; + } + } + + if (!del_all) + { + if (!deid_set) + { + clib_warning ("missing deid!"); + goto done; + } + + /* if seid not set, make sure the ip version is the same as that of the + * deid. This ensures the seid to be configured will be either 0/0 or + * ::/0 */ + if (!seid_set) + ip_prefix_version(seid_ippref) = ip_prefix_version(deid_ippref); + + if (is_add && + (ip_prefix_version (deid_ippref) != ip_prefix_version(seid_ippref))) + { + clib_warning ("source and destination EIDs are not" + " in the same IP family!"); + goto done; + } + + if (is_add && (~0 == action) + && 0 == vec_len (rlocs)) + { + clib_warning ("no action set for negative map-reply!"); + goto done; + } + } + + int rv = vnet_lisp_add_del_remote_mapping (&deid, &seid, rlocs, + action, is_add, del_all); + if (rv) + clib_warning ("failed to %s remote mapping!", + is_add ? "add" : "delete"); + +done: + unformat_free (line_input); + if (s) + vec_free (s); + return error; +} + +VLIB_CLI_COMMAND (lisp_add_del_remote_mapping_command) = { + .path = "lisp remote-mapping", + .short_help = "lisp remote-mapping add|del [del-all] vni " + "deid seid [action ] rloc [rloc ... ]", + .function = lisp_add_del_remote_mapping_command_fn, +}; + +static clib_error_t * +lisp_show_map_resolvers_command_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + ip_address_t * addr; + lisp_cp_main_t * lcm = vnet_lisp_cp_get_main (); + + vec_foreach (addr, lcm->map_resolvers) + { + vlib_cli_output (vm, "%U", format_ip_address, addr); + } + return 0; +} + +VLIB_CLI_COMMAND (lisp_show_map_resolvers_command) = { + .path = "show lisp map-resolvers", + .short_help = "show lisp map-resolvers", + .function = lisp_show_map_resolvers_command_fn, +}; + +int +vnet_lisp_pitr_set_locator_set (u8 * locator_set_name, u8 is_add) +{ + lisp_cp_main_t * lcm = vnet_lisp_cp_get_main (); + u32 locator_set_index = ~0; + mapping_t * m; + uword * p; + + if (vnet_lisp_enable_disable_status () == 0) + { + clib_warning ("LISP is disabled!"); + return VNET_API_ERROR_LISP_DISABLED; + } + + p = hash_get_mem (lcm->locator_set_index_by_name, locator_set_name); + if (!p) + { + clib_warning ("locator-set %v doesn't exist", locator_set_name); + return -1; + } + locator_set_index = p[0]; + + if (is_add) + { + pool_get (lcm->mapping_pool, m); + m->locator_set_index = locator_set_index; + m->local = 1; + lcm->pitr_map_index = m - lcm->mapping_pool; + + /* enable pitr mode */ + lcm->lisp_pitr = 1; + } + else + { + /* remove pitr mapping */ + pool_put_index (lcm->mapping_pool, lcm->pitr_map_index); + + /* disable pitr mode */ + lcm->lisp_pitr = 0; + } + return 0; +} + +static clib_error_t * +lisp_pitr_set_locator_set_command_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + u8 locator_name_set = 0; + u8 * locator_set_name = 0; + u8 is_add = 1; + unformat_input_t _line_input, * line_input = &_line_input; + clib_error_t * error = 0; + int rv = 0; + + /* Get a line of input. */ + if (! unformat_user (input, unformat_line_input, line_input)) + return 0; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (line_input, "ls %_%v%_", &locator_set_name)) + locator_name_set = 1; + else if (unformat (line_input, "disable")) + is_add = 0; + else + return clib_error_return (0, "parse error"); + } + + if (!locator_name_set) + { + clib_warning ("No locator set specified!"); + goto done; + } + rv = vnet_lisp_pitr_set_locator_set (locator_set_name, is_add); + if (0 != rv) + { + error = clib_error_return(0, "failed to %s pitr!", + is_add ? "add" : "delete"); + } + +done: + if (locator_set_name) + vec_free (locator_set_name); + return error; +} + +VLIB_CLI_COMMAND (lisp_pitr_set_locator_set_command) = { + .path = "lisp pitr", + .short_help = "lisp pitr [disable] ls ", + .function = lisp_pitr_set_locator_set_command_fn, +}; + + +static u8 * +format_eid_entry (u8 * s, va_list * args) +{ + vnet_main_t * vnm = va_arg (*args, vnet_main_t *); + lisp_cp_main_t * lcm = va_arg (*args, lisp_cp_main_t *); + gid_address_t * gid = va_arg (*args, gid_address_t *); + locator_set_t * ls = va_arg (*args, locator_set_t *); + u32 * loc_index; + u8 first_line = 1; + u8 * loc; + + u8 * type = ls->local ? format(0, "local(%s)", ls->name) + : format(0, "remote"); + + if (vec_len (ls->locator_indices) == 0) + { + s = format (s, "%-35U%-20s", format_gid_address, gid, type); + } + else + { + vec_foreach (loc_index, ls->locator_indices) + { + locator_t * l = pool_elt_at_index (lcm->locator_pool, loc_index[0]); + if (l->local) + loc = format (0, "%U", format_vnet_sw_if_index_name, vnm, + l->sw_if_index); + else + loc = format (0, "%U", format_ip_address, + &gid_address_ip (&l->address)); + + if (first_line) + { + s = format (s, "%-35U%-20s%-v\n", format_gid_address, + gid, type, loc); + first_line = 0; + } + else + s = format (s, "%55s%v\n", "", loc); + } + } + return s; +} + +static clib_error_t * +lisp_show_eid_table_command_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + lisp_cp_main_t * lcm = vnet_lisp_cp_get_main(); + mapping_t * mapit; + + vlib_cli_output (vm, "%-35s%-20s%-s", "EID", "type", "locators"); + pool_foreach (mapit, lcm->mapping_pool, + ({ + locator_set_t * ls = pool_elt_at_index (lcm->locator_set_pool, + mapit->locator_set_index); + vlib_cli_output (vm, "%U", format_eid_entry, lcm->vnet_main, + lcm, &mapit->eid, ls); + })); + + return 0; +} + +VLIB_CLI_COMMAND (lisp_cp_show_eid_table_command) = { + .path = "show lisp eid-table", + .short_help = "Shows EID table", + .function = lisp_show_eid_table_command_fn, +}; + +/* cleans locator to locator-set data and removes locators not part of + * any locator-set */ +static void +clean_locator_to_locator_set (lisp_cp_main_t * lcm, u32 lsi) +{ + u32 i, j, *loc_indexp, *ls_indexp, **ls_indexes, *to_be_deleted = 0; + locator_set_t * ls = pool_elt_at_index(lcm->locator_set_pool, lsi); + for (i = 0; i < vec_len(ls->locator_indices); i++) + { + loc_indexp = vec_elt_at_index(ls->locator_indices, i); + ls_indexes = vec_elt_at_index(lcm->locator_to_locator_sets, + loc_indexp[0]); + for (j = 0; j < vec_len(ls_indexes[0]); j++) + { + ls_indexp = vec_elt_at_index(ls_indexes[0], j); + if (ls_indexp[0] == lsi) + break; + } + + /* delete index for removed locator-set*/ + vec_del1(ls_indexes[0], j); + + /* delete locator if it's part of no locator-set */ + if (vec_len (ls_indexes[0]) == 0) + { + pool_put_index (lcm->locator_pool, loc_indexp[0]); + vec_add1 (to_be_deleted, i); + } + } + + if (to_be_deleted) + { + for (i = 0; i < vec_len (to_be_deleted); i++) + { + loc_indexp = vec_elt_at_index (to_be_deleted, i); + vec_del1 (ls->locator_indices, loc_indexp[0]); + } + vec_free (to_be_deleted); + } +} + +static inline +uword *get_locator_set_index(vnet_lisp_add_del_locator_set_args_t * a, + uword * p) +{ + lisp_cp_main_t * lcm = vnet_lisp_cp_get_main(); + + ASSERT(a != NULL); + ASSERT(p != NULL); + + /* find locator-set */ + if (a->local) + { + p = hash_get_mem(lcm->locator_set_index_by_name, a->name); + } + else + { + *p = a->index; + } + + return p; +} + +static inline +int is_locator_in_locator_set(lisp_cp_main_t * lcm, locator_set_t * ls, + locator_t * loc) +{ + locator_t * itloc; + u32 * locit; + + ASSERT(ls != NULL); + ASSERT(loc != NULL); + + vec_foreach(locit, ls->locator_indices) + { + itloc = pool_elt_at_index(lcm->locator_pool, locit[0]); + if (itloc->sw_if_index == loc->sw_if_index || + !gid_address_cmp(&itloc->address, &loc->address)) + { + clib_warning("Duplicate locator"); + return VNET_API_ERROR_VALUE_EXIST; + } + } + + return 0; +} + +static inline +void remove_locator_from_locator_set(locator_set_t * ls, u32 * locit, + u32 ls_index, u32 loc_id) +{ + lisp_cp_main_t * lcm = vnet_lisp_cp_get_main(); + u32 ** ls_indexes = NULL; + + ASSERT(ls != NULL); + ASSERT(locit != NULL); + + ls_indexes = vec_elt_at_index(lcm->locator_to_locator_sets, + locit[0]); + pool_put_index(lcm->locator_pool, locit[0]); + vec_del1(ls->locator_indices, loc_id); + vec_del1(ls_indexes[0], ls_index); +} + +int +vnet_lisp_add_del_locator (vnet_lisp_add_del_locator_set_args_t * a, + locator_set_t * ls, u32 * ls_result) +{ + lisp_cp_main_t * lcm = vnet_lisp_cp_get_main(); + locator_t * loc = NULL, *itloc = NULL; + uword _p = (u32)~0, * p = &_p; + u32 loc_index = ~0, ls_index = ~0, * locit = NULL, ** ls_indexes = NULL; + u32 loc_id = ~0; + int ret = 0; + + ASSERT(a != NULL); + + if (vnet_lisp_enable_disable_status () == 0) + { + clib_warning ("LISP is disabled!"); + return VNET_API_ERROR_LISP_DISABLED; + } + + p = get_locator_set_index(a, p); + if (!p) + { + clib_warning("locator-set %v doesn't exist", a->name); + return VNET_API_ERROR_INVALID_ARGUMENT; + } + + if (ls == 0) + { + ls = pool_elt_at_index(lcm->locator_set_pool, p[0]); + if (!ls) + { + clib_warning("locator-set %d to be overwritten doesn't exist!", + p[0]); + return VNET_API_ERROR_INVALID_ARGUMENT; + } + } + + if (a->is_add) + { + + if (ls_result) + ls_result[0] = p[0]; + + /* allocate locators */ + vec_foreach (itloc, a->locators) + { + ret = is_locator_in_locator_set(lcm, ls, itloc); + if (0 != ret) + { + return ret; + } + + pool_get(lcm->locator_pool, loc); + loc[0] = itloc[0]; + loc_index = loc - lcm->locator_pool; + + vec_add1(ls->locator_indices, loc_index); + + vec_validate (lcm->locator_to_locator_sets, loc_index); + ls_indexes = vec_elt_at_index(lcm->locator_to_locator_sets, + loc_index); + vec_add1(ls_indexes[0], ls_index); + } + } + else + { + ls_index = p[0]; + + itloc = a->locators; + loc_id = 0; + vec_foreach (locit, ls->locator_indices) + { + loc = pool_elt_at_index(lcm->locator_pool, locit[0]); + + if (loc->local && loc->sw_if_index == itloc->sw_if_index) + { + remove_locator_from_locator_set(ls, locit, + ls_index, loc_id); + } + if (0 == loc->local && + !gid_address_cmp(&loc->address, &itloc->address)) + { + remove_locator_from_locator_set(ls, locit, + ls_index, loc_id); + } + + loc_id++; + } + } + + return 0; +} + +int +vnet_lisp_add_del_locator_set (vnet_lisp_add_del_locator_set_args_t * a, + u32 * ls_result) +{ + lisp_cp_main_t * lcm = vnet_lisp_cp_get_main(); + locator_set_t * ls; + uword _p = (u32)~0, * p = &_p; + u32 ls_index; + u32 ** eid_indexes; + int ret = 0; + + if (vnet_lisp_enable_disable_status () == 0) + { + clib_warning ("LISP is disabled!"); + return VNET_API_ERROR_LISP_DISABLED; + } + + if (a->is_add) + { + p = get_locator_set_index(a, p); + + /* overwrite */ + if (p && p[0] != (u32)~0) + { + ls = pool_elt_at_index(lcm->locator_set_pool, p[0]); + if (!ls) + { + clib_warning("locator-set %d to be overwritten doesn't exist!", + p[0]); + return -1; + } + + /* clean locator to locator-set vectors and remove locators if + * they're not part of another locator-set */ + clean_locator_to_locator_set (lcm, p[0]); + + /* remove locator indices from locator set */ + vec_free(ls->locator_indices); + + ls_index = p[0]; + + if (ls_result) + ls_result[0] = p[0]; + } + /* new locator-set */ + else + { + pool_get(lcm->locator_set_pool, ls); + memset(ls, 0, sizeof(*ls)); + ls_index = ls - lcm->locator_set_pool; + if (a->local) { ls->name = vec_dup(a->name); @@ -524,25 +1222,38 @@ vnet_lisp_add_del_locator_set_name (vnet_lisp_add_del_locator_set_args_t * a, vec_add1(lcm->local_locator_set_indexes, ls_index); } ls->local = a->local; - ls->locator_indices = NULL; if (ls_result) ls_result[0] = ls_index; } + + ret = vnet_lisp_add_del_locator(a, ls, NULL); + if (0 != ret) + { + return ret; + } } else { - if (!p) - { - clib_warning("locator-set %v doesn't exists", a->name); - return VNET_API_ERROR_INVALID_ARGUMENT; - } + p = get_locator_set_index(a, p); + if (!p) + { + clib_warning("locator-set %v doesn't exists", a->name); + return -1; + } + + ls = pool_elt_at_index(lcm->locator_set_pool, p[0]); + if (!ls) + { + clib_warning("locator-set with index %d doesn't exists", p[0]); + return -1; + } - ls = pool_elt_at_index(lcm->locator_set_pool, p[0]); - if (!ls) - { - clib_warning("locator-set with index %d doesn't exists", p[0]); - return VNET_API_ERROR_INVALID_ARGUMENT; - } + if (lcm->mreq_itr_rlocs == p[0]) + { + clib_warning ("Can't delete the locator-set used to constrain " + "the itr-rlocs in map-requests!"); + return -1; + } if (vec_len(lcm->locator_set_to_eids) != 0) { @@ -562,101 +1273,179 @@ vnet_lisp_add_del_locator_set_name (vnet_lisp_add_del_locator_set_args_t * a, u32 it, lsi; vec_foreach_index(it, lcm->local_locator_set_indexes) - { - lsi = vec_elt(lcm->local_locator_set_indexes, it); - if (lsi == p[0]) - { - vec_del1(lcm->local_locator_set_indexes, it); - break; - } - } + { + lsi = vec_elt(lcm->local_locator_set_indexes, it); + if (lsi == p[0]) + { + vec_del1(lcm->local_locator_set_indexes, it); + break; + } + } hash_unset_mem(lcm->locator_set_index_by_name, ls->name); - vec_free(ls->name); } + vec_free(ls->name); + vec_free(ls->locator_indices); pool_put(lcm->locator_set_pool, ls); } return 0; } -int -vnet_lisp_add_del_locator (vnet_lisp_add_del_locator_set_args_t *a, - u32 *ls_result) +clib_error_t * +vnet_lisp_enable_disable (u8 is_enabled) { - lisp_cp_main_t * lcm = vnet_lisp_cp_get_main(); - locator_set_t *ls = NULL; - locator_t *loc = NULL, *itloc = NULL; - uword _p = (u32)~0, * p = &_p; - u32 loc_index = ~0, ls_index = ~0, *locit = NULL, **ls_indexes = NULL; - u32 i = ~0; - - ASSERT(a != NULL); - ASSERT(ls_result != NULL); - - p = vnet_lisp_get_locator(a, p); - if (!p) { - clib_warning("locator-set %v doesn't exists", a->name); - return VNET_API_ERROR_INVALID_ARGUMENT; - } + vnet_lisp_gpe_add_del_iface_args_t _ai, * ai= &_ai; + uword * table_id, * refc; + u32 i; + clib_error_t * error = 0; + lisp_cp_main_t * lcm = vnet_lisp_cp_get_main (); + vnet_lisp_gpe_enable_disable_args_t _a, * a = &_a; - ls_index = p[0]; + a->is_en = is_enabled; + error = vnet_lisp_gpe_enable_disable (a); + if (error) + { + return clib_error_return (0, "failed to %s data-plane!", + a->is_en ? "enable" : "disable"); + } - if (a->is_add) + if (is_enabled) { - ls = pool_elt_at_index(lcm->locator_set_pool, p[0]); - if (!ls) + /* enable all ifaces */ + for (i = 0; i < vec_len (lcm->local_mappings_indexes); i++) { - clib_warning("locator-set %d to be overwritten doesn't exist!", - p[0]); - return VNET_API_ERROR_INVALID_ARGUMENT; + mapping_t * m = vec_elt_at_index (lcm->mapping_pool, i); + ai->is_add = 1; + ai->vni = gid_address_vni (&m->eid); + + refc = hash_get (lcm->dp_if_refcount_by_vni, ai->vni); + if (!refc) + { + table_id = hash_get (lcm->table_id_by_vni, ai->vni); + if (table_id) + { + ai->table_id = table_id[0]; + /* enables interface and adds defaults */ + vnet_lisp_gpe_add_del_iface (ai, 0); + } + else + return clib_error_return (0, "no table_id found for vni %u!", + ai->vni); + + hash_set (lcm->dp_if_refcount_by_vni, ai->vni, 1); + } + else + { + refc[0]++; + } } + } + else + { + /* clear refcount table */ + hash_free (lcm->dp_if_refcount_by_vni); + hash_free (lcm->fwd_entry_by_mapping_index); + pool_free (lcm->fwd_entry_pool); + } - if (ls_result) - ls_result[0] = p[0]; + /* update global flag */ + lcm->is_enabled = is_enabled; + + return 0; +} - /* allocate locators */ - itloc = a->locators; - pool_get(lcm->locator_pool, loc); - loc[0] = itloc[0]; - loc_index = loc - lcm->locator_pool; +static clib_error_t * +lisp_enable_disable_command_fn (vlib_main_t * vm, unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + unformat_input_t _line_input, * line_input = &_line_input; + u8 is_enabled = 0; + u8 is_set = 0; - vec_add1(ls->locator_indices, loc_index); + /* Get a line of input. */ + if (! unformat_user (input, unformat_line_input, line_input)) + return 0; - vec_validate (lcm->locator_to_locator_sets, loc_index); - ls_indexes = vec_elt_at_index(lcm->locator_to_locator_sets, - loc_index); - vec_add1(ls_indexes[0], ls_index); - } - else + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - ls = pool_elt_at_index(lcm->locator_set_pool, p[0]); - if (!ls) + if (unformat (line_input, "enable")) { - clib_warning("locator-set with index %d doesn't exists", p[0]); - return VNET_API_ERROR_INVALID_ARGUMENT; + is_set = 1; + is_enabled = 1; + } + else if (unformat (line_input, "disable")) + is_set = 1; + else + { + return clib_error_return (0, "parse error: '%U'", + format_unformat_error, line_input); } - - if (ls->local) - { - itloc = a->locators; - i = 0; - vec_foreach (locit, ls->locator_indices) - { - loc = pool_elt_at_index(lcm->locator_pool, locit[0]); - if (loc->local && loc->sw_if_index == itloc->sw_if_index) - { - ls_indexes = vec_elt_at_index(lcm->locator_to_locator_sets, - locit[0]); - pool_put_index(lcm->locator_pool, locit[0]); - vec_del1(ls->locator_indices, i); - vec_del1(ls_indexes[0], ls_index); - } - i++; - } - } } + + if (!is_set) + return clib_error_return (0, "state not set"); + + return vnet_lisp_enable_disable (is_enabled); +} + +VLIB_CLI_COMMAND (lisp_cp_enable_disable_command) = { + .path = "lisp", + .short_help = "lisp [enable|disable]", + .function = lisp_enable_disable_command_fn, +}; + +u8 +vnet_lisp_enable_disable_status (void) +{ + lisp_cp_main_t * lcm = vnet_lisp_cp_get_main (); + return lcm->is_enabled; +} + +static u8 * +format_lisp_status (u8 * s, va_list * args) +{ + lisp_cp_main_t * lcm = vnet_lisp_cp_get_main (); + return format (s, "%s", lcm->is_enabled ? "enabled" : "disabled"); +} + +static clib_error_t * +lisp_show_status_command_fn (vlib_main_t * vm, unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + u8 * msg = 0; + msg = format (msg, "feature: %U\ngpe: %U\n", + format_lisp_status, format_vnet_lisp_gpe_status); + vlib_cli_output (vm, "%v", msg); + vec_free (msg); + return 0; +} + +VLIB_CLI_COMMAND (lisp_show_status_command) = { + .path = "show lisp status", + .short_help = "show lisp status", + .function = lisp_show_status_command_fn, +}; + +static clib_error_t * +lisp_show_eid_table_map_command_fn (vlib_main_t * vm, unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + hash_pair_t * p; + lisp_cp_main_t * lcm = vnet_lisp_cp_get_main (); + + vlib_cli_output (vm, "%=10s%=10s", "VNI", "VRF"); + hash_foreach_pair (p, lcm->table_id_by_vni, + { + vlib_cli_output (vm, "%=10d%=10d", p->key, p->value[0]); + }); return 0; } +VLIB_CLI_COMMAND (lisp_show_eid_table_map_command) = { + .path = "show lisp eid-table map", + .short_help = "show lisp eid-table vni to vrf mappings", + .function = lisp_show_eid_table_map_command_fn, +}; + static clib_error_t * lisp_add_del_locator_set_command_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) @@ -670,6 +1459,7 @@ lisp_add_del_locator_set_command_fn (vlib_main_t * vm, unformat_input_t * input, locator_t locator, * locators = 0; vnet_lisp_add_del_locator_set_args_t _a, * a = &_a; u32 ls_index = 0; + int rv = 0; memset(&locator, 0, sizeof(locator)); memset(a, 0, sizeof(a[0])); @@ -703,21 +1493,97 @@ lisp_add_del_locator_set_command_fn (vlib_main_t * vm, unformat_input_t * input, a->is_add = is_add; a->local = 1; - vnet_lisp_add_del_locator_set(a, &ls_index); + rv = vnet_lisp_add_del_locator_set(a, &ls_index); + if (0 != rv) + { + error = clib_error_return(0, "failed to %s locator-set!", + is_add ? "add" : "delete"); + } done: vec_free(locators); - vec_free(locator_set_name); + if (locator_set_name) + vec_free (locator_set_name); return error; } VLIB_CLI_COMMAND (lisp_cp_add_del_locator_set_command) = { .path = "lisp locator-set", - .short_help = "lisp locator-set add/del iface " - " ", + .short_help = "lisp locator-set add/del [iface " + "p w ]", .function = lisp_add_del_locator_set_command_fn, }; +static clib_error_t * +lisp_add_del_locator_in_set_command_fn (vlib_main_t * vm, unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + lisp_gpe_main_t * lgm = &lisp_gpe_main; + vnet_main_t * vnm = lgm->vnet_main; + unformat_input_t _line_input, * line_input = &_line_input; + u8 is_add = 1; + clib_error_t * error = 0; + u8 * locator_set_name = 0; + u8 locator_set_name_set = 0; + locator_t locator, * locators = 0; + vnet_lisp_add_del_locator_set_args_t _a, * a = &_a; + u32 ls_index = 0; + + memset(&locator, 0, sizeof(locator)); + memset(a, 0, sizeof(a[0])); + + /* Get a line of input. */ + if (! unformat_user (input, unformat_line_input, line_input)) + return 0; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (line_input, "add")) + is_add = 1; + else if (unformat (line_input, "del")) + is_add = 0; + else if (unformat(line_input, "locator-set %_%v%_", &locator_set_name)) + locator_set_name_set = 1; + else if (unformat (line_input, "iface %U p %d w %d", + unformat_vnet_sw_interface, vnm, &locator.sw_if_index, + &locator.priority, &locator.weight)) + { + locator.local = 1; + vec_add1(locators, locator); + } + else + { + error = unformat_parse_error(line_input); + goto done; + } + } + + if (!locator_set_name_set) + { + error = clib_error_return(0, "locator_set name not set!"); + goto done; + } + + a->name = locator_set_name; + a->locators = locators; + a->is_add = is_add; + a->local = 1; + + vnet_lisp_add_del_locator(a, 0, &ls_index); + + done: + vec_free(locators); + vec_free (locator_set_name); + return error; +} + +VLIB_CLI_COMMAND (lisp_cp_add_del_locator_in_set_command) = { + .path = "lisp locator", + .short_help = "lisp locator add/del locator-set iface " + "p w ", + .function = lisp_add_del_locator_in_set_command_fn, +}; + static clib_error_t * lisp_cp_show_locator_sets_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -733,16 +1599,23 @@ lisp_cp_show_locator_sets_command_fn (vlib_main_t * vm, pool_foreach (lsit, lcm->locator_set_pool, ({ u8 * msg = 0; - msg = format (msg, "%-16v", lsit->name); + int next_line = 0; + msg = format (msg, "%=16v", lsit->name); vec_foreach (locit, lsit->locator_indices) { + if (next_line) + { + msg = format (msg, "%16s", " "); + } loc = pool_elt_at_index (lcm->locator_pool, locit[0]); if (loc->local) - msg = format (msg, "%16d%16d%16d", loc->sw_if_index, loc->priority, + msg = format (msg, "%16d%16d%16d\n", loc->sw_if_index, loc->priority, loc->weight); else - msg = format (msg, "%16U%16d%16d", format_gid_address, &loc->address, - loc->priority, loc->weight); + msg = format (msg, "%16U%16d%16d\n", format_ip_address, + gid_address_ip(&loc->address), loc->priority, + loc->weight); + next_line = 1; } vlib_cli_output (vm, "%v", msg); vec_free (msg); @@ -763,6 +1636,12 @@ vnet_lisp_add_del_map_resolver (vnet_lisp_add_del_map_resolver_args_t * a) ip_address_t * addr; u32 i; + if (vnet_lisp_enable_disable_status () == 0) + { + clib_warning ("LISP is disabled!"); + return VNET_API_ERROR_LISP_DISABLED; + } + if (a->is_add) { vec_foreach(addr, lcm->map_resolvers) @@ -800,7 +1679,89 @@ lisp_add_del_map_resolver_command_fn (vlib_main_t * vm, u8 is_add = 1; ip_address_t ip_addr; clib_error_t * error = 0; - vnet_lisp_add_del_map_resolver_args_t _a, * a = &_a; + int rv = 0; + vnet_lisp_add_del_map_resolver_args_t _a, * a = &_a; + + /* Get a line of input. */ + if (! unformat_user (input, unformat_line_input, line_input)) + return 0; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (line_input, "add")) + is_add = 1; + else if (unformat (line_input, "del")) + is_add = 0; + else if (unformat (line_input, "%U", unformat_ip_address, &ip_addr)) + ; + else + { + error = unformat_parse_error(line_input); + goto done; + } + } + a->is_add = is_add; + a->address = ip_addr; + rv = vnet_lisp_add_del_map_resolver (a); + if (0 != rv) + { + error = clib_error_return(0, "failed to %s map-resolver!", + is_add ? "add" : "delete"); + } + + done: + return error; +} + +VLIB_CLI_COMMAND (lisp_add_del_map_resolver_command) = { + .path = "lisp map-resolver", + .short_help = "lisp map-resolver add/del ", + .function = lisp_add_del_map_resolver_command_fn, +}; + +int +vnet_lisp_add_del_mreq_itr_rlocs (vnet_lisp_add_del_mreq_itr_rloc_args_t * a) +{ + lisp_cp_main_t * lcm = vnet_lisp_cp_get_main(); + uword * p = 0; + + //TODO: Wait for merge https://gerrit.fd.io/r/#/c/1427/ +// if (vnet_lisp_enable_disable_status () == 0) +// { +// clib_warning ("LISP is disabled!"); +// return VNET_API_ERROR_LISP_DISABLED; +// } + + if (a->is_add) + { + p = hash_get_mem(lcm->locator_set_index_by_name, a->locator_set_name); + if (!p) + { + clib_warning("locator-set %v doesn't exist", a->locator_set_name); + return VNET_API_ERROR_INVALID_ARGUMENT; + } + + lcm->mreq_itr_rlocs = p[0]; + } + else + { + lcm->mreq_itr_rlocs = ~0; + } + + return 0; +} + +static clib_error_t * +lisp_add_del_mreq_itr_rlocs_command_fn(vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + unformat_input_t _line_input, * line_input = &_line_input; + u8 is_add = 1; + u8 * locator_set_name = 0; + clib_error_t * error = 0; + int rv = 0; + vnet_lisp_add_del_mreq_itr_rloc_args_t _a, * a = &_a; /* Get a line of input. */ if (! unformat_user (input, unformat_line_input, line_input)) @@ -808,30 +1769,65 @@ lisp_add_del_map_resolver_command_fn (vlib_main_t * vm, while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (line_input, "add")) - is_add = 1; - else if (unformat (line_input, "del")) + if (unformat (line_input, "del")) is_add = 0; - else if (unformat (line_input, "%U", unformat_ip_address, &ip_addr)) - ; + else if (unformat (line_input, "add %s", &locator_set_name)) + is_add = 1; else { error = unformat_parse_error(line_input); goto done; } } + a->is_add = is_add; - a->address = ip_addr; - vnet_lisp_add_del_map_resolver (a); + a->locator_set_name = locator_set_name; + rv = vnet_lisp_add_del_mreq_itr_rlocs (a); + if (0 != rv) + { + error = clib_error_return(0, "failed to %s map-request itr-rlocs!", + is_add ? "add" : "delete"); + } + + vec_free(locator_set_name); done: return error; + } -VLIB_CLI_COMMAND (lisp_add_del_map_resolver_command) = { - .path = "lisp map-resolver", - .short_help = "lisp map-resolver add/del ", - .function = lisp_add_del_map_resolver_command_fn, +VLIB_CLI_COMMAND (lisp_add_del_map_request_command) = { + .path = "lisp map-request itr-rlocs", + .short_help = "lisp map-request itr-rlocs add/del ", + .function = lisp_add_del_mreq_itr_rlocs_command_fn, +}; + +static clib_error_t * +lisp_show_mreq_itr_rlocs_command_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + lisp_cp_main_t * lcm = vnet_lisp_cp_get_main(); + locator_set_t * loc_set; + + vlib_cli_output (vm, "%=20s", "itr-rlocs"); + + if (~0 == lcm->mreq_itr_rlocs) + { + return 0; + } + + loc_set = pool_elt_at_index (lcm->locator_set_pool, lcm->mreq_itr_rlocs); + + vlib_cli_output (vm, "%=20s", loc_set->name); + + return 0; +} + +VLIB_CLI_COMMAND (lisp_show_map_request_command) = { + .path = "show lisp map-request itr-rlocs", + .short_help = "Shows map-request itr-rlocs", + .function = lisp_show_mreq_itr_rlocs_command_fn, }; /* Statistics (not really errors) */ @@ -864,7 +1860,7 @@ typedef enum typedef struct { gid_address_t dst_eid; - ip4_address_t map_resolver_ip; + ip_address_t map_resolver_ip; } lisp_cp_lookup_trace_t; u8 * @@ -880,6 +1876,49 @@ format_lisp_cp_lookup_trace (u8 * s, va_list * args) return s; } +ip_interface_address_t * +ip_interface_get_first_interface_address (ip_lookup_main_t *lm, u32 sw_if_index, + u8 loop) +{ + vnet_main_t *vnm = vnet_get_main (); + vnet_sw_interface_t * swif = vnet_get_sw_interface (vnm, sw_if_index); + if (loop && swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED) + sw_if_index = swif->unnumbered_sw_if_index; + u32 ia = + (vec_len((lm)->if_address_pool_index_by_sw_if_index) > (sw_if_index)) ? + vec_elt((lm)->if_address_pool_index_by_sw_if_index, (sw_if_index)) : + (u32) ~0; + return pool_elt_at_index((lm)->if_address_pool, ia); +} + +void * +ip_interface_get_first_address (ip_lookup_main_t * lm, u32 sw_if_index, + u8 version) +{ + ip_interface_address_t * ia; + + ia = ip_interface_get_first_interface_address (lm, sw_if_index, 1); + if (!ia) + return 0; + return ip_interface_address_get_address (lm, ia); +} + +int +ip_interface_get_first_ip_address (lisp_cp_main_t * lcm, u32 sw_if_index, + u8 version, ip_address_t * result) +{ + ip_lookup_main_t * lm; + void * addr; + + lm = (version == IP4) ? &lcm->im4->lookup_main : &lcm->im6->lookup_main; + addr = ip_interface_get_first_address (lm, sw_if_index, version); + if (!addr) + return 0; + + ip_address_set (result, addr, version); + return 1; +} + static u32 ip_fib_lookup_with_table (lisp_cp_main_t * lcm, u32 fib_index, ip_address_t * dst) @@ -891,92 +1930,105 @@ ip_fib_lookup_with_table (lisp_cp_main_t * lcm, u32 fib_index, return ip6_fib_lookup_with_table (lcm->im6, fib_index, &ip_addr_v6(dst)); } -void -get_local_iface_ip_for_dst (lisp_cp_main_t *lcm, ip_address_t * dst, - ip_address_t * sloc) +u32 +ip_fib_get_egress_iface_for_dst_with_lm (lisp_cp_main_t * lcm, + ip_address_t * dst, + ip_lookup_main_t * lm) { u32 adj_index; ip_adjacency_t * adj; - ip_interface_address_t * ia = 0; + + adj_index = ip_fib_lookup_with_table (lcm, 0, dst); + adj = ip_get_adjacency (lm, adj_index); + + if (adj == 0) + return ~0; + + /* we only want outgoing routes */ + if (adj->lookup_next_index != IP_LOOKUP_NEXT_ARP + && adj->lookup_next_index != IP_LOOKUP_NEXT_REWRITE) + return ~0; + + return adj->rewrite_header.sw_if_index; +} + +/** + * Find the sw_if_index of the interface that would be used to egress towards + * dst. + */ +u32 +ip_fib_get_egress_iface_for_dst (lisp_cp_main_t * lcm, ip_address_t * dst) +{ ip_lookup_main_t * lm; - ip4_address_t * l4 = 0; - ip6_address_t * l6 = 0; lm = ip_addr_version (dst) == IP4 ? &lcm->im4->lookup_main : &lcm->im6->lookup_main; - adj_index = ip_fib_lookup_with_table (lcm, 0, dst); - adj = ip_get_adjacency (lm, adj_index); + return ip_fib_get_egress_iface_for_dst_with_lm (lcm, dst, lm); +} - if (adj->lookup_next_index == IP_LOOKUP_NEXT_ARP) - { - ia = pool_elt_at_index(lm->if_address_pool, adj->if_address_index); - if (ip_addr_version(dst) == IP4) - { - l4 = ip_interface_address_get_address (lm, ia); - } - else - { - l6 = ip_interface_address_get_address (lm, ia); - } - } - else if (adj->lookup_next_index == IP_LOOKUP_NEXT_REWRITE) - { - /* find sw_if_index in rewrite header */ - u32 sw_if_index = adj->rewrite_header.sw_if_index; +/** + * Find first IP of the interface that would be used to egress towards dst. + * Returns 1 if the address is found 0 otherwise. + */ +int +ip_fib_get_first_egress_ip_for_dst (lisp_cp_main_t * lcm, ip_address_t * dst, + ip_address_t * result) +{ + u32 si; + ip_lookup_main_t * lm; + void * addr = 0; + u8 ipver; - /* find suitable address */ - if (ip_addr_version(dst) == IP4) - { - /* find the first ip address */ - foreach_ip_interface_address (&lcm->im4->lookup_main, ia, - sw_if_index, 1 /* unnumbered */, - ({ - l4 = ip_interface_address_get_address (&lcm->im4->lookup_main, ia); - break; - })); - } - else - { - /* find the first ip address */ - foreach_ip_interface_address (&lcm->im6->lookup_main, ia, - sw_if_index, 1 /* unnumbered */, - ({ - l6 = ip_interface_address_get_address (&lcm->im6->lookup_main, ia); - break; - })); - } - } - else - { - clib_warning("Can't find local local interface ip for dst %U", - format_ip_address, dst); - return; - } + ASSERT(result != 0); - if (l4) - { - ip_addr_v4(sloc).as_u32 = l4->as_u32; - ip_addr_version(sloc) = IP4; - } - else if (l6) + ipver = ip_addr_version(dst); + + lm = (ipver == IP4) ? &lcm->im4->lookup_main : &lcm->im6->lookup_main; + si = ip_fib_get_egress_iface_for_dst_with_lm (lcm, dst, lm); + + if ((u32) ~0 == si) + return 0; + + /* find the first ip address */ + addr = ip_interface_get_first_address (lm, si, ipver); + if (0 == addr) + return 0; + + ip_address_set (result, addr, ipver); + return 1; +} + +int +get_mr_and_local_iface_ip (lisp_cp_main_t * lcm, ip_address_t * mr_ip, + ip_address_t * sloc) +{ + ip_address_t * mrit; + + if (vec_len(lcm->map_resolvers) == 0) { - clib_memcpy (&ip_addr_v6(sloc), l6, sizeof(*l6)); - ip_addr_version(sloc) = IP6; + clib_warning("No map-resolver configured"); + return 0; } - else + + /* find the first mr ip we have a route to and the ip of the + * iface that has a route to it */ + vec_foreach(mrit, lcm->map_resolvers) { - clib_warning("Can't find local interface addr for dst %U", - format_ip_address, dst); + if (0 != ip_fib_get_first_egress_ip_for_dst (lcm, mrit, sloc)) { + ip_address_copy(mr_ip, mrit); + return 1; + } } -} + clib_warning("Can't find map-resolver and local interface ip!"); + return 0; +} static gid_address_t * build_itr_rloc_list (lisp_cp_main_t * lcm, locator_set_t * loc_set) { - ip4_address_t * l4; - ip6_address_t * l6; + void * addr; u32 i; locator_t * loc; u32 * loc_indexp; @@ -986,29 +2038,30 @@ build_itr_rloc_list (lisp_cp_main_t * lcm, locator_set_t * loc_set) ip_prefix_t * ippref = &gid_address_ippref (gid); ip_address_t * rloc = &ip_prefix_addr (ippref); + memset (gid, 0, sizeof (gid[0])); gid_address_type (gid) = GID_ADDR_IP_PREFIX; for (i = 0; i < vec_len(loc_set->locator_indices); i++) { loc_indexp = vec_elt_at_index(loc_set->locator_indices, i); loc = pool_elt_at_index (lcm->locator_pool, loc_indexp[0]); - ip_addr_version(rloc) = IP4; /* Add ipv4 locators first TODO sort them */ foreach_ip_interface_address (&lcm->im4->lookup_main, ia, loc->sw_if_index, 1 /* unnumbered */, ({ - l4 = ip_interface_address_get_address (&lcm->im4->lookup_main, ia); - ip_addr_v4 (rloc) = l4[0]; + addr = ip_interface_address_get_address (&lcm->im4->lookup_main, ia); + ip_address_set (rloc, addr, IP4); + ip_prefix_len (ippref) = 32; vec_add1 (rlocs, gid[0]); })); - ip_addr_version(rloc) = IP6; /* Add ipv6 locators */ foreach_ip_interface_address (&lcm->im6->lookup_main, ia, loc->sw_if_index, 1 /* unnumbered */, ({ - l6 = ip_interface_address_get_address (&lcm->im6->lookup_main, ia); - ip_addr_v6 (rloc) = l6[0]; + addr = ip_interface_address_get_address (&lcm->im6->lookup_main, ia); + ip_address_set (rloc, addr, IP6); + ip_prefix_len (ippref) = 128; vec_add1 (rlocs, gid[0]); })); } @@ -1018,12 +2071,12 @@ build_itr_rloc_list (lisp_cp_main_t * lcm, locator_set_t * loc_set) static vlib_buffer_t * build_encapsulated_map_request (vlib_main_t * vm, lisp_cp_main_t *lcm, gid_address_t * seid, gid_address_t * deid, - locator_set_t * loc_set, u8 is_smr_invoked, + locator_set_t * loc_set, ip_address_t * mr_ip, + ip_address_t * sloc, u8 is_smr_invoked, u64 *nonce_res, u32 * bi_res) { vlib_buffer_t * b; u32 bi; - ip_address_t * mr_ip, sloc; gid_address_t * rlocs = 0; if (vlib_buffer_alloc (vm, &bi, 1) != 1) @@ -1046,20 +2099,13 @@ build_encapsulated_map_request (vlib_main_t * vm, lisp_cp_main_t *lcm, /* push ecm: udp-ip-lisp */ lisp_msg_push_ecm (vm, b, LISP_CONTROL_PORT, LISP_CONTROL_PORT, seid, deid); - /* get map-resolver ip XXX use first*/ - mr_ip = vec_elt_at_index(lcm->map_resolvers, 0); - - /* get local iface ip to use in map-request XXX fib 0 for now*/ - get_local_iface_ip_for_dst (lcm, mr_ip, &sloc); - /* push outer ip header */ - pkt_push_udp_and_ip (vm, b, LISP_CONTROL_PORT, LISP_CONTROL_PORT, &sloc, + pkt_push_udp_and_ip (vm, b, LISP_CONTROL_PORT, LISP_CONTROL_PORT, sloc, mr_ip); bi_res[0] = bi; - if (rlocs) - vec_free(rlocs); + vec_free(rlocs); return b; } @@ -1075,35 +2121,59 @@ send_encapsulated_map_request (vlib_main_t * vm, lisp_cp_main_t *lcm, locator_set_t * loc_set; mapping_t * map; pending_map_request_t * pmr; + ip_address_t mr_ip, sloc; + u32 ls_index; /* get locator-set for seid */ - map_index = gid_dictionary_lookup (&lcm->mapping_index_by_gid, seid); - if (map_index == ~0) + if (!lcm->lisp_pitr) { - clib_warning("No local mapping found in eid-table for %U!", - format_gid_address, seid); - return; - } + map_index = gid_dictionary_lookup (&lcm->mapping_index_by_gid, seid); + if (map_index == ~0) + { + clib_warning("No local mapping found in eid-table for %U!", + format_gid_address, seid); + return; + } - map = pool_elt_at_index (lcm->mapping_pool, map_index); + map = pool_elt_at_index (lcm->mapping_pool, map_index); + + if (!map->local) + { + clib_warning("Mapping found for src eid %U is not marked as local!", + format_gid_address, seid); + return; + } + ls_index = map->locator_set_index; + } + else + { + map_index = lcm->pitr_map_index; + map = pool_elt_at_index (lcm->mapping_pool, lcm->pitr_map_index); + ls_index = map->locator_set_index; + } - if (!map->local) + /* overwrite locator set if map-request itr-rlocs configured */ + if (~0 != lcm->mreq_itr_rlocs) { - clib_warning("Mapping found for src eid %U is not marked as local!", - format_gid_address, seid); - return; + ls_index = lcm->mreq_itr_rlocs; } - loc_set = pool_elt_at_index (lcm->locator_set_pool, map->locator_set_index); + + loc_set = pool_elt_at_index (lcm->locator_set_pool, ls_index); + + /* get local iface ip to use in map-request */ + if (0 == get_mr_and_local_iface_ip (lcm, &mr_ip, &sloc)) + return; /* build the encapsulated map request */ - b = build_encapsulated_map_request (vm, lcm, seid, deid, loc_set, - is_smr_invoked, &nonce, &bi); + b = build_encapsulated_map_request (vm, lcm, seid, deid, loc_set, &mr_ip, + &sloc, is_smr_invoked, &nonce, &bi); if (!b) return; + /* set fib index and lookup node */ vnet_buffer(b)->sw_if_index[VLIB_TX] = ~0; - next_index = (ip_prefix_version(&gid_address_ippref(seid)) == IP4) ? + next_index = (ip_addr_version(&mr_ip) == IP4) ? ip4_lookup_node.index : ip6_lookup_node.index; f = vlib_get_frame_to_node (vm, next_index); @@ -1131,26 +2201,59 @@ get_src_and_dst (void *hdr, ip_address_t * src, ip_address_t *dst) if ((ip4->ip_version_and_header_length & 0xF0) == 0x40) { - ip_addr_v4(src).as_u32 = ip4->src_address.as_u32; - ip_addr_version(src) = IP4; - ip_addr_v4(dst).as_u32 = ip4->dst_address.as_u32; - ip_addr_version(dst) = IP4; + ip_address_set(src, &ip4->src_address, IP4); + ip_address_set(dst, &ip4->dst_address, IP4); } else { ip6 = hdr; - clib_memcpy (&ip_addr_v6(src), &ip6->src_address, sizeof(ip6->src_address)); - ip_addr_version(src) = IP6; - clib_memcpy (&ip_addr_v6(dst), &ip6->dst_address, sizeof(ip6->dst_address)); - ip_addr_version(dst) = IP6; + ip_address_set(src, &ip6->src_address, IP6); + ip_address_set(dst, &ip6->dst_address, IP6); } } +static u32 +lisp_get_vni_from_buffer (vlib_buffer_t * b, u8 version) +{ + uword * vnip; + u32 vni = ~0, table_id = ~0, fib_index; + lisp_cp_main_t * lcm = vnet_lisp_cp_get_main (); + + if (version == IP4) + { + ip4_fib_t * fib; + ip4_main_t * im4 = &ip4_main; + fib_index = vec_elt (im4->fib_index_by_sw_if_index, + vnet_buffer (b)->sw_if_index[VLIB_RX]); + fib = find_ip4_fib_by_table_index_or_id (im4, fib_index, + IP4_ROUTE_FLAG_FIB_INDEX); + table_id = fib->table_id; + } + else + { + ip6_fib_t * fib; + ip6_main_t * im6 = &ip6_main; + fib_index = vec_elt (im6->fib_index_by_sw_if_index, + vnet_buffer (b)->sw_if_index[VLIB_RX]); + fib = find_ip6_fib_by_table_index_or_id (im6, fib_index, + IP6_ROUTE_FLAG_FIB_INDEX); + table_id = fib->table_id; + } + + vnip = hash_get (lcm->vni_by_table_id, table_id); + if (vnip) + vni = vnip[0]; + else + clib_warning ("vrf %d is not mapped to any vni!", table_id); + + return vni; +} + static uword lisp_cp_lookup (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * from_frame) { - u32 * from, * to_next_drop; + u32 * from, * to_next_drop, di, si; lisp_cp_main_t *lcm = vnet_lisp_cp_get_main(); u32 pkts_mapped = 0; uword n_left_from, n_left_to_next_drop; @@ -1165,7 +2268,7 @@ lisp_cp_lookup (vlib_main_t * vm, vlib_node_runtime_t * node, while (n_left_from > 0 && n_left_to_next_drop > 0) { - u32 pi0; + u32 pi0, vni; vlib_buffer_t * p0; ip4_header_t * ip0; gid_address_t src, dst; @@ -1192,20 +2295,57 @@ lisp_cp_lookup (vlib_main_t * vm, vlib_node_runtime_t * node, ip_prefix_len(spref) = ip_address_max_len (ip_prefix_version(spref)); ip_prefix_len(dpref) = ip_address_max_len (ip_prefix_version(dpref)); - /* send map-request */ - send_encapsulated_map_request (vm, lcm, &src, &dst, 0); + vni = lisp_get_vni_from_buffer (p0, ip_prefix_version (spref)); + gid_address_vni (&dst) = vni; + gid_address_vni (&src) = vni; - pkts_mapped++; + /* if we have remote mapping for destination already in map-chache + add forwarding tunnel directly. If not send a map-request */ + di = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &dst); + if (~0 != di) + { + mapping_t * m = vec_elt_at_index (lcm->mapping_pool, di); + /* send a map-request also in case of negative mapping entry + with corresponding action */ + if (m->action == ACTION_SEND_MAP_REQUEST) + { + /* send map-request */ + send_encapsulated_map_request (vm, lcm, &src, &dst, 0); + pkts_mapped++; + } + else + { + si = gid_dictionary_lookup (&lcm->mapping_index_by_gid, + &src); + if (~0 != si) + { + add_fwd_entry (lcm, si, di); + } + } + } + else + { + /* send map-request */ + send_encapsulated_map_request (vm, lcm, &src, &dst, 0); + pkts_mapped++; + } if (PREDICT_FALSE(p0->flags & VLIB_BUFFER_IS_TRACED)) { lisp_cp_lookup_trace_t *tr = vlib_add_trace (vm, node, p0, sizeof(*tr)); + + memset(tr, 0, sizeof(*tr)); gid_address_copy (&tr->dst_eid, &dst); - clib_memcpy (&tr->map_resolver_ip, - vec_elt_at_index(lcm->map_resolvers, 0), - sizeof(ip_address_t)); + if (vec_len(lcm->map_resolvers) > 0) + { + clib_memcpy (&tr->map_resolver_ip, + vec_elt_at_index(lcm->map_resolvers, 0), + sizeof(ip_address_t)); + } } + gid_address_free (&dst); + gid_address_free (&src); } vlib_put_next_frame (vm, node, LISP_CP_LOOKUP_NEXT_DROP, n_left_to_next_drop); @@ -1277,31 +2417,7 @@ format_lisp_cp_input_trace (u8 * s, va_list * args) return s; } -ip_interface_address_t * -ip_interface_get_first_interface_address (ip_lookup_main_t *lm, u32 sw_if_index, - u8 loop) -{ - vnet_main_t *vnm = vnet_get_main (); - vnet_sw_interface_t * swif = vnet_get_sw_interface (vnm, sw_if_index); - if (loop && swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED) - sw_if_index = swif->unnumbered_sw_if_index; - u32 ia = - (vec_len((lm)->if_address_pool_index_by_sw_if_index) > (sw_if_index)) ? - vec_elt((lm)->if_address_pool_index_by_sw_if_index, (sw_if_index)) : - (u32) ~0; - return pool_elt_at_index((lm)->if_address_pool, ia); -} - -void * -ip_interface_get_first_ip_addres (ip_lookup_main_t *lm, u32 sw_if_index, - u8 loop) -{ - ip_interface_address_t * ia = ip_interface_get_first_interface_address ( - lm, sw_if_index, loop); - return ip_interface_address_get_address (lm, ia); -} - -void +static void del_fwd_entry (lisp_cp_main_t * lcm, u32 src_map_index, u32 dst_map_index) { @@ -1321,7 +2437,7 @@ del_fwd_entry (lisp_cp_main_t * lcm, u32 src_map_index, a->is_add = 0; a->dlocator = fe->dst_loc; a->slocator = fe->src_loc; - a->vni = 0; // XXX should be part of mapping/eid + a->vni = gid_address_vni(&a->deid); gid_address_copy(&a->deid, &fe->deid); vnet_lisp_gpe_add_del_fwd_entry (a, &sw_if_index); @@ -1331,13 +2447,92 @@ del_fwd_entry (lisp_cp_main_t * lcm, u32 src_map_index, pool_put(lcm->fwd_entry_pool, fe); } -void +/** + * Finds first remote locator with best (lowest) priority that has a local + * peer locator with an underlying route to it. + * + */ +static u32 +get_locator_pair (lisp_cp_main_t* lcm, mapping_t * lcl_map, mapping_t * rmt_map, + ip_address_t * lcl_loc, ip_address_t * rmt_loc) +{ + u32 i, minp = ~0, limitp = 0, li, check_index = 0, done = 0, esi; + locator_set_t * rmt_ls, * lcl_ls; + ip_address_t _lcl, * lcl = &_lcl; + locator_t * l, * rmt = 0; + uword * checked = 0; + + rmt_ls = pool_elt_at_index(lcm->locator_set_pool, rmt_map->locator_set_index); + lcl_ls = pool_elt_at_index(lcm->locator_set_pool, lcl_map->locator_set_index); + + if (!rmt_ls || vec_len(rmt_ls->locator_indices) == 0) + return 0; + + while (!done) + { + /* find unvisited remote locator with best priority */ + for (i = 0; i < vec_len(rmt_ls->locator_indices); i++) + { + if (0 != hash_get(checked, i)) + continue; + + li = vec_elt(rmt_ls->locator_indices, i); + l = pool_elt_at_index(lcm->locator_pool, li); + + /* we don't support non-IP locators for now */ + if (gid_address_type(&l->address) != GID_ADDR_IP_PREFIX) + continue; + + if (l->priority < minp && l->priority >= limitp) + { + minp = l->priority; + rmt = l; + check_index = i; + } + } + /* check if a local locator with a route to remote locator exists */ + if (rmt != 0) + { + esi = ip_fib_get_egress_iface_for_dst ( + lcm, &gid_address_ip(&rmt->address)); + if ((u32) ~0 == esi) + continue; + + for (i = 0; i < vec_len(lcl_ls->locator_indices); i++) + { + li = vec_elt (lcl_ls->locator_indices, i); + locator_t * sl = pool_elt_at_index (lcm->locator_pool, li); + + /* found local locator */ + if (sl->sw_if_index == esi) + { + if (0 == ip_interface_get_first_ip_address (lcm, + sl->sw_if_index, + gid_address_ip_version(&rmt->address), lcl)) + continue; + + ip_address_copy(rmt_loc, &gid_address_ip(&rmt->address)); + ip_address_copy(lcl_loc, lcl); + done = 2; + } + } + + /* skip this remote locator in next searches */ + limitp = minp; + hash_set(checked, check_index, 1); + } + else + done = 1; + } + hash_free(checked); + return (done == 2) ? 1 : 0; +} + +static void add_fwd_entry (lisp_cp_main_t* lcm, u32 src_map_index, u32 dst_map_index) { mapping_t * src_map, * dst_map; - locator_set_t * dst_ls, * src_ls; - u32 i, minp = ~0; - locator_t * dl = 0; + u32 sw_if_index; uword * feip = 0, * tidp; fwd_entry_t* fe; vnet_lisp_gpe_add_del_fwd_entry_args_t _a, * a = &_a; @@ -1352,62 +2547,8 @@ add_fwd_entry (lisp_cp_main_t* lcm, u32 src_map_index, u32 dst_map_index) src_map = pool_elt_at_index (lcm->mapping_pool, src_map_index); dst_map = pool_elt_at_index (lcm->mapping_pool, dst_map_index); - /* XXX simple forwarding policy: first lowest (value) priority locator */ - dst_ls = pool_elt_at_index (lcm->locator_set_pool, - dst_map->locator_set_index); - for (i = 0; i < vec_len (dst_ls->locator_indices); i++) - { - u32 li = vec_elt (dst_ls->locator_indices, i); - locator_t * l = pool_elt_at_index (lcm->locator_pool, li); - if (l->priority < minp && gid_address_type(&l->address) - == GID_ADDR_IP_PREFIX) - { - minp = l->priority; - dl = l; - } - } - if (dl) - { - src_ls = pool_elt_at_index (lcm->locator_set_pool, - src_map->locator_set_index); - for (i = 0; i < vec_len (src_ls->locator_indices); i++) - { - u32 li = vec_elt (src_ls->locator_indices, i); - locator_t * sl = pool_elt_at_index (lcm->locator_pool, li); - - if (ip_addr_version(&gid_address_ip(&dl->address)) == IP4) - { - ip4_address_t * l4; - l4 = ip_interface_get_first_ip_addres (&lcm->im4->lookup_main, - sl->sw_if_index, - 1 /* unnumbered */); - ip_addr_v4(&a->slocator) = *l4; - ip_addr_version(&a->slocator) = IP4; - } - else - { - ip6_address_t * l6; - l6 = ip_interface_get_first_ip_addres (&lcm->im6->lookup_main, - sl->sw_if_index, - 1 /* unnumbered */); - ip_addr_v6(&a->slocator) = *l6; - ip_addr_version(&a->slocator) = IP6; - } - } - } - /* insert data plane forwarding entry */ - u32 sw_if_index; - a->is_add = 1; - if (dl) - a->dlocator = gid_address_ip(&dl->address); - else - { - a->is_negative = 1; - a->action = dst_map->action; - } - gid_address_copy (&a->deid, &dst_map->eid); - a->vni = 0; // XXX should be part of mapping/eid + a->vni = gid_address_vni(&a->deid); tidp = hash_get(lcm->table_id_by_vni, a->vni); if (!tidp) @@ -1417,6 +2558,17 @@ add_fwd_entry (lisp_cp_main_t* lcm, u32 src_map_index, u32 dst_map_index) } a->table_id = tidp[0]; + /* insert data plane forwarding entry */ + a->is_add = 1; + + /* find best locator pair that 1) verifies LISP policy 2) are connected */ + if (0 == get_locator_pair (lcm, src_map, dst_map, &a->slocator, &a->dlocator)) + { + /* negative entry */ + a->is_negative = 1; + a->action = dst_map->action; + } + /* TODO remove */ u8 ipver = ip_prefix_version(&gid_address_ippref(&a->deid)); a->decap_next_index = (ipver == IP4) ? @@ -1460,6 +2612,7 @@ compare_locators (lisp_cp_main_t *lcm, u32 * old_ls_indexes, void process_map_reply (lisp_cp_main_t * lcm, vlib_buffer_t * b) { + mapping_t * old_map; locator_t * loc; u32 len = 0, i, ls_index = 0; void * h; @@ -1510,14 +2663,13 @@ process_map_reply (lisp_cp_main_t * lcm, vlib_buffer_t * b) } mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &m_args->deid); + old_map = mi != ~0 ? pool_elt_at_index(lcm->mapping_pool, mi) : 0; /* if mapping already exists, decide if locators (and forwarding) should * be updated and be done */ - if (mi != ~0) + if (old_map != 0 && !gid_address_cmp (&old_map->eid, &m_args->deid)) { - mapping_t * old_map; locator_set_t * old_ls; - old_map = pool_elt_at_index(lcm->mapping_pool, mi); /* update mapping attributes */ old_map->action = m_args->action; @@ -1700,11 +2852,13 @@ lisp_cp_init (vlib_main_t *vm) lcm->im6 = &ip6_main; lcm->vlib_main = vm; lcm->vnet_main = vnet_get_main(); + lcm->mreq_itr_rlocs = ~0; gid_dictionary_init (&lcm->mapping_index_by_gid); /* default vrf mapped to vni 0 */ hash_set(lcm->table_id_by_vni, 0, 0); + hash_set(lcm->vni_by_table_id, 0, 0); udp_register_dst_port (vm, UDP_DST_PORT_lisp_cp, lisp_cp_input_node.index, 1 /* is_ip4 */);