net/iavf: fix input set for rss hash
PATCH 1/1 net/iavf: fix input set for rss hash
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.
--- drivers/net/iavf/iavf_hash.c | 96 ++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+)
drivers/net/iavf/iavf_hash.c +96 -0
@@ -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,
Signature · 1 line
2.20.1
Quoted 71 lines
-----Original Message-----
From: Guo, Jia <[email protected]>
Sent: Friday, May 8, 2020 5:30 AM
To: Xing, Beilei <[email protected]>; Wu, Jingjing <[email protected]>
Cc: Iremonger, Bernard <[email protected]>; Ye, Xiaolong <[email protected]>; Zhang, Qi Z <[email protected]>; [email protected]; Guo, Jia <[email protected]>
Subject: [PATCH] net/iavf: fix input set for rss hashSince 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 <[email protected]>--- drivers/net/iavf/iavf_hash.c | 96 ++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+)drivers/net/iavf/iavf_hash.c index renamed from drivers/net/iavf/iavf_hash.c +0
-0
a1d0b8364..97370aa19100644drivers/net/iavf/iavf_hash.c +4
-0@@ -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},drivers/net/iavf/iavf_hash.c +4
-0+ {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 @@ structiavf_hash_match_typeiavf_hash_type_list[] = {drivers/net/iavf/iavf_hash.c +1
-0&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|drivers/net/iavf/iavf_hash.c +2
-0+ 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|drivers/net/iavf/iavf_hash.c +1
-0+ ETH_RSS_L4_DST_ONLY,
&hdrs_hint_ipv4_src_udp_dst_port},drivers/net/iavf/iavf_hash.c +1
-0+ {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_IPV4 |
ETH_RSS_L3_SRC_ONLY|drivers/net/iavf/iavf_hash.c +2
-0+ ETH_RSS_GTPU, &hdrs_hint_ipv4_src_gtpu_up}, + {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_IPV4 |
ETH_RSS_L3_SRC_ONLY,drivers/net/iavf/iavf_hash.c +2
-0+ &hdrs_hint_ipv4_src}, + {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_IPV4 |
ETH_RSS_L3_DST_ONLY|
drivers/net/iavf/iavf_hash.c struct iavf_hash_match_type iavf_hash_type_list[] = { · line 677
Quoted 1 line
drivers/net/iavf/iavf_hash.c +1
-0+ ETH_RSS_L4_SRC_ONLY,
I think the protocol type should be ETH_RSS_NONFRAG_IPV4_UDP if level 4 modification is involved. And similar change also need be applied to TCP/SCTP...
ok.
Best regards,
Jeff Guo
-----Original Message-----
From: Zhang, Qi Z <[email protected]>
Sent: Saturday, May 9, 2020 2:21 PM
To: Guo, Jia <[email protected]>; Xing, Beilei <[email protected]>; Wu, Jingjing <[email protected]>
Cc: Iremonger, Bernard <[email protected]>; Ye, Xiaolong <[email protected]>; [email protected]
Subject: RE: [PATCH] net/iavf: fix input set for rss hash
Quoted 67 lines
-----Original Message-----
From: Guo, Jia <[email protected]>
Sent: Friday, May 8, 2020 5:30 AM
To: Xing, Beilei <[email protected]>; Wu, Jingjing <[email protected]>
Cc: Iremonger, Bernard <[email protected]>; Ye, Xiaolong <[email protected]>; Zhang, Qi Z <[email protected]>; [email protected]; Guo, Jia <[email protected]>
Subject: [PATCH] net/iavf: fix input set for rss hashSince 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 <[email protected]>--- drivers/net/iavf/iavf_hash.c | 96 ++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+)(quoted diff) +0
-0
b/drivers/net/iavf/iavf_hash.cindexa1d0b8364..97370aa19100644drivers/net/iavf/iavf_hash.c +8
-0@@ -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 @@ structiavf_hash_match_typeiavf_hash_type_list[] = {drivers/net/iavf/iavf_hash.c +1
-0&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|drivers/net/iavf/iavf_hash.c +2
-0+ 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|drivers/net/iavf/iavf_hash.c +1
-0+ ETH_RSS_L4_DST_ONLY,
&hdrs_hint_ipv4_src_udp_dst_port},drivers/net/iavf/iavf_hash.c +1
-0+ {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_IPV4 |
ETH_RSS_L3_SRC_ONLY|drivers/net/iavf/iavf_hash.c +2
-0+ ETH_RSS_GTPU, &hdrs_hint_ipv4_src_gtpu_up}, + {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_IPV4 |
ETH_RSS_L3_SRC_ONLY,drivers/net/iavf/iavf_hash.c +2
-0+ &hdrs_hint_ipv4_src}, + {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_IPV4 |
ETH_RSS_L3_DST_ONLY|
drivers/net/iavf/iavf_hash.c struct iavf_hash_match_type iavf_hash_type_list[] = { · line 677
Quoted 1 line
drivers/net/iavf/iavf_hash.c +1
-0+ ETH_RSS_L4_SRC_ONLY,
I think the protocol type should be ETH_RSS_NONFRAG_IPV4_UDP if level 4 modification is involved. And similar change also need be applied to TCP/SCTP...
PATCH v2 1/1 net/iavf: fix input set for rss hash
In reply to Jeff GuoSince 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.
---v2->v1:
use nonfrag for ipv4/ipv6 udp/tcp/sctp
--- drivers/net/iavf/iavf_hash.c | 118 +++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+)
drivers/net/iavf/iavf_hash.c +118 -0
@@ -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,28 @@ 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_NONFRAG_IPV4_UDP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , + &hdrs_hint_ipv4_src_udp_src_port}, + {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , + &hdrs_hint_ipv4_src_udp_dst_port}, + {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_GTPU , + &hdrs_hint_ipv4_src_gtpu_up}, + {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP | + ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src}, + {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , + &hdrs_hint_ipv4_dst_udp_src_port}, + {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , + &hdrs_hint_ipv4_dst_udp_dst_port}, + {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_GTPU , + &hdrs_hint_ipv4_dst_gtpu_dwn}, + {IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP | + 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 +671,22 @@ 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_NONFRAG_IPV4_TCP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , + &hdrs_hint_ipv4_src_tcp_src_port}, + {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , + &hdrs_hint_ipv4_src_tcp_dst_port}, + {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP | + ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src}, + {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , + &hdrs_hint_ipv4_dst_tcp_src_port}, + {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , + &hdrs_hint_ipv4_dst_tcp_dst_port}, + {IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP | + 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 +706,22 @@ 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_NONFRAG_IPV4_SCTP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , + &hdrs_hint_ipv4_src_sctp_src_port}, + {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , + &hdrs_hint_ipv4_src_sctp_dst_port}, + {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP | + ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src}, + {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , + &hdrs_hint_ipv4_dst_sctp_src_port}, + {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , + &hdrs_hint_ipv4_dst_sctp_dst_port}, + {IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP | + 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 +731,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 +761,22 @@ 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_NONFRAG_IPV6_UDP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , + &hdrs_hint_ipv6_src_udp_src_port}, + {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , + &hdrs_hint_ipv6_src_udp_dst_port}, + {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP | + ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv6_src}, + {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , + &hdrs_hint_ipv6_dst_udp_src_port}, + {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , + &hdrs_hint_ipv6_dst_udp_dst_port}, + {IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP | + 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 +798,22 @@ 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_NONFRAG_IPV6_TCP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , + &hdrs_hint_ipv6_src_tcp_src_port}, + {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , + &hdrs_hint_ipv6_src_tcp_dst_port}, + {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP | + ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv6_src}, + {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , + &hdrs_hint_ipv6_dst_tcp_src_port}, + {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , + &hdrs_hint_ipv6_dst_tcp_dst_port}, + {IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP | + 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 +833,22 @@ 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_NONFRAG_IPV6_SCTP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_SRC_ONLY , + &hdrs_hint_ipv6_src_sctp_src_port}, + {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP | +ETH_RSS_L3_SRC_ONLY |ETH_RSS_L4_DST_ONLY , + &hdrs_hint_ipv6_src_sctp_dst_port}, + {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP | + ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv6_src}, + {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_SRC_ONLY , + &hdrs_hint_ipv6_dst_sctp_src_port}, + {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP | +ETH_RSS_L3_DST_ONLY |ETH_RSS_L4_DST_ONLY , + &hdrs_hint_ipv6_dst_sctp_dst_port}, + {IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP | + 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,
Signature · 1 line
2.20.1
Quoted 11 lines
-----Original Message-----
From: Guo, Jia <[email protected]>
Sent: Sunday, May 10, 2020 3:30 AM
To: Xing, Beilei <[email protected]>; Zhang, Qi Z <[email protected]>; Wu, Jingjing <[email protected]>
Cc: Iremonger, Bernard <[email protected]>; Ye, Xiaolong <[email protected]>; [email protected]; Guo, Jia <[email protected]>
Subject: [dpdk-dev v2] net/iavf: fix input set for rss hash
Quoted 6 lines
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 <[email protected]>
Ye Xiaolong
AppliedQuoted 11 lines · Qi Z
Quoted 11 lines
-----Original Message-----
From: Guo, Jia <[email protected]>
Sent: Sunday, May 10, 2020 3:30 AM
To: Xing, Beilei <[email protected]>; Zhang, Qi Z <[email protected]>; Wu, Jingjing <[email protected]>
Cc: Iremonger, Bernard <[email protected]>; Ye, Xiaolong <[email protected]>; [email protected]; Guo, Jia <[email protected]>
Subject: [dpdk-dev v2] net/iavf: fix input set for rss hash
Quoted 8 lines
Quoted 6 lines
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 <[email protected]>Acked-by Qi Zhang <[email protected]>
Applied to dpdk-next-net-intel, Thanks.