ethdev: fix missing imissed counter in xstats

[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 7b2ecb0..2f472b9 100644 (file)
--- a/lib/librte_table/rte_table_lpm.c
+++ b/lib/librte_table/rte_table_lpm.c
@@ -44,7 +44,9 @@
 
 #include "rte_table_lpm.h"
 
-#define RTE_TABLE_LPM_MAX_NEXT_HOPS                        256
+#ifndef RTE_TABLE_LPM_MAX_NEXT_HOPS
+#define RTE_TABLE_LPM_MAX_NEXT_HOPS                        65536
+#endif
 
 #ifdef RTE_TABLE_STATS_COLLECT
 
@@ -74,14 +76,16 @@ struct rte_table_lpm {
 
        /* Next Hop Table (NHT) */
        uint32_t nht_users[RTE_TABLE_LPM_MAX_NEXT_HOPS];
-       uint32_t nht[0] __rte_cache_aligned;
+       uint8_t nht[0] __rte_cache_aligned;
 };
 
 static void *
 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_params *p = params;
        struct rte_table_lpm *lpm;
+       struct rte_lpm_config lpm_config;
+
        uint32_t total_size, nht_size;
 
        /* Check input parameters */
@@ -93,6 +97,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__);
@@ -123,7 +131,11 @@ rte_table_lpm_create(void *params, int socket_id, uint32_t entry_size)
        }
 
        /* LPM low-level table creation */
-       lpm->lpm = rte_lpm_create(p->name, 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");
@@ -142,7 +154,7 @@ rte_table_lpm_create(void *params, int socket_id, uint32_t entry_size)
 static int
 rte_table_lpm_free(void *table)
 {
-       struct rte_table_lpm *lpm = (struct rte_table_lpm *) table;
+       struct rte_table_lpm *lpm = table;
 
        /* Check input parameters */
        if (lpm == NULL) {
@@ -178,7 +190,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++) {
-               uint32_t *nht_entry = &lpm->nht[i * lpm->entry_size];
+               uint8_t *nht_entry = &lpm->nht[i * lpm->entry_size];
 
                if ((lpm->nht_users[i] > 0) && (memcmp(nht_entry, entry,
                        lpm->entry_unique_size) == 0)) {
@@ -198,8 +210,8 @@ rte_table_lpm_entry_add(
        int *key_found,
        void **entry_ptr)
 {
-       struct rte_table_lpm *lpm = (struct rte_table_lpm *) table;
-       struct rte_table_lpm_key *ip_prefix = (struct rte_table_lpm_key *) key;
+       struct rte_table_lpm *lpm = table;
+       struct rte_table_lpm_key *ip_prefix = key;
        uint32_t nht_pos, nht_pos0_valid;
        int status;
        uint32_t nht_pos0 = 0;
@@ -232,7 +244,7 @@ rte_table_lpm_entry_add(
 
        /* Find existing or free NHT entry */
        if (nht_find_existing(lpm, entry, &nht_pos) == 0) {
-               uint32_t *nht_entry;
+               uint8_t *nht_entry;
 
                if (nht_find_free(lpm, &nht_pos) == 0) {
                        RTE_LOG(ERR, TABLE, "%s: NHT full\n", __func__);
@@ -265,8 +277,8 @@ rte_table_lpm_entry_delete(
        int *key_found,
        void *entry)
 {
-       struct rte_table_lpm *lpm = (struct rte_table_lpm *) table;
-       struct rte_table_lpm_key *ip_prefix = (struct rte_table_lpm_key *) key;
+       struct rte_table_lpm *lpm = table;
+       struct rte_table_lpm_key *ip_prefix = key;
        uint32_t nht_pos;
        int status;
 
@@ -360,7 +372,7 @@ rte_table_lpm_lookup(
 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;
+       struct rte_table_lpm *t = table;
 
        if (stats != NULL)
                memcpy(stats, &t->stats, sizeof(t->stats));