sched: fix build without red

[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 b218d64..cdeb0f5 100644 (file)
--- a/lib/librte_table/rte_table_lpm.c
+++ b/lib/librte_table/rte_table_lpm.c
@@ -74,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 *
@@ -82,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 */
@@ -93,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__);
@@ -103,7 +109,11 @@ rte_table_lpm_create(void *params, int socket_id, uint32_t entry_size)
                        __func__);
                return NULL;
        }
-
+       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 */
@@ -119,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");
@@ -174,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)) {
@@ -198,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 = 0;
+       uint32_t nht_pos0 = 0;
 
        /* Check input parameters */
        if (lpm == NULL) {
@@ -228,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__);
@@ -240,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;
        }
@@ -264,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 */
@@ -338,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) {
@@ -373,6 +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,
 };