mem: move librte_malloc to eal/common

[dpdk.git] / lib / librte_table / rte_table_hash_ext.c

diff --git a/lib/librte_table/rte_table_hash_ext.c b/lib/librte_table/rte_table_hash_ext.c
index 467f48a..1fa15c8 100644 (file)
--- a/lib/librte_table/rte_table_hash_ext.c
+++ b/lib/librte_table/rte_table_hash_ext.c
@@ -36,6 +36,7 @@
 
 #include <rte_common.h>
 #include <rte_mbuf.h>
+#include <rte_memory.h>
 #include <rte_malloc.h>
 #include <rte_log.h>
 
@@ -73,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;
@@ -81,6 +96,8 @@ struct grinder {
 };
 
 struct rte_table_hash {
+       struct rte_table_stats stats;
+
        /* Input parameters */
        uint32_t key_size;
        uint32_t entry_size;
@@ -148,19 +165,6 @@ check_params_create(struct rte_table_hash_ext_params *params)
                return -EINVAL;
        }
 
-       /* signature offset */
-       if ((params->signature_offset & 0x3) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: signature_offset invalid value\n",
-                       __func__);
-               return -EINVAL;
-       }
-
-       /* key offset */
-       if ((params->key_offset & 0x7) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: key_offset invalid value\n", __func__);
-               return -EINVAL;
-       }
-
        return 0;
 }
 
@@ -180,24 +184,24 @@ rte_table_hash_ext_create(void *params, int socket_id, uint32_t entry_size)
        /* Check input parameters */
        if ((check_params_create(p) != 0) ||
                (!rte_is_power_of_2(entry_size)) ||
-               ((sizeof(struct rte_table_hash) % CACHE_LINE_SIZE) != 0) ||
-               (sizeof(struct bucket) != (CACHE_LINE_SIZE / 2)))
+               ((sizeof(struct rte_table_hash) % RTE_CACHE_LINE_SIZE) != 0) ||
+               (sizeof(struct bucket) != (RTE_CACHE_LINE_SIZE / 2)))
                return NULL;
 
        /* Memory allocation */
-       table_meta_sz = CACHE_LINE_ROUNDUP(sizeof(struct rte_table_hash));
-       bucket_sz = CACHE_LINE_ROUNDUP(p->n_buckets * sizeof(struct bucket));
+       table_meta_sz = RTE_CACHE_LINE_ROUNDUP(sizeof(struct rte_table_hash));
+       bucket_sz = RTE_CACHE_LINE_ROUNDUP(p->n_buckets * sizeof(struct bucket));
        bucket_ext_sz =
-               CACHE_LINE_ROUNDUP(p->n_buckets_ext * sizeof(struct bucket));
-       key_sz = CACHE_LINE_ROUNDUP(p->n_keys * p->key_size);
-       key_stack_sz = CACHE_LINE_ROUNDUP(p->n_keys * sizeof(uint32_t));
+               RTE_CACHE_LINE_ROUNDUP(p->n_buckets_ext * sizeof(struct bucket));
+       key_sz = RTE_CACHE_LINE_ROUNDUP(p->n_keys * p->key_size);
+       key_stack_sz = RTE_CACHE_LINE_ROUNDUP(p->n_keys * sizeof(uint32_t));
        bkt_ext_stack_sz =
-               CACHE_LINE_ROUNDUP(p->n_buckets_ext * sizeof(uint32_t));
-       data_sz = CACHE_LINE_ROUNDUP(p->n_keys * entry_size);
+               RTE_CACHE_LINE_ROUNDUP(p->n_buckets_ext * sizeof(uint32_t));
+       data_sz = RTE_CACHE_LINE_ROUNDUP(p->n_keys * entry_size);
        total_size = table_meta_sz + bucket_sz + bucket_ext_sz + key_sz +
                key_stack_sz + bkt_ext_stack_sz + data_sz;
 
-       t = rte_zmalloc_socket("TABLE", total_size, CACHE_LINE_SIZE, socket_id);
+       t = rte_zmalloc_socket("TABLE", total_size, RTE_CACHE_LINE_SIZE, socket_id);
        if (t == NULL) {
                RTE_LOG(ERR, TABLE,
                        "%s: Cannot allocate %u bytes for hash table\n",
@@ -439,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;
@@ -483,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;
 }
 
@@ -860,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,
@@ -972,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;
 }
 
@@ -989,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,
@@ -1101,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  = {
@@ -1118,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,
 };