X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ffib%2Ffib_path.c;h=2a4e6ab551f0095ab1f34ea9a734fa92929e7476;hb=e2fe09742;hp=60ba92bf6cc1a5420dc640364b63b7a3f73675b2;hpb=da0e7497ca972f3219352d884b5c51e455503dbb;p=vpp.git diff --git a/src/vnet/fib/fib_path.c b/src/vnet/fib/fib_path.c index 60ba92bf6cc..2a4e6ab551f 100644 --- a/src/vnet/fib/fib_path.c +++ b/src/vnet/fib/fib_path.c @@ -106,17 +106,8 @@ typedef enum fib_path_type_t_ { * via a DVR. */ FIB_PATH_TYPE_DVR, - /** - * Marker. Add new types before this one, then update it. - */ - FIB_PATH_TYPE_LAST = FIB_PATH_TYPE_BIER_FMASK, } __attribute__ ((packed)) fib_path_type_t; -/** - * The maximum number of path_types - */ -#define FIB_PATH_TYPE_MAX (FIB_PATH_TYPE_LAST + 1) - #define FIB_PATH_TYPES { \ [FIB_PATH_TYPE_ATTACHED_NEXT_HOP] = "attached-nexthop", \ [FIB_PATH_TYPE_ATTACHED] = "attached", \ @@ -133,11 +124,6 @@ typedef enum fib_path_type_t_ { [FIB_PATH_TYPE_DVR] = "dvr", \ } -#define FOR_EACH_FIB_PATH_TYPE(_item) \ - for (_item = FIB_PATH_TYPE_FIRST; \ - _item <= FIB_PATH_TYPE_LAST; \ - _item++) - /** * Enurmeration of path operational (i.e. derived) attributes */ @@ -259,6 +245,10 @@ typedef struct fib_path_t_ { u32 fp_interface; } attached_next_hop; struct { + /** + * The Connected local address + */ + fib_prefix_t fp_connected; /** * The interface */ @@ -645,10 +635,18 @@ fib_path_last_lock_gone (fib_node_t *node) ASSERT(0); } -static const adj_index_t +static fib_path_t* fib_path_attached_next_hop_get_adj (fib_path_t *path, - vnet_link_t link) + vnet_link_t link, + dpo_id_t *dpo) { + fib_node_index_t fib_path_index; + fib_protocol_t nh_proto; + adj_index_t ai; + + fib_path_index = fib_path_get_index(path); + nh_proto = dpo_proto_to_fib(path->fp_nh_proto); + if (vnet_sw_interface_is_p2p(vnet_get_main(), path->attached_next_hop.fp_interface)) { @@ -658,18 +656,20 @@ fib_path_attached_next_hop_get_adj (fib_path_t *path, * the subnet address (the attached route) links to the * auto-adj (see below), we want that adj here too. */ - return (adj_nbr_add_or_lock(dpo_proto_to_fib(path->fp_nh_proto), - link, - &zero_addr, - path->attached_next_hop.fp_interface)); + ai = adj_nbr_add_or_lock(nh_proto, link, &zero_addr, + path->attached_next_hop.fp_interface); } else { - return (adj_nbr_add_or_lock(dpo_proto_to_fib(path->fp_nh_proto), - link, - &path->attached_next_hop.fp_nh, - path->attached_next_hop.fp_interface)); + ai = adj_nbr_add_or_lock(nh_proto, link, + &path->attached_next_hop.fp_nh, + path->attached_next_hop.fp_interface); } + + dpo_set(dpo, DPO_ADJACENCY, vnet_link_to_dpo_proto(link), ai); + adj_unlock(ai); + + return (fib_path_get(fib_path_index)); } static void @@ -679,12 +679,11 @@ fib_path_attached_next_hop_set (fib_path_t *path) * resolve directly via the adjacency discribed by the * interface and next-hop */ - dpo_set(&path->fp_dpo, - DPO_ADJACENCY, - path->fp_nh_proto, - fib_path_attached_next_hop_get_adj( - path, - dpo_proto_to_link(path->fp_nh_proto))); + path = fib_path_attached_next_hop_get_adj(path, + dpo_proto_to_link(path->fp_nh_proto), + &path->fp_dpo); + + ASSERT(dpo_is_adj(&path->fp_dpo)); /* * become a child of the adjacency so we receive updates @@ -702,10 +701,15 @@ fib_path_attached_next_hop_set (fib_path_t *path) } } -static const adj_index_t +static void fib_path_attached_get_adj (fib_path_t *path, - vnet_link_t link) + vnet_link_t link, + dpo_id_t *dpo) { + fib_protocol_t nh_proto; + + nh_proto = dpo_proto_to_fib(path->fp_nh_proto); + if (vnet_sw_interface_is_p2p(vnet_get_main(), path->attached.fp_interface)) { @@ -713,17 +717,28 @@ fib_path_attached_get_adj (fib_path_t *path, * point-2-point interfaces do not require a glean, since * there is nothing to ARP. Install a rewrite/nbr adj instead */ - return (adj_nbr_add_or_lock(dpo_proto_to_fib(path->fp_nh_proto), - link, - &zero_addr, - path->attached.fp_interface)); + adj_index_t ai; + + ai = adj_nbr_add_or_lock(nh_proto, link, &zero_addr, + path->attached.fp_interface); + + dpo_set(dpo, DPO_ADJACENCY, vnet_link_to_dpo_proto(link), ai); + adj_unlock(ai); + } + else if (vnet_sw_interface_is_nbma(vnet_get_main(), + path->attached.fp_interface)) + { + dpo_copy(dpo, drop_dpo_get(path->fp_nh_proto)); } else { - return (adj_glean_add_or_lock(dpo_proto_to_fib(path->fp_nh_proto), - link, - path->attached.fp_interface, - NULL)); + adj_index_t ai; + + ai = adj_glean_add_or_lock(nh_proto, link, + path->attached.fp_interface, + &path->attached.fp_connected); + dpo_set(dpo, DPO_ADJACENCY_GLEAN, vnet_link_to_dpo_proto(link), ai); + adj_unlock(ai); } } @@ -910,14 +925,10 @@ fib_path_unresolve (fib_path_t *path) bier_table_ecmp_unlock(path->fp_via_bier_tbl); break; case FIB_PATH_TYPE_ATTACHED_NEXT_HOP: - adj_child_remove(path->fp_dpo.dpoi_index, - path->fp_sibling); - adj_unlock(path->fp_dpo.dpoi_index); - break; case FIB_PATH_TYPE_ATTACHED: - adj_child_remove(path->fp_dpo.dpoi_index, - path->fp_sibling); - adj_unlock(path->fp_dpo.dpoi_index); + if (dpo_is_adj(&path->fp_dpo)) + adj_child_remove(path->fp_dpo.dpoi_index, + path->fp_sibling); break; case FIB_PATH_TYPE_UDP_ENCAP: udp_encap_unlock(path->fp_dpo.dpoi_index); @@ -1089,25 +1100,22 @@ FIXME comment * restack the DPO to pick up the correct DPO sub-type */ uword if_is_up; - adj_index_t ai; if_is_up = vnet_sw_interface_is_up( vnet_get_main(), path->attached_next_hop.fp_interface); - ai = fib_path_attached_next_hop_get_adj( - path, - dpo_proto_to_link(path->fp_nh_proto)); + path = fib_path_attached_next_hop_get_adj( + path, + dpo_proto_to_link(path->fp_nh_proto), + &path->fp_dpo); path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED; - if (if_is_up && adj_is_up(ai)) + if (if_is_up && adj_is_up(path->fp_dpo.dpoi_index)) { path->fp_oper_flags |= FIB_PATH_OPER_FLAG_RESOLVED; } - dpo_set(&path->fp_dpo, DPO_ADJACENCY, path->fp_nh_proto, ai); - adj_unlock(ai); - if (!if_is_up) { /* @@ -1258,6 +1266,8 @@ fib_path_route_flags_to_cfg_flags (const fib_route_path_t *rpath) cfg_flags |= FIB_PATH_CFG_FLAG_ICMP_UNREACH; if (rpath->frp_flags & FIB_ROUTE_PATH_ICMP_PROHIBIT) cfg_flags |= FIB_PATH_CFG_FLAG_ICMP_PROHIBIT; + if (rpath->frp_flags & FIB_ROUTE_PATH_GLEAN) + cfg_flags |= FIB_PATH_CFG_FLAG_GLEAN; return (cfg_flags); } @@ -1361,6 +1371,12 @@ fib_path_create (fib_node_index_t pl_index, path->fp_type = FIB_PATH_TYPE_SPECIAL; path->classify.fp_classify_table_id = rpath->frp_classify_table_id; } + else if (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_GLEAN) + { + path->fp_type = FIB_PATH_TYPE_ATTACHED; + path->attached.fp_interface = rpath->frp_sw_if_index; + path->attached.fp_connected = rpath->frp_connected; + } else if (~0 != rpath->frp_sw_if_index) { if (ip46_address_is_zero(&rpath->frp_addr)) @@ -1474,7 +1490,7 @@ fib_path_copy (fib_node_index_t path_index, orig_path = fib_path_get(path_index); ASSERT(NULL != orig_path); - memcpy(path, orig_path, sizeof(*path)); + clib_memcpy(path, orig_path, sizeof(*path)); FIB_PATH_DBG(path, "create-copy:%d", path_index); @@ -1576,8 +1592,8 @@ fib_path_cmp_i (const fib_path_t *path1, path2->attached.fp_interface); break; case FIB_PATH_TYPE_RECURSIVE: - res = ip46_address_cmp(&path1->recursive.fp_nh, - &path2->recursive.fp_nh); + res = ip46_address_cmp(&path1->recursive.fp_nh.fp_ip, + &path2->recursive.fp_nh.fp_ip); if (0 == res) { @@ -1856,7 +1872,8 @@ fib_path_recursive_loop_detect (fib_node_index_t path_index, } case FIB_PATH_TYPE_ATTACHED_NEXT_HOP: case FIB_PATH_TYPE_ATTACHED: - if (adj_recursive_loop_detect(path->fp_dpo.dpoi_index, + if (dpo_is_adj(&path->fp_dpo) && + adj_recursive_loop_detect(path->fp_dpo.dpoi_index, entry_indicies)) { FIB_PATH_DBG(path, "recursive loop formed"); @@ -1927,11 +1944,9 @@ fib_path_resolve (fib_node_index_t path_index) { path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED; } - dpo_set(&tmp, - DPO_ADJACENCY, - path->fp_nh_proto, - fib_path_attached_get_adj(path, - dpo_proto_to_link(path->fp_nh_proto))); + fib_path_attached_get_adj(path, + dpo_proto_to_link(path->fp_nh_proto), + &tmp); /* * re-fetch after possible mem realloc @@ -1943,9 +1958,12 @@ fib_path_resolve (fib_node_index_t path_index) * become a child of the adjacency so we receive updates * when the interface state changes */ - path->fp_sibling = adj_child_add(path->fp_dpo.dpoi_index, - FIB_NODE_TYPE_PATH, - fib_path_get_index(path)); + if (dpo_is_adj(&path->fp_dpo)) + { + path->fp_sibling = adj_child_add(path->fp_dpo.dpoi_index, + FIB_NODE_TYPE_PATH, + fib_path_get_index(path)); + } dpo_reset(&tmp); break; } @@ -2099,7 +2117,7 @@ fib_path_resolve (fib_node_index_t path_index) break; } case FIB_PATH_TYPE_DVR: - dvr_dpo_add_or_lock(path->attached.fp_interface, + dvr_dpo_add_or_lock(path->dvr.fp_interface, path->fp_nh_proto, &path->fp_dpo); break; @@ -2213,7 +2231,6 @@ fib_path_get_adj (fib_node_index_t path_index) path = fib_path_get(path_index); - ASSERT(dpo_is_adj(&path->fp_dpo)); if (dpo_is_adj(&path->fp_dpo)) { return (path->fp_dpo.dpoi_index); @@ -2432,21 +2449,11 @@ fib_path_contribute_forwarding (fib_node_index_t path_index, case FIB_FORW_CHAIN_TYPE_NSH: case FIB_FORW_CHAIN_TYPE_MCAST_IP4: case FIB_FORW_CHAIN_TYPE_MCAST_IP6: - { - adj_index_t ai; - - /* - * get a appropriate link type adj. - */ - ai = fib_path_attached_next_hop_get_adj( - path, - fib_forw_chain_type_to_link_type(fct)); - dpo_set(dpo, DPO_ADJACENCY, - fib_forw_chain_type_to_dpo_proto(fct), ai); - adj_unlock(ai); - + path = fib_path_attached_next_hop_get_adj( + path, + fib_forw_chain_type_to_link_type(fct), + dpo); break; - } case FIB_FORW_CHAIN_TYPE_BIER: break; } @@ -2549,20 +2556,10 @@ fib_path_contribute_forwarding (fib_node_index_t path_index, case FIB_FORW_CHAIN_TYPE_ETHERNET: case FIB_FORW_CHAIN_TYPE_NSH: case FIB_FORW_CHAIN_TYPE_BIER: - { - adj_index_t ai; - - /* - * get a appropriate link type adj. - */ - ai = fib_path_attached_get_adj( - path, - fib_forw_chain_type_to_link_type(fct)); - dpo_set(dpo, DPO_ADJACENCY, - fib_forw_chain_type_to_dpo_proto(fct), ai); - adj_unlock(ai); - break; - } + fib_path_attached_get_adj(path, + fib_forw_chain_type_to_link_type(fct), + dpo); + break; case FIB_FORW_CHAIN_TYPE_MCAST_IP4: case FIB_FORW_CHAIN_TYPE_MCAST_IP6: { @@ -2824,7 +2821,7 @@ show_fib_path_command (vlib_main_t * vm, FIB_PATH_FORMAT_FLAGS_NONE); s = format(s, "\n children:"); s = fib_node_children_format(path->fp_node.fn_children, s); - vlib_cli_output (vm, "%s", s); + vlib_cli_output (vm, "%v", s); vec_free(s); } else