X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbier%2Fbier_fmask.c;h=a58a77ff2813f6bf0efdf368b5fab08131395d1a;hb=097fa66b986f06281f603767d321ab13ab6c88c3;hp=2fc24dca8196483fa0bf5ed559bf33baf5da5f3e;hpb=9128637ee8f7b0d903551f165a1447d427e8dd19;p=vpp.git diff --git a/src/vnet/bier/bier_fmask.c b/src/vnet/bier/bier_fmask.c index 2fc24dca819..a58a77ff281 100644 --- a/src/vnet/bier/bier_fmask.c +++ b/src/vnet/bier/bier_fmask.c @@ -37,6 +37,11 @@ static const char *const bier_fmask_attr_names[] = BIER_FMASK_ATTR_NAMES; */ bier_fmask_t *bier_fmask_pool; +/** + * Stats for each BIER fmask object + */ +vlib_combined_counter_main_t bier_fmask_counters; + static inline index_t bier_fmask_get_index (const bier_fmask_t *bfm) { @@ -49,7 +54,7 @@ bier_fmask_bits_init (bier_fmask_bits_t *bits, { bits->bfmb_refs = clib_mem_alloc(sizeof(bits->bfmb_refs[0]) * bier_hdr_len_id_to_num_bits(hlid)); - memset(bits->bfmb_refs, + clib_memset(bits->bfmb_refs, 0, (sizeof(bits->bfmb_refs[0]) * bier_hdr_len_id_to_num_bits(hlid))); @@ -65,7 +70,7 @@ bier_fmask_bits_init (bier_fmask_bits_t *bits, sizeof(bits->bfmb_input_reset_string.bbs_buckets[0]) * bier_hdr_len_id_to_num_buckets(hlid), CLIB_CACHE_LINE_BYTES); - memset(bits->bfmb_input_reset_string.bbs_buckets, + clib_memset(bits->bfmb_input_reset_string.bbs_buckets, 0, sizeof(bits->bfmb_input_reset_string.bbs_buckets[0]) * bier_hdr_len_id_to_num_buckets(hlid)); @@ -160,33 +165,40 @@ bier_fmask_child_remove (fib_node_index_t bfmi, static void bier_fmask_init (bier_fmask_t *bfm, const bier_fmask_id_t *fmid, - const fib_route_path_t *rpaths) + const fib_route_path_t *rpath) { const bier_table_id_t *btid; + fib_route_path_t *rpaths; mpls_label_t olabel; + clib_memset(bfm, 0, sizeof(*bfm)); + + bfm->bfm_id = clib_mem_alloc(sizeof(*bfm->bfm_id)); + + fib_node_init(&bfm->bfm_node, FIB_NODE_TYPE_BIER_FMASK); *bfm->bfm_id = *fmid; dpo_reset(&bfm->bfm_dpo); btid = bier_table_get_id(bfm->bfm_id->bfmi_bti); bier_fmask_bits_init(&bfm->bfm_bits, btid->bti_hdr_len); - if (ip46_address_is_zero(&(bfm->bfm_id->bfmi_nh))) + if (rpath->frp_flags & FIB_ROUTE_PATH_UDP_ENCAP) + { + bfm->bfm_id->bfmi_nh_type = BIER_NH_UDP; + } + else if (ip46_address_is_zero(&(bfm->bfm_id->bfmi_nh))) { bfm->bfm_flags |= BIER_FMASK_FLAG_DISP; } if (!(bfm->bfm_flags & BIER_FMASK_FLAG_DISP)) { - /* - * leave this label in host byte order so we can OR in the TTL - */ - if (NULL != rpaths->frp_label_stack) + if (NULL != rpath->frp_label_stack) { - olabel = rpaths->frp_label_stack[0]; + olabel = rpath->frp_label_stack[0].fml_value; vnet_mpls_uc_set_label(&bfm->bfm_label, olabel); vnet_mpls_uc_set_exp(&bfm->bfm_label, 0); vnet_mpls_uc_set_s(&bfm->bfm_label, 1); - vnet_mpls_uc_set_ttl(&bfm->bfm_label, 0); + vnet_mpls_uc_set_ttl(&bfm->bfm_label, 64); bfm->bfm_flags |= BIER_FMASK_FLAG_MPLS; } else @@ -207,16 +219,20 @@ bier_fmask_init (bier_fmask_t *bfm, vnet_mpls_uc_set_label(&bfm->bfm_label, id); vnet_mpls_uc_set_s(&bfm->bfm_label, 1); vnet_mpls_uc_set_exp(&bfm->bfm_label, 0); + vnet_mpls_uc_set_ttl(&bfm->bfm_label, 64); } + bfm->bfm_label = clib_host_to_net_u32(bfm->bfm_label); } + rpaths = NULL; + vec_add1(rpaths, *rpath); bfm->bfm_pl = fib_path_list_create((FIB_PATH_LIST_FLAG_SHARED | FIB_PATH_LIST_FLAG_NO_URPF), rpaths); bfm->bfm_sibling = fib_path_list_child_add(bfm->bfm_pl, FIB_NODE_TYPE_BIER_FMASK, bier_fmask_get_index(bfm)); - + vec_free(rpaths); bier_fmask_stack(bfm); } @@ -266,23 +282,22 @@ bier_fmask_lock (index_t bfmi) index_t bier_fmask_create_and_lock (const bier_fmask_id_t *fmid, - const fib_route_path_t *rpaths) + const fib_route_path_t *rpath) { bier_fmask_t *bfm; + index_t bfmi; pool_get_aligned(bier_fmask_pool, bfm, CLIB_CACHE_LINE_BYTES); + bfmi = bier_fmask_get_index(bfm); - memset(bfm, 0, sizeof(*bfm)); - - bfm->bfm_id = clib_mem_alloc(sizeof(*bfm->bfm_id)); + vlib_validate_combined_counter (&(bier_fmask_counters), bfmi); + vlib_zero_combined_counter (&(bier_fmask_counters), bfmi); - ASSERT(1 == vec_len(rpaths)); - fib_node_init(&bfm->bfm_node, FIB_NODE_TYPE_BIER_FMASK); - bier_fmask_init(bfm, fmid, rpaths); + bier_fmask_init(bfm, fmid, rpath); - bier_fmask_lock(bier_fmask_get_index(bfm)); + bier_fmask_lock(bfmi); - return (bier_fmask_get_index(bfm)); + return (bfmi); } void @@ -296,7 +311,7 @@ bier_fmask_link (index_t bfmi, if (0 == bfm->bfm_bits.bfmb_refs[BIER_BP_TO_INDEX(bp)]) { /* - * 0 -> 1 transistion - set the bit in the string + * 0 -> 1 transition - set the bit in the string */ bier_bit_string_set_bit(&bfm->bfm_bits.bfmb_input_reset_string, bp); } @@ -319,7 +334,7 @@ bier_fmask_unlink (index_t bfmi, if (0 == bfm->bfm_bits.bfmb_refs[BIER_BP_TO_INDEX(bp)]) { /* - * 1 -> 0 transistion - clear the bit in the string + * 1 -> 0 transition - clear the bit in the string */ bier_bit_string_clear_bit(&bfm->bfm_bits.bfmb_input_reset_string, bp); } @@ -332,6 +347,7 @@ format_bier_fmask (u8 *s, va_list *ap) u32 indent = va_arg(*ap, u32); bier_fmask_attributes_t attr; bier_fmask_t *bfm; + vlib_counter_t to; if (pool_is_free_index(bier_fmask_pool, bfmi)) { @@ -350,6 +366,8 @@ format_bier_fmask (u8 *s, va_list *ap) s = format (s, "%s,", bier_fmask_attr_names[attr]); } } + vlib_get_combined_counter (&(bier_fmask_counters), bfmi, &to); + s = format (s, " to:[%Ld:%Ld]]", to.packets, to.bytes); s = format(s, "\n"); s = fib_path_list_format(bfm->bfm_pl, s); @@ -357,13 +375,13 @@ format_bier_fmask (u8 *s, va_list *ap) { s = format(s, " output-label:%U", format_mpls_unicast_label, - vnet_mpls_uc_get_label(bfm->bfm_label)); + vnet_mpls_uc_get_label(clib_net_to_host_u32(bfm->bfm_label))); } else { s = format(s, " output-bfit:[%U]", format_bier_bift_id, - vnet_mpls_uc_get_label(bfm->bfm_label)); + vnet_mpls_uc_get_label(clib_net_to_host_u32(bfm->bfm_label))); } s = format(s, "\n %U%U", format_white_space, indent, @@ -372,6 +390,43 @@ format_bier_fmask (u8 *s, va_list *ap) return (s); } +void +bier_fmask_get_stats (index_t bfmi, u64 * packets, u64 * bytes) +{ + vlib_counter_t to; + + vlib_get_combined_counter (&(bier_fmask_counters), bfmi, &to); + + *packets = to.packets; + *bytes = to.bytes; +} + +void +bier_fmask_encode (index_t bfmi, + bier_table_id_t *btid, + fib_route_path_t *rpath) +{ + bier_fmask_t *bfm; + + bfm = bier_fmask_get(bfmi); + *btid = *bier_table_get_id(bfm->bfm_id->bfmi_bti); + + clib_memset(rpath, 0, sizeof(*rpath)); + + rpath->frp_sw_if_index = ~0; + + switch (bfm->bfm_id->bfmi_nh_type) + { + case BIER_NH_UDP: + rpath->frp_flags = FIB_ROUTE_PATH_UDP_ENCAP; + rpath->frp_udp_encap_id = bfm->bfm_id->bfmi_id; + break; + case BIER_NH_IP: + memcpy(&rpath->frp_addr, &bfm->bfm_id->bfmi_nh, + sizeof(rpath->frp_addr)); + break; + } +} static fib_node_t * bier_fmask_get_node (fib_node_index_t index)