table: fix actions with different data size

The table layer provisions an action_id and action_data_size data
bytes for each table key. This action_data_size is a maximal amount,
as some actions (depending on action_id) can require zero or less data
bytes than the maximal action_data_size. This fix allows for actions
with different data sizes to co-exist within the same table.

Fixes: d0a00966618b ("table: add exact match SWX table")
Cc: stable@dpdk.org
Signed-off-by: Churchill Khangar <churchill.khangar@intel.com>
Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>

diff --git a/lib/librte_table/rte_swx_table_em.c b/lib/librte_table/rte_swx_table_em.c
index 5f67223..788e25f 100644 (file)
--- a/lib/librte_table/rte_swx_table_em.c
+++ b/lib/librte_table/rte_swx_table_em.c
@@ -337,7 +337,7 @@ bkt_key_install(struct table *t,
        /* Key data. */
        bkt_data = table_key_data(t, bkt_key_id);
        bkt_data[0] = input->action_id;
-       if (t->params.action_data_size)
+       if (t->params.action_data_size && input->action_data)
                memcpy(&bkt_data[1],
                       input->action_data,
                       t->params.action_data_size);
@@ -358,7 +358,7 @@ bkt_key_data_update(struct table *t,
        /* Key data. */
        bkt_data = table_key_data(t, bkt_key_id);
        bkt_data[0] = input->action_id;
-       if (t->params.action_data_size)
+       if (t->params.action_data_size && input->action_data)
                memcpy(&bkt_data[1],
                       input->action_data,
                       t->params.action_data_size);
@@ -485,8 +485,6 @@ table_add(void *table, struct rte_swx_table_entry *entry)
        CHECK(t, EINVAL);
        CHECK(entry, EINVAL);
        CHECK(entry->key, EINVAL);
-       CHECK((!t->params.action_data_size && !entry->action_data) ||
-             (t->params.action_data_size && entry->action_data), EINVAL);
 
        input_sig = hash(entry->key, t->key_mask, t->key_size, 0);
        bkt_id = input_sig & (t->n_buckets - 1);