pci: align ioport unmap error handling to ioport map

[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 a175ff3..cdeb0f5 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;
@@ -57,7 +74,7 @@ struct rte_table_lpm {
 
        /* Next Hop Table (NHT) */
        uint32_t nht_users[RTE_TABLE_LPM_MAX_NEXT_HOPS];
-       uint8_t nht[0] __rte_cache_aligned;
+       uint32_t nht[0] __rte_cache_aligned;
 };
 
 static void *
@@ -65,6 +82,8 @@ rte_table_lpm_create(void *params, int socket_id, uint32_t entry_size)
 {
        struct rte_table_lpm_params *p = (struct rte_table_lpm_params *) params;
        struct rte_table_lpm *lpm;
+       struct rte_lpm_config lpm_config;
+
        uint32_t total_size, nht_size;
 
        /* Check input parameters */
@@ -76,6 +95,10 @@ rte_table_lpm_create(void *params, int socket_id, uint32_t entry_size)
                RTE_LOG(ERR, TABLE, "%s: Invalid n_rules\n", __func__);
                return NULL;
        }
+       if (p->number_tbl8s == 0) {
+               RTE_LOG(ERR, TABLE, "%s: Invalid number_tbl8s\n", __func__);
+               return NULL;
+       }
        if (p->entry_unique_size == 0) {
                RTE_LOG(ERR, TABLE, "%s: Invalid entry_unique_size\n",
                        __func__);
@@ -86,17 +109,17 @@ 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 */
        nht_size = RTE_TABLE_LPM_MAX_NEXT_HOPS * entry_size;
        total_size = sizeof(struct rte_table_lpm) + nht_size;
-       lpm = rte_zmalloc_socket("TABLE", total_size, CACHE_LINE_SIZE,
+       lpm = rte_zmalloc_socket("TABLE", total_size, RTE_CACHE_LINE_SIZE,
                socket_id);
        if (lpm == NULL) {
                RTE_LOG(ERR, TABLE,
@@ -106,7 +129,11 @@ 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_config.max_rules = p->n_rules;
+       lpm_config.number_tbl8s = p->number_tbl8s;
+       lpm_config.flags = p->flags;
+       lpm->lpm = rte_lpm_create(p->name, socket_id, &lpm_config);
+
        if (lpm->lpm == NULL) {
                rte_free(lpm);
                RTE_LOG(ERR, TABLE, "Unable to create low-level LPM table\n");
@@ -161,7 +188,7 @@ nht_find_existing(struct rte_table_lpm *lpm, void *entry, uint32_t *pos)
        uint32_t i;
 
        for (i = 0; i < RTE_TABLE_LPM_MAX_NEXT_HOPS; i++) {
-               uint8_t *nht_entry = &lpm->nht[i * lpm->entry_size];
+               uint32_t *nht_entry = &lpm->nht[i * lpm->entry_size];
 
                if ((lpm->nht_users[i] > 0) && (memcmp(nht_entry, entry,
                        lpm->entry_unique_size) == 0)) {
@@ -185,7 +212,7 @@ rte_table_lpm_entry_add(
        struct rte_table_lpm_key *ip_prefix = (struct rte_table_lpm_key *) key;
        uint32_t nht_pos, nht_pos0_valid;
        int status;
-       uint8_t nht_pos0;
+       uint32_t nht_pos0 = 0;
 
        /* Check input parameters */
        if (lpm == NULL) {
@@ -215,7 +242,7 @@ rte_table_lpm_entry_add(
 
        /* Find existing or free NHT entry */
        if (nht_find_existing(lpm, entry, &nht_pos) == 0) {
-               uint8_t *nht_entry;
+               uint32_t *nht_entry;
 
                if (nht_find_free(lpm, &nht_pos) == 0) {
                        RTE_LOG(ERR, TABLE, "%s: NHT full\n", __func__);
@@ -227,8 +254,7 @@ rte_table_lpm_entry_add(
        }
 
        /* Add rule to low level LPM table */
-       if (rte_lpm_add(lpm->lpm, ip_prefix->ip, ip_prefix->depth,
-               (uint8_t) nht_pos) < 0) {
+       if (rte_lpm_add(lpm->lpm, ip_prefix->ip, ip_prefix->depth, nht_pos) < 0) {
                RTE_LOG(ERR, TABLE, "%s: LPM rule add failed\n", __func__);
                return -1;
        }
@@ -251,7 +277,7 @@ rte_table_lpm_entry_delete(
 {
        struct rte_table_lpm *lpm = (struct rte_table_lpm *) table;
        struct rte_table_lpm_key *ip_prefix = (struct rte_table_lpm_key *) key;
-       uint8_t nht_pos;
+       uint32_t nht_pos;
        int status;
 
        /* Check input parameters */
@@ -312,6 +338,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++) {
@@ -322,7 +351,7 @@ rte_table_lpm_lookup(
                        uint32_t ip = rte_bswap32(
                                RTE_MBUF_METADATA_UINT32(pkt, lpm->offset));
                        int status;
-                       uint8_t nht_pos;
+                       uint32_t nht_pos;
 
                        status = rte_lpm_lookup(lpm->lpm, ip, &nht_pos);
                        if (status == 0) {
@@ -334,6 +363,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;
 }
@@ -343,5 +386,8 @@ struct rte_table_ops rte_table_lpm_ops = {
        .f_free = rte_table_lpm_free,
        .f_add = rte_table_lpm_entry_add,
        .f_delete = rte_table_lpm_entry_delete,
+       .f_add_bulk = NULL,
+       .f_delete_bulk = NULL,
        .f_lookup = rte_table_lpm_lookup,
+       .f_stats = rte_table_lpm_stats_read,
 };