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

net/ice: fix RSS type

Browse Source 
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>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
This commit is contained in:
Simei Su 2020-07-16 11:24:54 +08:00 committed by Ferruh Yigit
parent 69d5406d60
commit 4eafe71ee9
1 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/net/ice/ice_hash.c
View File

@ -994,7 +994,9 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
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 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
*/
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");