mbuf: move chaining from ip_frag library

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

diff --git a/lib/librte_table/rte_table_lpm.c b/lib/librte_table/rte_table_lpm.c
index cf92619..849d899 100644 (file)
--- a/lib/librte_table/rte_table_lpm.c
+++ b/lib/librte_table/rte_table_lpm.c
@@ -36,6 +36,7 @@
 
 #include <rte_common.h>
 #include <rte_mbuf.h>
+#include <rte_memory.h>
 #include <rte_malloc.h>
 #include <rte_byteorder.h>
 #include <rte_log.h>
@@ -45,7 +46,23 @@
 
 #define RTE_TABLE_LPM_MAX_NEXT_HOPS                        256
 
+#ifdef RTE_TABLE_STATS_COLLECT
+
+#define RTE_TABLE_LPM_STATS_PKTS_IN_ADD(table, val) \
+       table->stats.n_pkts_in += val
+#define RTE_TABLE_LPM_STATS_PKTS_LOOKUP_MISS(table, val) \
+       table->stats.n_pkts_lookup_miss += val
+
+#else
+
+#define RTE_TABLE_LPM_STATS_PKTS_IN_ADD(table, val)
+#define RTE_TABLE_LPM_STATS_PKTS_LOOKUP_MISS(table, val)
+
+#endif
+
 struct rte_table_lpm {
+       struct rte_table_stats stats;
+
        /* Input parameters */
        uint32_t entry_size;
        uint32_t entry_unique_size;
@@ -86,11 +103,11 @@ rte_table_lpm_create(void *params, int socket_id, uint32_t entry_size)
                        __func__);
                return NULL;
        }
-       if ((p->offset & 0x3) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: Invalid offset\n", __func__);
+       if (p->name == NULL) {
+               RTE_LOG(ERR, TABLE, "%s: Table name is NULL\n",
+                       __func__);
                return NULL;
        }
-
        entry_size = RTE_ALIGN(entry_size, sizeof(uint64_t));
 
        /* Memory allocation */
@@ -106,7 +123,7 @@ rte_table_lpm_create(void *params, int socket_id, uint32_t entry_size)
        }
 
        /* LPM low-level table creation */
-       lpm->lpm = rte_lpm_create("LPM", socket_id, p->n_rules, 0);
+       lpm->lpm = rte_lpm_create(p->name, socket_id, p->n_rules, 0);
        if (lpm->lpm == NULL) {
                rte_free(lpm);
                RTE_LOG(ERR, TABLE, "Unable to create low-level LPM table\n");
@@ -312,6 +329,9 @@ rte_table_lpm_lookup(
        uint64_t pkts_out_mask = 0;
        uint32_t i;
 
+       __rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask);
+       RTE_TABLE_LPM_STATS_PKTS_IN_ADD(lpm, n_pkts_in);
+
        pkts_out_mask = 0;
        for (i = 0; i < (uint32_t)(RTE_PORT_IN_BURST_SIZE_MAX -
                __builtin_clzll(pkts_mask)); i++) {
@@ -334,6 +354,20 @@ rte_table_lpm_lookup(
        }
 
        *lookup_hit_mask = pkts_out_mask;
+       RTE_TABLE_LPM_STATS_PKTS_LOOKUP_MISS(lpm, n_pkts_in - __builtin_popcountll(pkts_out_mask));
+       return 0;
+}
+
+static int
+rte_table_lpm_stats_read(void *table, struct rte_table_stats *stats, int clear)
+{
+       struct rte_table_lpm *t = (struct rte_table_lpm *) table;
+
+       if (stats != NULL)
+               memcpy(stats, &t->stats, sizeof(t->stats));
+
+       if (clear)
+               memset(&t->stats, 0, sizeof(t->stats));
 
        return 0;
 }
@@ -344,4 +378,5 @@ struct rte_table_ops rte_table_lpm_ops = {
        .f_add = rte_table_lpm_entry_add,
        .f_delete = rte_table_lpm_entry_delete,
        .f_lookup = rte_table_lpm_lookup,
+       .f_stats = rte_table_lpm_stats_read,
 };