table: add hash stats

Added statistics for hash ext table.
Added statistics for hash key8 table.
Added statistics for hash key16 table.
Added statistics for hash key32 table.
Added statistics for hash_lru table.

Signed-off-by: Maciej Gajdzica <maciejx.t.gajdzica@intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>

diff --git a/lib/librte_table/rte_table_hash_ext.c b/lib/librte_table/rte_table_hash_ext.c
index 73beeaf..1fa15c8 100644 (file)
--- a/lib/librte_table/rte_table_hash_ext.c
+++ b/lib/librte_table/rte_table_hash_ext.c
@@ -74,6 +74,20 @@ do                                                                   \
        (bucket)->next = (bucket2)->next;                               \
 while (0)
 
+#ifdef RTE_TABLE_STATS_COLLECT
+
+#define RTE_TABLE_HASH_EXT_STATS_PKTS_IN_ADD(table, val) \
+       table->stats.n_pkts_in += val
+#define RTE_TABLE_HASH_EXT_STATS_PKTS_LOOKUP_MISS(table, val) \
+       table->stats.n_pkts_lookup_miss += val
+
+#else
+
+#define RTE_TABLE_HASH_EXT_STATS_PKTS_IN_ADD(table, val)
+#define RTE_TABLE_HASH_EXT_STATS_PKTS_LOOKUP_MISS(table, val)
+
+#endif
+
 struct grinder {
        struct bucket *bkt;
        uint64_t sig;
@@ -82,6 +96,8 @@ struct grinder {
 };
 
 struct rte_table_hash {
+       struct rte_table_stats stats;
+
        /* Input parameters */
        uint32_t key_size;
        uint32_t entry_size;
@@ -427,6 +443,9 @@ static int rte_table_hash_ext_lookup_unoptimized(
        struct rte_table_hash *t = (struct rte_table_hash *) table;
        uint64_t pkts_mask_out = 0;
 
+       __rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask);
+       RTE_TABLE_HASH_EXT_STATS_PKTS_IN_ADD(t, n_pkts_in);
+
        for ( ; pkts_mask; ) {
                struct bucket *bkt0, *bkt;
                struct rte_mbuf *pkt;
@@ -471,6 +490,7 @@ static int rte_table_hash_ext_lookup_unoptimized(
        }
 
        *lookup_hit_mask = pkts_mask_out;
+       RTE_TABLE_HASH_EXT_STATS_PKTS_LOOKUP_MISS(t, n_pkts_in - __builtin_popcountll(pkts_mask_out));
        return 0;
 }
 
@@ -848,6 +868,9 @@ static int rte_table_hash_ext_lookup(
        uint64_t pkts_mask_out = 0, pkts_mask_match_many = 0;
        int status = 0;
 
+       __rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask);
+       RTE_TABLE_HASH_EXT_STATS_PKTS_IN_ADD(t, n_pkts_in);
+
        /* Cannot run the pipeline with less than 7 packets */
        if (__builtin_popcountll(pkts_mask) < 7)
                return rte_table_hash_ext_lookup_unoptimized(table, pkts,
@@ -960,6 +983,7 @@ static int rte_table_hash_ext_lookup(
        }
 
        *lookup_hit_mask = pkts_mask_out;
+       RTE_TABLE_HASH_EXT_STATS_PKTS_LOOKUP_MISS(t, n_pkts_in - __builtin_popcountll(pkts_mask_out));
        return status;
 }
 
@@ -977,6 +1001,9 @@ static int rte_table_hash_ext_lookup_dosig(
        uint64_t pkts_mask_out = 0, pkts_mask_match_many = 0;
        int status = 0;
 
+       __rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask);
+       RTE_TABLE_HASH_EXT_STATS_PKTS_IN_ADD(t, n_pkts_in);
+
        /* Cannot run the pipeline with less than 7 packets */
        if (__builtin_popcountll(pkts_mask) < 7)
                return rte_table_hash_ext_lookup_unoptimized(table, pkts,
@@ -1089,15 +1116,31 @@ static int rte_table_hash_ext_lookup_dosig(
        }
 
        *lookup_hit_mask = pkts_mask_out;
+       RTE_TABLE_HASH_EXT_STATS_PKTS_LOOKUP_MISS(t, n_pkts_in - __builtin_popcountll(pkts_mask_out));
        return status;
 }
 
+static int
+rte_table_hash_ext_stats_read(void *table, struct rte_table_stats *stats, int clear)
+{
+       struct rte_table_hash *t = (struct rte_table_hash *) table;
+
+       if (stats != NULL)
+               memcpy(stats, &t->stats, sizeof(t->stats));
+
+       if (clear)
+               memset(&t->stats, 0, sizeof(t->stats));
+
+       return 0;
+}
+
 struct rte_table_ops rte_table_hash_ext_ops     = {
        .f_create = rte_table_hash_ext_create,
        .f_free = rte_table_hash_ext_free,
        .f_add = rte_table_hash_ext_entry_add,
        .f_delete = rte_table_hash_ext_entry_delete,
        .f_lookup = rte_table_hash_ext_lookup,
+       .f_stats = rte_table_hash_ext_stats_read,
 };
 
 struct rte_table_ops rte_table_hash_ext_dosig_ops  = {
@@ -1106,4 +1149,5 @@ struct rte_table_ops rte_table_hash_ext_dosig_ops  = {
        .f_add = rte_table_hash_ext_entry_add,
        .f_delete = rte_table_hash_ext_entry_delete,
        .f_lookup = rte_table_hash_ext_lookup_dosig,
+       .f_stats = rte_table_hash_ext_stats_read,
 };

diff --git a/lib/librte_table/rte_table_hash_key16.c b/lib/librte_table/rte_table_hash_key16.c
index 67a4249..f6a3306 100644 (file)
--- a/lib/librte_table/rte_table_hash_key16.c
+++ b/lib/librte_table/rte_table_hash_key16.c
@@ -46,6 +46,20 @@
 
 #define RTE_BUCKET_ENTRY_VALID                                         0x1LLU
 
+#ifdef RTE_TABLE_STATS_COLLECT
+
+#define RTE_TABLE_HASH_KEY16_STATS_PKTS_IN_ADD(table, val) \
+       table->stats.n_pkts_in += val
+#define RTE_TABLE_HASH_KEY16_STATS_PKTS_LOOKUP_MISS(table, val) \
+       table->stats.n_pkts_lookup_miss += val
+
+#else
+
+#define RTE_TABLE_HASH_KEY16_STATS_PKTS_IN_ADD(table, val)
+#define RTE_TABLE_HASH_KEY16_STATS_PKTS_LOOKUP_MISS(table, val)
+
+#endif
+
 struct rte_bucket_4_16 {
        /* Cache line 0 */
        uint64_t signature[4 + 1];
@@ -61,6 +75,8 @@ struct rte_bucket_4_16 {
 };
 
 struct rte_table_hash {
+       struct rte_table_stats stats;
+
        /* Input parameters */
        uint32_t n_buckets;
        uint32_t n_entries_per_bucket;
@@ -807,6 +823,9 @@ rte_table_hash_lookup_key16_lru(
        uint32_t pkt11_index, pkt20_index, pkt21_index;
        uint64_t pkts_mask_out = 0;
 
+       __rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask);
+       RTE_TABLE_HASH_KEY16_STATS_PKTS_IN_ADD(f, n_pkts_in);
+
        /* Cannot run the pipeline with less than 5 packets */
        if (__builtin_popcountll(pkts_mask) < 5) {
                for ( ; pkts_mask; ) {
@@ -821,6 +840,7 @@ rte_table_hash_lookup_key16_lru(
                }
 
                *lookup_hit_mask = pkts_mask_out;
+               RTE_TABLE_HASH_KEY16_STATS_PKTS_LOOKUP_MISS(f, n_pkts_in - __builtin_popcountll(pkts_mask_out));
                return 0;
        }
 
@@ -910,6 +930,7 @@ rte_table_hash_lookup_key16_lru(
                bucket20, bucket21, pkts_mask_out, entries, f);
 
        *lookup_hit_mask = pkts_mask_out;
+       RTE_TABLE_HASH_KEY16_STATS_PKTS_LOOKUP_MISS(f, n_pkts_in - __builtin_popcountll(pkts_mask_out));
        return 0;
 } /* rte_table_hash_lookup_key16_lru() */
 
@@ -930,6 +951,9 @@ rte_table_hash_lookup_key16_ext(
        struct rte_bucket_4_16 *buckets[RTE_PORT_IN_BURST_SIZE_MAX];
        uint64_t *keys[RTE_PORT_IN_BURST_SIZE_MAX];
 
+       __rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask);
+       RTE_TABLE_HASH_KEY16_STATS_PKTS_IN_ADD(f, n_pkts_in);
+
        /* Cannot run the pipeline with less than 5 packets */
        if (__builtin_popcountll(pkts_mask) < 5) {
                for ( ; pkts_mask; ) {
@@ -1056,15 +1080,31 @@ grind_next_buckets:
        }
 
        *lookup_hit_mask = pkts_mask_out;
+       RTE_TABLE_HASH_KEY16_STATS_PKTS_LOOKUP_MISS(f, n_pkts_in - __builtin_popcountll(pkts_mask_out));
        return 0;
 } /* rte_table_hash_lookup_key16_ext() */
 
+static int
+rte_table_hash_key16_stats_read(void *table, struct rte_table_stats *stats, int clear)
+{
+       struct rte_table_hash *t = (struct rte_table_hash *) table;
+
+       if (stats != NULL)
+               memcpy(stats, &t->stats, sizeof(t->stats));
+
+       if (clear)
+               memset(&t->stats, 0, sizeof(t->stats));
+
+       return 0;
+}
+
 struct rte_table_ops rte_table_hash_key16_lru_ops = {
        .f_create = rte_table_hash_create_key16_lru,
        .f_free = rte_table_hash_free_key16_lru,
        .f_add = rte_table_hash_entry_add_key16_lru,
        .f_delete = rte_table_hash_entry_delete_key16_lru,
        .f_lookup = rte_table_hash_lookup_key16_lru,
+       .f_stats = rte_table_hash_key16_stats_read,
 };
 
 struct rte_table_ops rte_table_hash_key16_ext_ops = {
@@ -1073,4 +1113,5 @@ struct rte_table_ops rte_table_hash_key16_ext_ops = {
        .f_add = rte_table_hash_entry_add_key16_ext,
        .f_delete = rte_table_hash_entry_delete_key16_ext,
        .f_lookup = rte_table_hash_lookup_key16_ext,
+       .f_stats = rte_table_hash_key16_stats_read,
 };

diff --git a/lib/librte_table/rte_table_hash_key32.c b/lib/librte_table/rte_table_hash_key32.c
index 1fdb75d..5fe4161 100644 (file)
--- a/lib/librte_table/rte_table_hash_key32.c
+++ b/lib/librte_table/rte_table_hash_key32.c
@@ -46,6 +46,20 @@
 
 #define RTE_BUCKET_ENTRY_VALID                                         0x1LLU
 
+#ifdef RTE_TABLE_STATS_COLLECT
+
+#define RTE_TABLE_HASH_KEY32_STATS_PKTS_IN_ADD(table, val) \
+       table->stats.n_pkts_in += val
+#define RTE_TABLE_HASH_KEY32_STATS_PKTS_LOOKUP_MISS(table, val) \
+       table->stats.n_pkts_lookup_miss += val
+
+#else
+
+#define RTE_TABLE_HASH_KEY32_STATS_PKTS_IN_ADD(table, val)
+#define RTE_TABLE_HASH_KEY32_STATS_PKTS_LOOKUP_MISS(table, val)
+
+#endif
+
 struct rte_bucket_4_32 {
        /* Cache line 0 */
        uint64_t signature[4 + 1];
@@ -61,6 +75,8 @@ struct rte_bucket_4_32 {
 };
 
 struct rte_table_hash {
+       struct rte_table_stats stats;
+
        /* Input parameters */
        uint32_t n_buckets;
        uint32_t n_entries_per_bucket;
@@ -826,6 +842,9 @@ rte_table_hash_lookup_key32_lru(
        uint32_t pkt11_index, pkt20_index, pkt21_index;
        uint64_t pkts_mask_out = 0;
 
+       __rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask);
+       RTE_TABLE_HASH_KEY32_STATS_PKTS_IN_ADD(f, n_pkts_in);
+
        /* Cannot run the pipeline with less than 5 packets */
        if (__builtin_popcountll(pkts_mask) < 5) {
                for ( ; pkts_mask; ) {
@@ -840,6 +859,7 @@ rte_table_hash_lookup_key32_lru(
                }
 
                *lookup_hit_mask = pkts_mask_out;
+               RTE_TABLE_HASH_KEY32_STATS_PKTS_LOOKUP_MISS(f, n_pkts_in - __builtin_popcountll(pkts_mask_out));
                return 0;
        }
 
@@ -930,6 +950,7 @@ rte_table_hash_lookup_key32_lru(
                mbuf20, mbuf21, bucket20, bucket21, pkts_mask_out, entries, f);
 
        *lookup_hit_mask = pkts_mask_out;
+       RTE_TABLE_HASH_KEY32_STATS_PKTS_LOOKUP_MISS(f, n_pkts_in - __builtin_popcountll(pkts_mask_out));
        return 0;
 } /* rte_table_hash_lookup_key32_lru() */
 
@@ -950,6 +971,9 @@ rte_table_hash_lookup_key32_ext(
        struct rte_bucket_4_32 *buckets[RTE_PORT_IN_BURST_SIZE_MAX];
        uint64_t *keys[RTE_PORT_IN_BURST_SIZE_MAX];
 
+       __rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask);
+       RTE_TABLE_HASH_KEY32_STATS_PKTS_IN_ADD(f, n_pkts_in);
+
        /* Cannot run the pipeline with less than 5 packets */
        if (__builtin_popcountll(pkts_mask) < 5) {
                for ( ; pkts_mask; ) {
@@ -1076,15 +1100,31 @@ grind_next_buckets:
        }
 
        *lookup_hit_mask = pkts_mask_out;
+       RTE_TABLE_HASH_KEY32_STATS_PKTS_LOOKUP_MISS(f, n_pkts_in - __builtin_popcountll(pkts_mask_out));
        return 0;
 } /* rte_table_hash_lookup_key32_ext() */
 
+static int
+rte_table_hash_key32_stats_read(void *table, struct rte_table_stats *stats, int clear)
+{
+       struct rte_table_hash *t = (struct rte_table_hash *) table;
+
+       if (stats != NULL)
+               memcpy(stats, &t->stats, sizeof(t->stats));
+
+       if (clear)
+               memset(&t->stats, 0, sizeof(t->stats));
+
+       return 0;
+}
+
 struct rte_table_ops rte_table_hash_key32_lru_ops = {
        .f_create = rte_table_hash_create_key32_lru,
        .f_free = rte_table_hash_free_key32_lru,
        .f_add = rte_table_hash_entry_add_key32_lru,
        .f_delete = rte_table_hash_entry_delete_key32_lru,
        .f_lookup = rte_table_hash_lookup_key32_lru,
+       .f_stats = rte_table_hash_key32_stats_read,
 };
 
 struct rte_table_ops rte_table_hash_key32_ext_ops = {
@@ -1093,4 +1133,5 @@ struct rte_table_ops rte_table_hash_key32_ext_ops = {
        .f_add = rte_table_hash_entry_add_key32_ext,
        .f_delete = rte_table_hash_entry_delete_key32_ext,
        .f_lookup = rte_table_hash_lookup_key32_ext,
+       .f_stats = rte_table_hash_key32_stats_read,
 };

diff --git a/lib/librte_table/rte_table_hash_key8.c b/lib/librte_table/rte_table_hash_key8.c
index 4dfa3c8..b351a49 100644 (file)
--- a/lib/librte_table/rte_table_hash_key8.c
+++ b/lib/librte_table/rte_table_hash_key8.c
@@ -44,6 +44,20 @@
 
 #define RTE_TABLE_HASH_KEY_SIZE                                                8
 
+#ifdef RTE_TABLE_STATS_COLLECT
+
+#define RTE_TABLE_HASH_KEY8_STATS_PKTS_IN_ADD(table, val) \
+       table->stats.n_pkts_in += val
+#define RTE_TABLE_HASH_KEY8_STATS_PKTS_LOOKUP_MISS(table, val) \
+       table->stats.n_pkts_lookup_miss += val
+
+#else
+
+#define RTE_TABLE_HASH_KEY8_STATS_PKTS_IN_ADD(table, val)
+#define RTE_TABLE_HASH_KEY8_STATS_PKTS_LOOKUP_MISS(table, val)
+
+#endif
+
 struct rte_bucket_4_8 {
        /* Cache line 0 */
        uint64_t signature;
@@ -58,6 +72,8 @@ struct rte_bucket_4_8 {
 };
 
 struct rte_table_hash {
+       struct rte_table_stats stats;
+
        /* Input parameters */
        uint32_t n_buckets;
        uint32_t n_entries_per_bucket;
@@ -822,6 +838,9 @@ rte_table_hash_lookup_key8_lru(
                        pkt11_index, pkt20_index, pkt21_index;
        uint64_t pkts_mask_out = 0;
 
+       __rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask);
+       RTE_TABLE_HASH_KEY8_STATS_PKTS_IN_ADD(f, n_pkts_in);
+
        /* Cannot run the pipeline with less than 5 packets */
        if (__builtin_popcountll(pkts_mask) < 5) {
                for ( ; pkts_mask; ) {
@@ -836,6 +855,7 @@ rte_table_hash_lookup_key8_lru(
                }
 
                *lookup_hit_mask = pkts_mask_out;
+               RTE_TABLE_HASH_KEY8_STATS_PKTS_LOOKUP_MISS(f, n_pkts_in - __builtin_popcountll(pkts_mask_out));
                return 0;
        }
 
@@ -925,6 +945,7 @@ rte_table_hash_lookup_key8_lru(
                bucket20, bucket21, pkts_mask_out, entries, f);
 
        *lookup_hit_mask = pkts_mask_out;
+       RTE_TABLE_HASH_KEY8_STATS_PKTS_LOOKUP_MISS(f, n_pkts_in - __builtin_popcountll(pkts_mask_out));
        return 0;
 } /* rte_table_hash_lookup_key8_lru() */
 
@@ -943,6 +964,9 @@ rte_table_hash_lookup_key8_lru_dosig(
        uint32_t pkt11_index, pkt20_index, pkt21_index;
        uint64_t pkts_mask_out = 0;
 
+       __rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask);
+       RTE_TABLE_HASH_KEY8_STATS_PKTS_IN_ADD(f, n_pkts_in);
+
        /* Cannot run the pipeline with less than 5 packets */
        if (__builtin_popcountll(pkts_mask) < 5) {
                for ( ; pkts_mask; ) {
@@ -957,6 +981,7 @@ rte_table_hash_lookup_key8_lru_dosig(
                }
 
                *lookup_hit_mask = pkts_mask_out;
+               RTE_TABLE_HASH_KEY8_STATS_PKTS_LOOKUP_MISS(f, n_pkts_in - __builtin_popcountll(pkts_mask_out));
                return 0;
        }
 
@@ -1046,6 +1071,7 @@ rte_table_hash_lookup_key8_lru_dosig(
                bucket20, bucket21, pkts_mask_out, entries, f);
 
        *lookup_hit_mask = pkts_mask_out;
+       RTE_TABLE_HASH_KEY8_STATS_PKTS_LOOKUP_MISS(f, n_pkts_in - __builtin_popcountll(pkts_mask_out));
        return 0;
 } /* rte_table_hash_lookup_key8_lru_dosig() */
 
@@ -1066,6 +1092,9 @@ rte_table_hash_lookup_key8_ext(
        struct rte_bucket_4_8 *buckets[RTE_PORT_IN_BURST_SIZE_MAX];
        uint64_t *keys[RTE_PORT_IN_BURST_SIZE_MAX];
 
+       __rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask);
+       RTE_TABLE_HASH_KEY8_STATS_PKTS_IN_ADD(f, n_pkts_in);
+
        /* Cannot run the pipeline with less than 5 packets */
        if (__builtin_popcountll(pkts_mask) < 5) {
                for ( ; pkts_mask; ) {
@@ -1192,6 +1221,7 @@ grind_next_buckets:
        }
 
        *lookup_hit_mask = pkts_mask_out;
+       RTE_TABLE_HASH_KEY8_STATS_PKTS_LOOKUP_MISS(f, n_pkts_in - __builtin_popcountll(pkts_mask_out));
        return 0;
 } /* rte_table_hash_lookup_key8_ext() */
 
@@ -1212,6 +1242,9 @@ rte_table_hash_lookup_key8_ext_dosig(
        struct rte_bucket_4_8 *buckets[RTE_PORT_IN_BURST_SIZE_MAX];
        uint64_t *keys[RTE_PORT_IN_BURST_SIZE_MAX];
 
+       __rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask);
+       RTE_TABLE_HASH_KEY8_STATS_PKTS_IN_ADD(f, n_pkts_in);
+
        /* Cannot run the pipeline with less than 5 packets */
        if (__builtin_popcountll(pkts_mask) < 5) {
                for ( ; pkts_mask; ) {
@@ -1338,15 +1371,31 @@ grind_next_buckets:
        }
 
        *lookup_hit_mask = pkts_mask_out;
+       RTE_TABLE_HASH_KEY8_STATS_PKTS_LOOKUP_MISS(f, n_pkts_in - __builtin_popcountll(pkts_mask_out));
        return 0;
 } /* rte_table_hash_lookup_key8_dosig_ext() */
 
+static int
+rte_table_hash_key8_stats_read(void *table, struct rte_table_stats *stats, int clear)
+{
+       struct rte_table_hash *t = (struct rte_table_hash *) table;
+
+       if (stats != NULL)
+               memcpy(stats, &t->stats, sizeof(t->stats));
+
+       if (clear)
+               memset(&t->stats, 0, sizeof(t->stats));
+
+       return 0;
+}
+
 struct rte_table_ops rte_table_hash_key8_lru_ops = {
        .f_create = rte_table_hash_create_key8_lru,
        .f_free = rte_table_hash_free_key8_lru,
        .f_add = rte_table_hash_entry_add_key8_lru,
        .f_delete = rte_table_hash_entry_delete_key8_lru,
        .f_lookup = rte_table_hash_lookup_key8_lru,
+       .f_stats = rte_table_hash_key8_stats_read,
 };
 
 struct rte_table_ops rte_table_hash_key8_lru_dosig_ops = {
@@ -1355,6 +1404,7 @@ struct rte_table_ops rte_table_hash_key8_lru_dosig_ops = {
        .f_add = rte_table_hash_entry_add_key8_lru,
        .f_delete = rte_table_hash_entry_delete_key8_lru,
        .f_lookup = rte_table_hash_lookup_key8_lru_dosig,
+       .f_stats = rte_table_hash_key8_stats_read,
 };
 
 struct rte_table_ops rte_table_hash_key8_ext_ops = {
@@ -1363,6 +1413,7 @@ struct rte_table_ops rte_table_hash_key8_ext_ops = {
        .f_add = rte_table_hash_entry_add_key8_ext,
        .f_delete = rte_table_hash_entry_delete_key8_ext,
        .f_lookup = rte_table_hash_lookup_key8_ext,
+       .f_stats = rte_table_hash_key8_stats_read,
 };
 
 struct rte_table_ops rte_table_hash_key8_ext_dosig_ops = {
@@ -1371,4 +1422,5 @@ struct rte_table_ops rte_table_hash_key8_ext_dosig_ops = {
        .f_add = rte_table_hash_entry_add_key8_ext,
        .f_delete = rte_table_hash_entry_delete_key8_ext,
        .f_lookup = rte_table_hash_lookup_key8_ext_dosig,
+       .f_stats = rte_table_hash_key8_stats_read,
 };

diff --git a/lib/librte_table/rte_table_hash_lru.c b/lib/librte_table/rte_table_hash_lru.c
index b5393f0..1640dc9 100644 (file)
--- a/lib/librte_table/rte_table_hash_lru.c
+++ b/lib/librte_table/rte_table_hash_lru.c
@@ -45,6 +45,20 @@
 
 #define KEYS_PER_BUCKET        4
 
+#ifdef RTE_TABLE_STATS_COLLECT
+
+#define RTE_TABLE_HASH_LRU_STATS_PKTS_IN_ADD(table, val) \
+       table->stats.n_pkts_in += val
+#define RTE_TABLE_HASH_LRU_STATS_PKTS_LOOKUP_MISS(table, val) \
+       table->stats.n_pkts_lookup_miss += val
+
+#else
+
+#define RTE_TABLE_HASH_LRU_STATS_PKTS_IN_ADD(table, val)
+#define RTE_TABLE_HASH_LRU_STATS_PKTS_LOOKUP_MISS(table, val)
+
+#endif
+
 struct bucket {
        union {
                struct bucket *next;
@@ -63,6 +77,8 @@ struct grinder {
 };
 
 struct rte_table_hash {
+       struct rte_table_stats stats;
+
        /* Input parameters */
        uint32_t key_size;
        uint32_t entry_size;
@@ -355,6 +371,9 @@ static int rte_table_hash_lru_lookup_unoptimized(
        struct rte_table_hash *t = (struct rte_table_hash *) table;
        uint64_t pkts_mask_out = 0;
 
+       __rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask);
+       RTE_TABLE_HASH_LRU_STATS_PKTS_IN_ADD(t, n_pkts_in);
+
        for ( ; pkts_mask; ) {
                struct bucket *bkt;
                struct rte_mbuf *pkt;
@@ -399,6 +418,7 @@ static int rte_table_hash_lru_lookup_unoptimized(
        }
 
        *lookup_hit_mask = pkts_mask_out;
+       RTE_TABLE_HASH_LRU_STATS_PKTS_LOOKUP_MISS(t, n_pkts_in - __builtin_popcountll(pkts_mask_out));
        return 0;
 }
 
@@ -791,6 +811,9 @@ static int rte_table_hash_lru_lookup(
        uint64_t pkts_mask_out = 0, pkts_mask_match_many = 0;
        int status = 0;
 
+       __rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask);
+       RTE_TABLE_HASH_LRU_STATS_PKTS_IN_ADD(t, n_pkts_in);
+
        /* Cannot run the pipeline with less than 7 packets */
        if (__builtin_popcountll(pkts_mask) < 7)
                return rte_table_hash_lru_lookup_unoptimized(table, pkts,
@@ -903,6 +926,7 @@ static int rte_table_hash_lru_lookup(
        }
 
        *lookup_hit_mask = pkts_mask_out;
+       RTE_TABLE_HASH_LRU_STATS_PKTS_LOOKUP_MISS(t, n_pkts_in - __builtin_popcountll(pkts_mask_out));
        return status;
 }
 
@@ -920,6 +944,9 @@ static int rte_table_hash_lru_lookup_dosig(
        uint64_t pkts_mask_out = 0, pkts_mask_match_many = 0;
        int status = 0;
 
+       __rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask);
+       RTE_TABLE_HASH_LRU_STATS_PKTS_IN_ADD(t, n_pkts_in);
+
        /* Cannot run the pipeline with less than 7 packets */
        if (__builtin_popcountll(pkts_mask) < 7)
                return rte_table_hash_lru_lookup_unoptimized(table, pkts,
@@ -1032,15 +1059,31 @@ static int rte_table_hash_lru_lookup_dosig(
        }
 
        *lookup_hit_mask = pkts_mask_out;
+       RTE_TABLE_HASH_LRU_STATS_PKTS_LOOKUP_MISS(t, n_pkts_in - __builtin_popcountll(pkts_mask_out));
        return status;
 }
 
+static int
+rte_table_hash_lru_stats_read(void *table, struct rte_table_stats *stats, int clear)
+{
+       struct rte_table_hash *t = (struct rte_table_hash *) table;
+
+       if (stats != NULL)
+               memcpy(stats, &t->stats, sizeof(t->stats));
+
+       if (clear)
+               memset(&t->stats, 0, sizeof(t->stats));
+
+       return 0;
+}
+
 struct rte_table_ops rte_table_hash_lru_ops = {
        .f_create = rte_table_hash_lru_create,
        .f_free = rte_table_hash_lru_free,
        .f_add = rte_table_hash_lru_entry_add,
        .f_delete = rte_table_hash_lru_entry_delete,
        .f_lookup = rte_table_hash_lru_lookup,
+       .f_stats = rte_table_hash_lru_stats_read,
 };
 
 struct rte_table_ops rte_table_hash_lru_dosig_ops = {
@@ -1049,4 +1092,5 @@ struct rte_table_ops rte_table_hash_lru_dosig_ops = {
        .f_add = rte_table_hash_lru_entry_add,
        .f_delete = rte_table_hash_lru_entry_delete,
        .f_lookup = rte_table_hash_lru_lookup_dosig,
+       .f_stats = rte_table_hash_lru_stats_read,
 };