d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

table: fix actions with different data size

Browse Source 
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>
This commit is contained in:
Cristian Dumitrescu 2021-03-17 11:42:07 +00:00 committed by Thomas Monjalon
parent 77a413017c
commit 75a09af1b4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/librte_table/rte_swx_table_em.c
View File

@ -337,7 +337,7 @@ bkt_key_install(struct table *t,
/* Key data. */ /* Key data. */
bkt_data = table_key_data(t, bkt_key_id); bkt_data = table_key_data(t, bkt_key_id);
bkt_data[0] = input->action_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], memcpy(&bkt_data[1],
input->action_data, input->action_data,
t->params.action_data_size); t->params.action_data_size);
@ -358,7 +358,7 @@ bkt_key_data_update(struct table *t,
/* Key data. */ /* Key data. */
bkt_data = table_key_data(t, bkt_key_id); bkt_data = table_key_data(t, bkt_key_id);
bkt_data[0] = input->action_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], memcpy(&bkt_data[1],
input->action_data, input->action_data,
t->params.action_data_size); t->params.action_data_size);
@ -485,8 +485,6 @@ table_add(void *table, struct rte_swx_table_entry *entry)
CHECK(t, EINVAL); CHECK(t, EINVAL);
CHECK(entry, EINVAL); CHECK(entry, EINVAL);
CHECK(entry->key, 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); input_sig = hash(entry->key, t->key_mask, t->key_size, 0);
bkt_id = input_sig & (t->n_buckets - 1); bkt_id = input_sig & (t->n_buckets - 1);