Since some specific rss hash type need to combine with the protocol
hash type when configure a rss hash rule, so add the corresponding
input set to support these case for iavf hash.
Fixes: 7be10c3004be ("net/iavf: add RSS configuration for VF")
Signed-off-by: Jeff Guo <jia....@intel.com>
---
drivers/net/iavf/iavf_hash.c | 96 ++++++++++++++++++++++++++++++++++++
1 file changed, 96 insertions(+)
diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c
index a1d0b8364..97370aa19 100644
--- a/drivers/net/iavf/iavf_hash.c
+++ b/drivers/net/iavf/iavf_hash.c
@@ -594,11 +594,19 @@ struct iavf_hash_match_type iavf_hash_type_list[] = {
/* IPV4 */
{IAVF_PATTERN_HINT_IPV4, ETH_RSS_L2_SRC_ONLY, &hdrs_hint_eth_src},
{IAVF_PATTERN_HINT_IPV4, ETH_RSS_L2_DST_ONLY, &hdrs_hint_eth_dst},
+ {IAVF_PATTERN_HINT_IPV4, ETH_RSS_ETH | ETH_RSS_L2_SRC_ONLY,
+ &hdrs_hint_eth_src},
+ {IAVF_PATTERN_HINT_IPV4, ETH_RSS_ETH | ETH_RSS_L2_DST_ONLY,
+ &hdrs_hint_eth_dst},
{IAVF_PATTERN_HINT_IPV4, ETH_RSS_ETH, &hdrs_hint_eth},
{IAVF_PATTERN_HINT_IPV4, ETH_RSS_S_VLAN, &hdrs_hint_svlan},
{IAVF_PATTERN_HINT_IPV4, ETH_RSS_C_VLAN, &hdrs_hint_cvlan},
{IAVF_PATTERN_HINT_IPV4, ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src},
{IAVF_PATTERN_HINT_IPV4, ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst},
+ {IAVF_PATTERN_HINT_IPV4, ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src},
+ {IAVF_PATTERN_HINT_IPV4, ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst},
{IAVF_PATTERN_HINT_IPV4, ETH_RSS_ESP, &hdrs_hint_ipv4_esp},
{IAVF_PATTERN_HINT_IPV4, ETH_RSS_AH, &hdrs_hint_ipv4_ah},
{IAVF_PATTERN_HINT_IPV4, ETH_RSS_L2TPV3, &hdrs_hint_ipv4_l2tpv3},
@@ -620,6 +628,23 @@ struct iavf_hash_match_type iavf_hash_type_list[] = {
&hdrs_hint_ipv4_dst_gtpu_dwn},
{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L3_DST_ONLY,
&hdrs_hint_ipv4_dst},
+ {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_src_udp_src_port},
+ {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv4_src_udp_dst_port},
+ {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_GTPU, &hdrs_hint_ipv4_src_gtpu_up},
+ {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src},
+ {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_dst_udp_src_port},
+ {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv4_dst_udp_dst_port},
+ {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_GTPU, &hdrs_hint_ipv4_dst_gtpu_dwn},
+ {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst},
+
{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L4_SRC_ONLY,
&hdrs_hint_ipv4_udp_src_port},
{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L4_DST_ONLY,
@@ -641,6 +666,21 @@ struct iavf_hash_match_type iavf_hash_type_list[] = {
&hdrs_hint_ipv4_dst_tcp_dst_port},
{IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_L3_DST_ONLY,
&hdrs_hint_ipv4_dst},
+ {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_src_tcp_src_port},
+ {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_src_tcp_dst_port},
+ {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src},
+ {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_L4_SRC_ONLY,
+ &hdrs_hint_ipv4_dst_tcp_src_port},
+ {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_L4_DST_ONLY,
+ &hdrs_hint_ipv4_dst_tcp_dst_port},
+ {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst},
{IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_L4_SRC_ONLY,
&hdrs_hint_ipv4_tcp_src_port},
{IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_L4_DST_ONLY,
@@ -660,6 +700,18 @@ struct iavf_hash_match_type iavf_hash_type_list[] = {
&hdrs_hint_ipv4_dst_sctp_dst_port},
{IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_L3_DST_ONLY,
&hdrs_hint_ipv4_dst},
+ {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_src_sctp_src_port},
+ {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv4_src_sctp_dst_port},
+ {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv4_src},
+ {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_dst_sctp_src_port},
+ {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv4_dst_sctp_dst_port},
+ {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv4_dst},
{IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_L4_SRC_ONLY,
&hdrs_hint_ipv4_sctp_src_port},
{IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_L4_DST_ONLY,
@@ -669,11 +721,19 @@ struct iavf_hash_match_type iavf_hash_type_list[] = {
/* IPV6 */
{IAVF_PATTERN_HINT_IPV6, ETH_RSS_L2_SRC_ONLY, &hdrs_hint_eth_src},
{IAVF_PATTERN_HINT_IPV6, ETH_RSS_L2_DST_ONLY, &hdrs_hint_eth_dst},
+ {IAVF_PATTERN_HINT_IPV6, ETH_RSS_IPV6 | ETH_RSS_L2_SRC_ONLY,
+ &hdrs_hint_eth_src},
+ {IAVF_PATTERN_HINT_IPV6, ETH_RSS_IPV6 | ETH_RSS_L2_DST_ONLY,
+ &hdrs_hint_eth_dst},
{IAVF_PATTERN_HINT_IPV6, ETH_RSS_ETH, &hdrs_hint_eth},
{IAVF_PATTERN_HINT_IPV6, ETH_RSS_S_VLAN, &hdrs_hint_svlan},
{IAVF_PATTERN_HINT_IPV4, ETH_RSS_C_VLAN, &hdrs_hint_cvlan},
{IAVF_PATTERN_HINT_IPV6, ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv6_src},
{IAVF_PATTERN_HINT_IPV6, ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv6_dst},
+ {IAVF_PATTERN_HINT_IPV6, ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv6_src},
+ {IAVF_PATTERN_HINT_IPV6, ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv6_dst},
{IAVF_PATTERN_HINT_IPV6, ETH_RSS_ESP, &hdrs_hint_ipv6_esp},
{IAVF_PATTERN_HINT_IPV6, ETH_RSS_AH, &hdrs_hint_ipv6_ah},
{IAVF_PATTERN_HINT_IPV6, ETH_RSS_L2TPV3, &hdrs_hint_ipv6_l2tpv3},
@@ -691,6 +751,18 @@ struct iavf_hash_match_type iavf_hash_type_list[] = {
&hdrs_hint_ipv6_dst_udp_dst_port},
{IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_L3_DST_ONLY,
&hdrs_hint_ipv6_dst},
+ {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv6_src_udp_src_port},
+ {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv6_src_udp_dst_port},
+ {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv6_src},
+ {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv6_dst_udp_src_port},
+ {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv6_dst_udp_dst_port},
+ {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv6_dst},
{IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_L4_SRC_ONLY,
&hdrs_hint_ipv6_udp_src_port},
{IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_L4_DST_ONLY,
@@ -712,6 +784,18 @@ struct iavf_hash_match_type iavf_hash_type_list[] = {
&hdrs_hint_ipv6_dst_tcp_dst_port},
{IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_L3_DST_ONLY,
&hdrs_hint_ipv6_dst},
+ {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv6_src_tcp_src_port},
+ {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv6_src_tcp_dst_port},
+ {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv6_src},
+ {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv6_dst_tcp_src_port},
+ {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv6_dst_tcp_dst_port},
+ {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv6_dst},
{IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_L4_SRC_ONLY,
&hdrs_hint_ipv6_tcp_src_port},
{IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_L4_DST_ONLY,
@@ -731,6 +815,18 @@ struct iavf_hash_match_type iavf_hash_type_list[] = {
&hdrs_hint_ipv6_dst_sctp_dst_port},
{IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_L3_DST_ONLY,
&hdrs_hint_ipv6_dst},
+ {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv6_src_sctp_src_port},
+ {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY |
+ ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv6_src_sctp_dst_port},
+ {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY,
+ &hdrs_hint_ipv6_src},
+ {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv6_dst_sctp_src_port},
+ {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY |
+ ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv6_dst_sctp_dst_port},
+ {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY,
+ &hdrs_hint_ipv6_dst},
{IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_L4_SRC_ONLY,
&hdrs_hint_ipv6_sctp_src_port},
{IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_L4_DST_ONLY,
--
2.20.1
