From: Simei Su <simei.su@intel.com>
To: qi.z.zhang@intel.com
Cc: dev@dpdk.org, jia.guo@intel.com, junfeng.guo@intel.com,
ting.xu@intel.com, Simei Su <simei.su@intel.com>
Subject: [dpdk-dev] [PATCH v5] net/ice: fix invalid RSS type
Date: Thu, 16 Jul 2020 11:24:54 +0800 [thread overview]
Message-ID: <1594869894-419486-1-git-send-email-simei.su@intel.com> (raw)
In-Reply-To: <1594808751-138882-1-git-send-email-simei.su@intel.com>
When a RSS rule with only SRC/DST_ONLY or IPV6 prefix RSS type,
it should return failure. Besides, when a RSS rule with symmetric
hash function, the RSS type shouldn't carry with SRC/DST_ONLY.
This patch adds invalid RSS type check for the two cases.
Fixes: 0b952714e9c1 ("net/ice: refactor PF hash flow")
Signed-off-by: Simei Su <simei.su@intel.com>
---
v5:
* Refactor code to avoid duplicate.
v4:
* Modify check logic for symmetric case.
v3:
* Add invalid RSS type check for symmetric case.
* Consider IPV6 prefix.
* Refine commit log.
v2:
* Add specific macro value in check rather than hard code.
---
drivers/net/ice/ice_hash.c | 47 +++++++++++++++++++++++++++++++++++-----------
1 file changed, 36 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
index e57feff..af29ab6 100644
--- a/drivers/net/ice/ice_hash.c
+++ b/drivers/net/ice/ice_hash.c
@@ -994,7 +994,9 @@ struct ice_hash_match_type ice_hash_type_list[] = {
enum rte_flow_action_type action_type;
const struct rte_flow_action_rss *rss;
const struct rte_flow_action *action;
- uint64_t combine_type;
+ uint64_t rss_attr_src_dst;
+ uint64_t rss_attr_l3_pre;
+ uint64_t rss_attr_all;
uint64_t rss_type;
uint16_t i;
@@ -1046,18 +1048,41 @@ struct ice_hash_match_type ice_hash_type_list[] = {
*/
rss_type = rte_eth_rss_hf_refine(rss_type);
- combine_type = ETH_RSS_L2_SRC_ONLY |
- ETH_RSS_L2_DST_ONLY |
- RTE_ETH_RSS_L3_PRE32 |
- RTE_ETH_RSS_L3_PRE48 |
- RTE_ETH_RSS_L3_PRE64 |
- ETH_RSS_L3_SRC_ONLY |
- ETH_RSS_L3_DST_ONLY |
- ETH_RSS_L4_SRC_ONLY |
- ETH_RSS_L4_DST_ONLY;
+ rss_attr_src_dst = ETH_RSS_L2_SRC_ONLY |
+ ETH_RSS_L2_DST_ONLY |
+ ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_L4_SRC_ONLY |
+ ETH_RSS_L4_DST_ONLY;
+
+ rss_attr_l3_pre = RTE_ETH_RSS_L3_PRE32 |
+ RTE_ETH_RSS_L3_PRE48 |
+ RTE_ETH_RSS_L3_PRE64;
+
+ rss_attr_all = rss_attr_src_dst | rss_attr_l3_pre;
+
+ /* Check if only SRC/DST_ONLY or ipv6 prefix exists. */
+ if ((rss_type & ~rss_attr_all) == 0)
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION, action,
+ "invalid rss types");
+
+ /**
+ * Check if SRC/DST_ONLY is set for SYMMETRIC_TOEPLITZ
+ * hash function.
+ */
+ if (rss->func ==
+ RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ) {
+ if (rss_type & rss_attr_src_dst)
+ return rte_flow_error_set(error,
+ ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION,
+ action,
+ "invalid rss types");
+ }
/* Check if rss types match pattern. */
- if (rss_type & ~combine_type & ~m->eth_rss_hint) {
+ if (rss_type & ~rss_attr_all & ~m->eth_rss_hint) {
return rte_flow_error_set(error,
ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION,
action, "Not supported RSS types");
--
1.8.3.1
next prev parent reply other threads:[~2020-07-16 3:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-09 6:26 [dpdk-dev] [PATCH] " Simei Su
2020-07-09 6:46 ` Zhang, Qi Z
2020-07-09 7:32 ` Su, Simei
2020-07-09 7:50 ` [dpdk-dev] [PATCH v2] " Simei Su
2020-07-11 14:01 ` [dpdk-dev] [PATCH v3] " Simei Su
2020-07-15 10:25 ` [dpdk-dev] [PATCH v4] " Simei Su
2020-07-15 14:13 ` Zhang, Qi Z
2020-07-16 3:01 ` Su, Simei
2020-07-16 3:24 ` Simei Su [this message]
2020-07-16 3:33 ` [dpdk-dev] [PATCH v5] " Zhang, Qi Z
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=1594869894-419486-1-git-send-email-simei.su@intel.com \
--to=simei.su@intel.com \
--cc=dev@dpdk.org \
--cc=jia.guo@intel.com \
--cc=junfeng.guo@intel.com \
--cc=qi.z.zhang@intel.com \
--cc=ting.xu@intel.com \
/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).