From 586479a73162426a02b2bbc8ab724e0dfb9921e0 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Thu, 7 Jun 2018 02:08:07 -0700 Subject: BIER neighbor stats Change-Id: I2f638f1932b4aeddf2408c06d1b8393551675b72 Signed-off-by: Neale Ranns --- src/vnet/bier/bier_fmask.c | 64 ++++++++++++++++++++++++++++++++++++++----- src/vnet/bier/bier_fmask.h | 4 +++ src/vnet/bier/bier_fmask_db.c | 35 ++++++++++++++++------- src/vnet/bier/bier_fmask_db.h | 40 ++++++++++++++++++++------- src/vnet/bier/bier_output.c | 10 +++++-- src/vnet/udp/udp_encap.c | 2 +- src/vnet/udp/udp_encap.h | 2 +- 7 files changed, 126 insertions(+), 31 deletions(-) (limited to 'src/vnet') diff --git a/src/vnet/bier/bier_fmask.c b/src/vnet/bier/bier_fmask.c index 3d7cc838ab0..73f719460aa 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) { @@ -165,6 +170,12 @@ bier_fmask_init (bier_fmask_t *bfm, const bier_table_id_t *btid; mpls_label_t olabel; + ASSERT(1 == vec_len(rpaths)); + 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); @@ -268,20 +279,19 @@ bier_fmask_create_and_lock (const bier_fmask_id_t *fmid, const fib_route_path_t *rpaths) { 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_lock(bier_fmask_get_index(bfm)); + bier_fmask_lock(bfmi); - return (bier_fmask_get_index(bfm)); + return (bfmi); } void @@ -331,6 +341,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)) { @@ -349,6 +360,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); @@ -371,6 +384,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_encode_t *rpath) +{ + bier_fmask_t *bfm; + + bfm = bier_fmask_get(bfmi); + *btid = *bier_table_get_id(bfm->bfm_id->bfmi_bti); + + memset(rpath, 0, sizeof(*rpath)); + + rpath->rpath.frp_sw_if_index = ~0; + + switch (bfm->bfm_id->bfmi_nh_type) + { + case BIER_NH_UDP: + rpath->rpath.frp_flags = FIB_ROUTE_PATH_UDP_ENCAP; + rpath->rpath.frp_udp_encap_id = bfm->bfm_id->bfmi_id; + break; + case BIER_NH_IP: + memcpy(&rpath->rpath.frp_addr, &bfm->bfm_id->bfmi_nh, + sizeof(rpath->rpath.frp_addr)); + break; + } +} static fib_node_t * bier_fmask_get_node (fib_node_index_t index) diff --git a/src/vnet/bier/bier_fmask.h b/src/vnet/bier/bier_fmask.h index 56930f6cd44..0666605c23f 100644 --- a/src/vnet/bier/bier_fmask.h +++ b/src/vnet/bier/bier_fmask.h @@ -163,6 +163,10 @@ extern u32 bier_fmask_child_add (fib_node_index_t fib_entry_index, fib_node_index_t child_index); extern void bier_fmask_child_remove (fib_node_index_t fib_entry_index, u32 sibling_index); +extern void bier_fmask_get_stats (index_t bfmi, u64 * packets, u64 * bytes); +extern void bier_fmask_encode (index_t bfmi, + bier_table_id_t *btid, + fib_route_path_encode_t *rpath); /* * provided for fast data-path access diff --git a/src/vnet/bier/bier_fmask_db.c b/src/vnet/bier/bier_fmask_db.c index 67d3bd1cf85..59e2973b589 100644 --- a/src/vnet/bier/bier_fmask_db.c +++ b/src/vnet/bier/bier_fmask_db.c @@ -31,7 +31,7 @@ typedef struct bier_fmask_db_t_ { /** * hash table for underlying storage */ - mhash_t bfdb_hash; + uword *bfdb_hash; /** * Pool for memory @@ -68,11 +68,12 @@ bier_fmask_db_mk_key (index_t bti, if (FIB_ROUTE_PATH_UDP_ENCAP & rpath->frp_flags) { key->bfmi_id = rpath->frp_udp_encap_id; + key->bfmi_nh_type = BIER_NH_UDP; } else { - key->bfmi_sw_if_index = rpath->frp_sw_if_index; memcpy(&key->bfmi_nh, &rpath->frp_addr, sizeof(rpath->frp_addr)); + key->bfmi_nh_type = BIER_NH_IP; } if (NULL == rpath->frp_label_stack) { @@ -82,6 +83,7 @@ bier_fmask_db_mk_key (index_t bti, { key->bfmi_hdr_type = BIER_HDR_O_MPLS; } + key->bfmi_bti = bti; } u32 @@ -92,7 +94,7 @@ bier_fmask_db_find (index_t bti, uword *p; bier_fmask_db_mk_key(bti, rpath, &fmid); - p = mhash_get(&bier_fmask_db.bfdb_hash, &fmid); + p = hash_get_mem(bier_fmask_db.bfdb_hash, &fmid); if (NULL != p) { @@ -111,7 +113,7 @@ bier_fmask_db_find_or_create_and_lock (index_t bti, uword *p; bier_fmask_db_mk_key(bti, rpath, &fmid); - p = mhash_get(&bier_fmask_db.bfdb_hash, &fmid); + p = hash_get_mem(bier_fmask_db.bfdb_hash, &fmid); if (NULL == p) { @@ -121,7 +123,7 @@ bier_fmask_db_find_or_create_and_lock (index_t bti, */ index = bier_fmask_create_and_lock(&fmid, rpath); bfm = bier_fmask_get(index); - mhash_set(&bier_fmask_db.bfdb_hash, bfm->bfm_id, index, 0); + hash_set_mem(bier_fmask_db.bfdb_hash, bfm->bfm_id, index); } else { @@ -137,7 +139,7 @@ bier_fmask_db_remove (const bier_fmask_id_t *fmid) { uword *p; - p = mhash_get(&bier_fmask_db.bfdb_hash, fmid); + p = hash_get_mem(bier_fmask_db.bfdb_hash, fmid); if (NULL == p) { /* @@ -145,16 +147,29 @@ bier_fmask_db_remove (const bier_fmask_id_t *fmid) */ ASSERT (!"remove non-existant fmask"); } else { - mhash_unset(&(bier_fmask_db.bfdb_hash), (void*)fmid, 0); + hash_unset(bier_fmask_db.bfdb_hash, fmid); } } +void +bier_fmask_db_walk (bier_fmask_walk_fn_t fn, void *ctx) +{ + CLIB_UNUSED (bier_fmask_id_t *fmid); + uword *bfmi; + + hash_foreach(fmid, bfmi, bier_fmask_db.bfdb_hash, + ({ + if (WALK_STOP == fn(*bfmi, ctx)) + break; + })); +} + clib_error_t * bier_fmask_db_module_init (vlib_main_t *vm) { - mhash_init(&bier_fmask_db.bfdb_hash, - sizeof(index_t), - sizeof(bier_fmask_id_t)); + bier_fmask_db.bfdb_hash = hash_create_mem(0, + sizeof(bier_fmask_id_t), + sizeof(index_t)); return (NULL); } diff --git a/src/vnet/bier/bier_fmask_db.h b/src/vnet/bier/bier_fmask_db.h index a7f29c2b6a6..36e555f8680 100644 --- a/src/vnet/bier/bier_fmask_db.h +++ b/src/vnet/bier/bier_fmask_db.h @@ -36,23 +36,28 @@ typedef enum bier_hdr_type_t_ { * BIER header in non-MPLS networks */ BIER_HDR_O_OTHER, -} bier_hdr_type_t; +} __attribute__((packed)) bier_hdr_type_t; /** - * A key/ID for a BIER forwarding Mas (FMask). - * This is a simplified version of a fib_route_path_t. + * BIER next-hop type */ -typedef struct bier_fmask_id_t_ { +typedef enum bier_nh_type_t_ { /** - * Type of BIER header this fmask supports + * BIER Header in MPLS networks */ - bier_hdr_type_t bfmi_hdr_type; + BIER_NH_IP, /** - * The BIER table this fmask is in + * BIER header in non-MPLS networks */ - index_t bfmi_bti; + BIER_NH_UDP, +} __attribute__((packed)) bier_nh_type_t; +/** + * A key/ID for a BIER forwarding Mas (FMask). + * This is a simplified version of a fib_route_path_t. + */ +typedef struct bier_fmask_id_t_ { union { /** * next-hop of the peer @@ -64,11 +69,20 @@ typedef struct bier_fmask_id_t_ { */ u32 bfmi_id; }; + /** + * The BIER table this fmask is in + */ + index_t bfmi_bti; /** - * Software interface index + * Type of BIER header this fmask supports */ - u32 bfmi_sw_if_index; + bier_hdr_type_t bfmi_hdr_type; + + /** + * Union discriminatrr + */ + bier_nh_type_t bfmi_nh_type; } __attribute__((packed)) bier_fmask_id_t; extern index_t @@ -79,5 +93,11 @@ extern index_t bier_fmask_db_find (index_t bti, extern void bier_fmask_db_remove (const bier_fmask_id_t *fmid); +/** + * Walk all the BIER fmasks + */ +typedef walk_rc_t (*bier_fmask_walk_fn_t) (index_t bfmi, void *ctx); + +extern void bier_fmask_db_walk(bier_fmask_walk_fn_t fn, void *ctx); #endif diff --git a/src/vnet/bier/bier_output.c b/src/vnet/bier/bier_output.c index 01eeffe475c..7f513fc7b48 100644 --- a/src/vnet/bier/bier_output.c +++ b/src/vnet/bier/bier_output.c @@ -49,6 +49,7 @@ typedef enum { * Forward declaration */ vlib_node_registration_t bier_output_node; +extern vlib_combined_counter_main_t bier_fmask_counters; /** * @brief Packet trace recoed for a BIER output @@ -64,13 +65,14 @@ bier_output (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * from_frame) { + vlib_combined_counter_main_t *cm = &bier_fmask_counters; u32 n_left_from, next_index, * from, * to_next; + u32 thread_index; + thread_index = vlib_get_thread_index (); from = vlib_frame_vector_args (from_frame); n_left_from = from_frame->n_vectors; - // vnet_buffer(b0)->sw_if_index[VLIB_TX] = d0->tx_fib_index; - /* * objection your honour! speculation! */ @@ -112,6 +114,10 @@ bier_output (vlib_main_t * vm, bfmi0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX]; bfm0 = bier_fmask_get(bfmi0); + vlib_increment_combined_counter( + cm, thread_index, bfmi0, 1, + vlib_buffer_length_in_chain (vm, b0)); + /* * perform the logical AND of the packet's mask with * that of the fmask objects, to reset the bits that diff --git a/src/vnet/udp/udp_encap.c b/src/vnet/udp/udp_encap.c index 4b4d5412ca7..914680f98a2 100644 --- a/src/vnet/udp/udp_encap.c +++ b/src/vnet/udp/udp_encap.c @@ -599,7 +599,7 @@ udp_encap_walk (udp_encap_walk_cb_t cb, void *ctx) /* *INDENT-OFF* */ pool_foreach_index(uei, udp_encap_pool, ({ - if (!cb(uei, ctx)) + if (WALK_STOP == cb(uei, ctx)) break; })); /* *INDENT-ON* */ diff --git a/src/vnet/udp/udp_encap.h b/src/vnet/udp/udp_encap.h index 185d5e7f7f9..e20edec7be5 100644 --- a/src/vnet/udp/udp_encap.h +++ b/src/vnet/udp/udp_encap.h @@ -131,7 +131,7 @@ extern void udp_encap_get_stats (index_t uei, u64 * packets, u64 * bytes); * Callback function invoked when walking all encap objects. * Return non-zero to continue the walk. */ -typedef int (*udp_encap_walk_cb_t) (index_t uei, void *ctx); +typedef walk_rc_t (*udp_encap_walk_cb_t) (index_t uei, void *ctx); /** * Walk each of the encap objects -- cgit 1.2.3-korg