From: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
To: dev@dpdk.org
Cc: stable@dpdk.org, Churchill Khangar <churchill.khangar@intel.com>
Subject: [dpdk-dev] [PATCH] table: fix actions with different data size
Date: Tue, 16 Mar 2021 14:59:55 +0000 [thread overview]
Message-ID: <20210316145955.54965-1-cristian.dumitrescu@intel.com> (raw)
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>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
---
lib/librte_table/rte_swx_table_em.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/librte_table/rte_swx_table_em.c b/lib/librte_table/rte_swx_table_em.c
index 5f6722306..6886a82ba 100644
--- 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,7 @@ 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);
+ CHECK(!entry->action_data || t->params.action_data_size, EINVAL);
input_sig = hash(entry->key, t->key_mask, t->key_size, 0);
bkt_id = input_sig & (t->n_buckets - 1);
--
2.17.1
reply other threads:[~2021-03-16 15:00 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210316145955.54965-1-cristian.dumitrescu@intel.com \
--to=cristian.dumitrescu@intel.com \
--cc=churchill.khangar@intel.com \
--cc=dev@dpdk.org \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).