net/iavf: fix PROT filed for rss hash
PATCH v2 1/1 net/iavf: fix PROT filed for rss hash
Add PROT field into IPv4 and IPv6 protocol headers for rss hash.
---
v2:
add prot into the new hdr replace of function modify
--- drivers/net/iavf/iavf_hash.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-)
drivers/net/iavf/iavf_hash.c +24 -8
@@ -101,11 +101,23 @@ iavf_hash_parse_pattern_action(struct iavf_adapter *ad,FIELD_SELECTOR (VIRTCHNL_PROTO_HDR_IPV4_SRC ) | \ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_DST), {BUFF_NOUSED} } +#define proto_hdr_ipv4_with_prot { \ + VIRTCHNL_PROTO_HDR_IPV4, \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_SRC) | \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_DST) | \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_PROT), {BUFF_NOUSED} } +#define proto_hdr_ipv6 { \ VIRTCHNL_PROTO_HDR_IPV6, \ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_SRC) | \ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_DST), {BUFF_NOUSED} } +#define proto_hdr_ipv6_with_prot { \ + VIRTCHNL_PROTO_HDR_IPV6, \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_SRC) | \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_DST) | \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_PROT), {BUFF_NOUSED} } +#define proto_hdr_udp { \ VIRTCHNL_PROTO_HDR_UDP, \ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_UDP_SRC_PORT) | \
@@ -151,13 +163,15 @@ struct virtchnl_proto_hdrs outer_ipv4_tmplt = {struct virtchnl_proto_hdrs outer_ipv4_udp_tmplt = {TUNNEL_LEVEL_OUTER ,5 , - {proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, proto_hdr_ipv4, + {proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, + proto_hdr_ipv4_with_prot, proto_hdr_udp} };struct virtchnl_proto_hdrs outer_ipv4_tcp_tmplt = {TUNNEL_LEVEL_OUTER ,5 , - {proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, proto_hdr_ipv4, + {proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, + proto_hdr_ipv4_with_prot, proto_hdr_tcp} };
@@ -174,13 +188,15 @@ struct virtchnl_proto_hdrs outer_ipv6_tmplt = {struct virtchnl_proto_hdrs outer_ipv6_udp_tmplt = {TUNNEL_LEVEL_OUTER ,5 , - {proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, proto_hdr_ipv6, + {proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, + proto_hdr_ipv6_with_prot, proto_hdr_udp} };struct virtchnl_proto_hdrs outer_ipv6_tcp_tmplt = {TUNNEL_LEVEL_OUTER ,5 , - {proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, proto_hdr_ipv6, + {proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, + proto_hdr_ipv6_with_prot, proto_hdr_tcp} };
@@ -195,11 +211,11 @@ struct virtchnl_proto_hdrs inner_ipv4_tmplt = { };struct virtchnl_proto_hdrs inner_ipv4_udp_tmplt = { -TUNNEL_LEVEL_INNER ,2 , {proto_hdr_ipv4, proto_hdr_udp} +TUNNEL_LEVEL_INNER ,2 , {proto_hdr_ipv4_with_prot, proto_hdr_udp} };struct virtchnl_proto_hdrs inner_ipv4_tcp_tmplt = { -TUNNEL_LEVEL_INNER ,2 , {proto_hdr_ipv4, proto_hdr_tcp} +TUNNEL_LEVEL_INNER ,2 , {proto_hdr_ipv4_with_prot, proto_hdr_tcp} };struct virtchnl_proto_hdrs inner_ipv4_sctp_tmplt = {
@@ -211,11 +227,11 @@ struct virtchnl_proto_hdrs inner_ipv6_tmplt = { };struct virtchnl_proto_hdrs inner_ipv6_udp_tmplt = { -TUNNEL_LEVEL_INNER ,2 , {proto_hdr_ipv6, proto_hdr_udp} +TUNNEL_LEVEL_INNER ,2 , {proto_hdr_ipv6_with_prot, proto_hdr_udp} };struct virtchnl_proto_hdrs inner_ipv6_tcp_tmplt = { -TUNNEL_LEVEL_INNER ,2 , {proto_hdr_ipv6, proto_hdr_tcp} +TUNNEL_LEVEL_INNER ,2 , {proto_hdr_ipv6_with_prot, proto_hdr_tcp} };struct virtchnl_proto_hdrs inner_ipv6_sctp_tmplt = {
Signature · 1 line
2.20.1
Regards,
HuangZhiMin
Quoted 120 lines
-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Jeff Guo
Sent: Tuesday, November 3, 2020 3:35 PM
To: Wu, Jingjing <[email protected]>; Zhang, Qi Z <[email protected]>; Xing, Beilei <[email protected]>
Cc: [email protected]; Guo, Jia <[email protected]>
Subject: [dpdk-dev] [PATCH v2] net/iavf: fix PROT filed for rss hashAdd PROT field into IPv4 and IPv6 protocol headers for rss hash.
Fixes 91f27b2e39ab ("net/iavf: refactor RSS")Signed-off-by Jeff Guo <[email protected]>---
v2:
add prot into the new hdr replace of function modify--- drivers/net/iavf/iavf_hash.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-)drivers/net/iavf/iavf_hash.c index renamed from drivers/net/iavf/iavf_hash.c +0
-0
b56152c5b8..804deec5fe100644drivers/net/iavf/iavf_hash.c +11
-0@@ -101,11 +101,23 @@ iavf_hash_parse_pattern_action(struct iavf_adapter *ad,FIELD_SELECTOR (VIRTCHNL_PROTO_HDR_IPV4_SRC ) | \FIELD_SELECTOR (VIRTCHNL_PROTO_HDR_IPV4_DST ), {BUFF_NOUSED} } +#define proto_hdr_ipv4_with_prot { \ + VIRTCHNL_PROTO_HDR_IPV4, \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_SRC) | \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_DST) | \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV4_PROT), {BUFF_NOUSED} } +#define proto_hdr_ipv6 { \ VIRTCHNL_PROTO_HDR_IPV6, \ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_SRC) | \ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_DST), {BUFF_NOUSED} } +#define proto_hdr_ipv6_with_prot { \ + VIRTCHNL_PROTO_HDR_IPV6, \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_SRC) | \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_DST) | \ + FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_PROT),{
BUFF_NOUSED} }drivers/net/iavf/iavf_hash.c +1
-0+#define proto_hdr_udp { \ VIRTCHNL_PROTO_HDR_UDP, \ FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_UDP_SRC_PORT) | \ @@ -151,13 +163,15 @@ struct
virtchnl_proto_hdrsouter_ipv4_tmplt= {struct
virtchnl_proto_hdrsouter_ipv4_udp_tmplt= {drivers/net/iavf/iavf_hash.c +10
-6TUNNEL_LEVEL_OUTER ,5 , - {proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, proto_hdr_ipv4, + {proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, + proto_hdr_ipv4_with_prot, proto_hdr_udp} };struct virtchnl_proto_hdrs outer_ipv4_tcp_tmplt = {TUNNEL_LEVEL_OUTER ,5 , - {proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, proto_hdr_ipv4, + {proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, + proto_hdr_ipv4_with_prot, proto_hdr_tcp} };@@ -174,13 +188,15 @@ struct virtchnl_proto_hdrs outer_ipv6_tmplt = {struct virtchnl_proto_hdrs outer_ipv6_udp_tmplt = {TUNNEL_LEVEL_OUTER ,5 , - {proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, proto_hdr_ipv6, + {proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, + proto_hdr_ipv6_with_prot, proto_hdr_udp} };struct virtchnl_proto_hdrs outer_ipv6_tcp_tmplt = {TUNNEL_LEVEL_OUTER ,5 , - {proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, proto_hdr_ipv6, + {proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, + proto_hdr_ipv6_with_prot, proto_hdr_tcp} };@@ -195,11 +211,11 @@ struct virtchnl_proto_hdrs inner_ipv4_tmplt = { };struct virtchnl_proto_hdrs inner_ipv4_udp_tmplt = { -TUNNEL_LEVEL_INNER ,2 , {proto_hdr_ipv4, proto_hdr_udp} +TUNNEL_LEVEL_INNER ,2 , {proto_hdr_ipv4_with_prot, proto_hdr_udp} };struct virtchnl_proto_hdrs inner_ipv4_tcp_tmplt = { -TUNNEL_LEVEL_INNER ,2 , {proto_hdr_ipv4, proto_hdr_tcp} +TUNNEL_LEVEL_INNER ,2 , {proto_hdr_ipv4_with_prot, proto_hdr_tcp} };struct
virtchnl_proto_hdrsinner_ipv4_sctp_tmplt= { @@ -211,11 +227,11
@@ structvirtchnl_proto_hdrsinner_ipv6_tmplt= { };struct
virtchnl_proto_hdrsinner_ipv6_udp_tmplt= {drivers/net/iavf/iavf_hash.c +1
-1- TUNNEL_LEVEL_INNER, 2, {proto_hdr_ipv6, proto_hdr_udp} + TUNNEL_LEVEL_INNER, 2, {proto_hdr_ipv6_with_prot,
proto_hdr_udp}
};struct
virtchnl_proto_hdrsinner_ipv6_tcp_tmplt= {drivers/net/iavf/iavf_hash.c +1
-1- TUNNEL_LEVEL_INNER, 2, {proto_hdr_ipv6, proto_hdr_tcp} + TUNNEL_LEVEL_INNER, 2, {proto_hdr_ipv6_with_prot,
proto_hdr_tcp}
};struct
virtchnl_proto_hdrsinner_ipv6_sctp_tmplt= {
--
2.20.1