mem: move librte_malloc to eal/common

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

diff --git a/lib/librte_table/rte_table_hash_key8.c b/lib/librte_table/rte_table_hash_key8.c
index 606805d..b351a49 100644 (file)
--- a/lib/librte_table/rte_table_hash_key8.c
+++ b/lib/librte_table/rte_table_hash_key8.c
@@ -35,6 +35,7 @@
 
 #include <rte_common.h>
 #include <rte_mbuf.h>
+#include <rte_memory.h>
 #include <rte_malloc.h>
 #include <rte_log.h>
 
@@ -43,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;
@@ -57,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;
@@ -85,18 +102,6 @@ check_params_create_lru(struct rte_table_hash_key8_lru_params *params) {
                return -EINVAL;
        }
 
-       /* signature offset */
-       if ((params->signature_offset & 0x3) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: invalid signature_offset\n", __func__);
-               return -EINVAL;
-       }
-
-       /* key offset */
-       if ((params->key_offset & 0x7) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: invalid key_offset\n", __func__);
-               return -EINVAL;
-       }
-
        /* f_hash */
        if (params->f_hash == NULL) {
                RTE_LOG(ERR, TABLE, "%s: f_hash function pointer is NULL\n",
@@ -118,8 +123,8 @@ rte_table_hash_create_key8_lru(void *params, int socket_id, uint32_t entry_size)
 
        /* Check input parameters */
        if ((check_params_create_lru(p) != 0) ||
-               ((sizeof(struct rte_table_hash) % CACHE_LINE_SIZE) != 0) ||
-               ((sizeof(struct rte_bucket_4_8) % CACHE_LINE_SIZE) != 0)) {
+               ((sizeof(struct rte_table_hash) % RTE_CACHE_LINE_SIZE) != 0) ||
+               ((sizeof(struct rte_bucket_4_8) % RTE_CACHE_LINE_SIZE) != 0)) {
                return NULL;
        }
        n_entries_per_bucket = 4;
@@ -129,11 +134,11 @@ rte_table_hash_create_key8_lru(void *params, int socket_id, uint32_t entry_size)
        n_buckets = rte_align32pow2((p->n_entries + n_entries_per_bucket - 1) /
                n_entries_per_bucket);
        bucket_size_cl = (sizeof(struct rte_bucket_4_8) + n_entries_per_bucket *
-               entry_size + CACHE_LINE_SIZE - 1) / CACHE_LINE_SIZE;
+               entry_size + RTE_CACHE_LINE_SIZE - 1) / RTE_CACHE_LINE_SIZE;
        total_size = sizeof(struct rte_table_hash) + n_buckets *
-               bucket_size_cl * CACHE_LINE_SIZE;
+               bucket_size_cl * RTE_CACHE_LINE_SIZE;
 
-       f = rte_zmalloc_socket("TABLE", total_size, CACHE_LINE_SIZE, socket_id);
+       f = rte_zmalloc_socket("TABLE", total_size, RTE_CACHE_LINE_SIZE, socket_id);
        if (f == NULL) {
                RTE_LOG(ERR, TABLE,
                        "%s: Cannot allocate %u bytes for hash table\n",
@@ -149,7 +154,7 @@ rte_table_hash_create_key8_lru(void *params, int socket_id, uint32_t entry_size)
        f->n_entries_per_bucket = n_entries_per_bucket;
        f->key_size = key_size;
        f->entry_size = entry_size;
-       f->bucket_size = bucket_size_cl * CACHE_LINE_SIZE;
+       f->bucket_size = bucket_size_cl * RTE_CACHE_LINE_SIZE;
        f->signature_offset = p->signature_offset;
        f->key_offset = p->key_offset;
        f->f_hash = p->f_hash;
@@ -299,18 +304,6 @@ check_params_create_ext(struct rte_table_hash_key8_ext_params *params) {
                return -EINVAL;
        }
 
-       /* signature offset */
-       if ((params->signature_offset & 0x3) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: invalid signature_offset\n", __func__);
-               return -EINVAL;
-       }
-
-       /* key offset */
-       if ((params->key_offset & 0x7) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: invalid key_offset\n", __func__);
-               return -EINVAL;
-       }
-
        /* f_hash */
        if (params->f_hash == NULL) {
                RTE_LOG(ERR, TABLE, "%s: f_hash function pointer is NULL\n",
@@ -332,8 +325,8 @@ rte_table_hash_create_key8_ext(void *params, int socket_id, uint32_t entry_size)
 
        /* Check input parameters */
        if ((check_params_create_ext(p) != 0) ||
-               ((sizeof(struct rte_table_hash) % CACHE_LINE_SIZE) != 0) ||
-               ((sizeof(struct rte_bucket_4_8) % CACHE_LINE_SIZE) != 0))
+               ((sizeof(struct rte_table_hash) % RTE_CACHE_LINE_SIZE) != 0) ||
+               ((sizeof(struct rte_bucket_4_8) % RTE_CACHE_LINE_SIZE) != 0))
                return NULL;
 
        n_entries_per_bucket = 4;
@@ -345,14 +338,14 @@ rte_table_hash_create_key8_ext(void *params, int socket_id, uint32_t entry_size)
        n_buckets_ext = (p->n_entries_ext + n_entries_per_bucket - 1) /
                n_entries_per_bucket;
        bucket_size_cl = (sizeof(struct rte_bucket_4_8) + n_entries_per_bucket *
-               entry_size + CACHE_LINE_SIZE - 1) / CACHE_LINE_SIZE;
-       stack_size_cl = (n_buckets_ext * sizeof(uint32_t) + CACHE_LINE_SIZE - 1)
-               / CACHE_LINE_SIZE;
+               entry_size + RTE_CACHE_LINE_SIZE - 1) / RTE_CACHE_LINE_SIZE;
+       stack_size_cl = (n_buckets_ext * sizeof(uint32_t) + RTE_CACHE_LINE_SIZE - 1)
+               / RTE_CACHE_LINE_SIZE;
        total_size = sizeof(struct rte_table_hash) + ((n_buckets +
                n_buckets_ext) * bucket_size_cl + stack_size_cl) *
-               CACHE_LINE_SIZE;
+               RTE_CACHE_LINE_SIZE;
 
-       f = rte_zmalloc_socket("TABLE", total_size, CACHE_LINE_SIZE, socket_id);
+       f = rte_zmalloc_socket("TABLE", total_size, RTE_CACHE_LINE_SIZE, socket_id);
        if (f == NULL) {
                RTE_LOG(ERR, TABLE,
                        "%s: Cannot allocate %u bytes for hash table\n",
@@ -368,7 +361,7 @@ rte_table_hash_create_key8_ext(void *params, int socket_id, uint32_t entry_size)
        f->n_entries_per_bucket = n_entries_per_bucket;
        f->key_size = key_size;
        f->entry_size = entry_size;
-       f->bucket_size = bucket_size_cl * CACHE_LINE_SIZE;
+       f->bucket_size = bucket_size_cl * RTE_CACHE_LINE_SIZE;
        f->signature_offset = p->signature_offset;
        f->key_offset = p->key_offset;
        f->f_hash = p->f_hash;
@@ -527,9 +520,8 @@ rte_table_hash_entry_delete_key8_ext(
 
                                        memset(bucket, 0,
                                                sizeof(struct rte_bucket_4_8));
-                                       bucket_index = (bucket -
-                                               ((struct rte_bucket_4_8 *)
-                                               f->memory)) - f->n_buckets;
+                                       bucket_index = (((uint8_t *)bucket -
+                                               (uint8_t *)f->memory)/f->bucket_size) - f->n_buckets;
                                        f->stack[f->stack_pos++] = bucket_index;
                                }
 
@@ -846,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; ) {
@@ -860,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;
        }
 
@@ -949,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() */
 
@@ -967,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; ) {
@@ -981,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;
        }
 
@@ -1070,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() */
 
@@ -1090,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; ) {
@@ -1216,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() */
 
@@ -1236,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; ) {
@@ -1362,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 = {
@@ -1379,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 = {
@@ -1387,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 = {
@@ -1395,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,
 };