Support AVF RSS for inner header of GRE tunnel packet. It supports
RSS based on fields inner IP src + dst address and TCP/UDP src + dst
port.
Signed-off-by: Wenjun Wu <wenjun1...@intel.com>
---
drivers/net/iavf/iavf_hash.c | 37 ++++++++++++++++++++++++++++++------
1 file changed, 31 insertions(+), 6 deletions(-)
diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c
index 5d3d62839b..973591100f 100644
--- a/drivers/net/iavf/iavf_hash.c
+++ b/drivers/net/iavf/iavf_hash.c
@@ -30,6 +30,7 @@
#define IAVF_PHINT_GTPU_EH_UP BIT_ULL(3)
#define IAVF_PHINT_OUTER_IPV4 BIT_ULL(4)
#define IAVF_PHINT_OUTER_IPV6 BIT_ULL(5)
+#define IAVF_PHINT_GRE BIT_ULL(6)
#define IAVF_PHINT_GTPU_MSK (IAVF_PHINT_GTPU | \
IAVF_PHINT_GTPU_EH | \
@@ -390,6 +391,14 @@ struct virtchnl_proto_hdrs ipv4_ecpri_tmplt = {
#define IAVF_RSS_TYPE_IPV6_L2TPV3 (ETH_RSS_L2TPV3 | ETH_RSS_IPV6)
#define IAVF_RSS_TYPE_IPV4_PFCP (ETH_RSS_PFCP | ETH_RSS_IPV4)
#define IAVF_RSS_TYPE_IPV6_PFCP (ETH_RSS_PFCP | ETH_RSS_IPV6)
+/* GRE IPv4 */
+#define IAVF_RSS_TYPE_GRE_IPV4 (ETH_RSS_GRE | IAVF_RSS_TYPE_INNER_IPV4)
+#define IAVF_RSS_TYPE_GRE_IPV4_TCP (ETH_RSS_GRE |
IAVF_RSS_TYPE_INNER_IPV4_TCP)
+#define IAVF_RSS_TYPE_GRE_IPV4_UDP (ETH_RSS_GRE |
IAVF_RSS_TYPE_INNER_IPV4_UDP)
+/* GRE IPv6 */
+#define IAVF_RSS_TYPE_GRE_IPV6 (ETH_RSS_GRE | IAVF_RSS_TYPE_INNER_IPV6)
+#define IAVF_RSS_TYPE_GRE_IPV6_TCP (ETH_RSS_GRE |
IAVF_RSS_TYPE_INNER_IPV6_TCP)
+#define IAVF_RSS_TYPE_GRE_IPV6_UDP (ETH_RSS_GRE |
IAVF_RSS_TYPE_INNER_IPV6_UDP)
/**
* Supported pattern for hash.
@@ -428,6 +437,12 @@ static struct iavf_pattern_match_item
iavf_hash_pattern_list[] = {
{iavf_pattern_eth_ipv4_gtpc, ETH_RSS_IPV4,
&ipv4_udp_gtpc_tmplt},
{iavf_pattern_eth_ecpri, ETH_RSS_ECPRI,
ð_ecpri_tmplt},
{iavf_pattern_eth_ipv4_ecpri, ETH_RSS_ECPRI,
&ipv4_ecpri_tmplt},
+ {iavf_pattern_eth_ipv4_gre_ipv4, IAVF_RSS_TYPE_GRE_IPV4,
&inner_ipv4_tmplt},
+ {iavf_pattern_eth_ipv6_gre_ipv4, IAVF_RSS_TYPE_GRE_IPV4,
&inner_ipv4_tmplt},
+ {iavf_pattern_eth_ipv4_gre_ipv4_tcp, IAVF_RSS_TYPE_GRE_IPV4_TCP,
&inner_ipv4_tcp_tmplt},
+ {iavf_pattern_eth_ipv6_gre_ipv4_tcp, IAVF_RSS_TYPE_GRE_IPV4_TCP,
&inner_ipv4_tcp_tmplt},
+ {iavf_pattern_eth_ipv4_gre_ipv4_udp, IAVF_RSS_TYPE_GRE_IPV4_UDP,
&inner_ipv4_udp_tmplt},
+ {iavf_pattern_eth_ipv6_gre_ipv4_udp, IAVF_RSS_TYPE_GRE_IPV4_UDP,
&inner_ipv4_udp_tmplt},
/* IPv6 */
{iavf_pattern_eth_ipv6,
IAVF_RSS_TYPE_OUTER_IPV6, &outer_ipv6_tmplt},
{iavf_pattern_eth_ipv6_frag_ext,
IAVF_RSS_TYPE_OUTER_IPV6_FRAG, &outer_ipv6_frag_tmplt},
@@ -458,6 +473,12 @@ static struct iavf_pattern_match_item
iavf_hash_pattern_list[] = {
{iavf_pattern_eth_ipv6_l2tpv3,
IAVF_RSS_TYPE_IPV6_L2TPV3, &ipv6_l2tpv3_tmplt},
{iavf_pattern_eth_ipv6_pfcp,
IAVF_RSS_TYPE_IPV6_PFCP, &ipv6_pfcp_tmplt},
{iavf_pattern_eth_ipv6_gtpc, ETH_RSS_IPV6,
&ipv6_udp_gtpc_tmplt},
+ {iavf_pattern_eth_ipv4_gre_ipv6, IAVF_RSS_TYPE_GRE_IPV6,
&inner_ipv6_tmplt},
+ {iavf_pattern_eth_ipv6_gre_ipv6, IAVF_RSS_TYPE_GRE_IPV6,
&inner_ipv6_tmplt},
+ {iavf_pattern_eth_ipv4_gre_ipv6_tcp, IAVF_RSS_TYPE_GRE_IPV6_TCP,
&inner_ipv6_tcp_tmplt},
+ {iavf_pattern_eth_ipv6_gre_ipv6_tcp, IAVF_RSS_TYPE_GRE_IPV6_TCP,
&inner_ipv6_tcp_tmplt},
+ {iavf_pattern_eth_ipv4_gre_ipv6_udp, IAVF_RSS_TYPE_GRE_IPV6_UDP,
&inner_ipv6_udp_tmplt},
+ {iavf_pattern_eth_ipv6_gre_ipv6_udp, IAVF_RSS_TYPE_GRE_IPV6_UDP,
&inner_ipv6_udp_tmplt},
};
static struct iavf_flow_engine iavf_hash_engine = {
@@ -592,11 +613,11 @@ iavf_hash_parse_pattern(const struct rte_flow_item
pattern[], uint64_t *phint,
switch (item->type) {
case RTE_FLOW_ITEM_TYPE_IPV4:
- if (!(*phint & IAVF_PHINT_GTPU_MSK))
+ if (!(*phint & IAVF_PHINT_GTPU_MSK) && !(*phint &
IAVF_PHINT_GRE))
*phint |= IAVF_PHINT_OUTER_IPV4;
break;
case RTE_FLOW_ITEM_TYPE_IPV6:
- if (!(*phint & IAVF_PHINT_GTPU_MSK))
+ if (!(*phint & IAVF_PHINT_GTPU_MSK) && !(*phint &
IAVF_PHINT_GRE))
*phint |= IAVF_PHINT_OUTER_IPV6;
break;
case RTE_FLOW_ITEM_TYPE_GTPU:
@@ -627,6 +648,8 @@ iavf_hash_parse_pattern(const struct rte_flow_item
pattern[], uint64_t *phint,
return -rte_errno;
}
break;
+ case RTE_FLOW_ITEM_TYPE_GRE:
+ *phint |= IAVF_PHINT_GRE;
default:
break;
}
@@ -867,7 +890,7 @@ iavf_refine_proto_hdrs_by_pattern(struct
virtchnl_proto_hdrs *proto_hdrs,
struct virtchnl_proto_hdr *hdr2;
int i, shift_count = 1;
- if (!(phint & IAVF_PHINT_GTPU_MSK))
+ if (!(phint & IAVF_PHINT_GTPU_MSK) && !(phint & IAVF_PHINT_GRE))
return;
if (phint & IAVF_PHINT_LAYERS_MSK)
@@ -883,10 +906,10 @@ iavf_refine_proto_hdrs_by_pattern(struct
virtchnl_proto_hdrs *proto_hdrs,
}
if (shift_count == 1) {
- /* adding gtpu header at layer 0 */
+ /* adding tunnel header at layer 0 */
hdr1 = &proto_hdrs->proto_hdr[0];
} else {
- /* adding gtpu header and outer ip header */
+ /* adding tunnel header and outer ip header */
hdr1 = &proto_hdrs->proto_hdr[1];
hdr2 = &proto_hdrs->proto_hdr[0];
hdr2->field_selector = 0;
@@ -913,6 +936,8 @@ iavf_refine_proto_hdrs_by_pattern(struct
virtchnl_proto_hdrs *proto_hdrs,
VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH);
else if (phint & IAVF_PHINT_GTPU)
VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_IP);
+ else if (phint & IAVF_PHINT_GRE)
+ VIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GRE);
}
static void iavf_refine_proto_hdrs(struct virtchnl_proto_hdrs *proto_hdrs,
@@ -1172,8 +1197,8 @@ iavf_hash_create(__rte_unused struct iavf_adapter *ad,
rss_cfg->proto_hdrs = rss_meta->proto_hdrs;
rss_cfg->rss_algorithm = rss_meta->rss_algorithm;
-
ret = iavf_add_del_rss_cfg(ad, rss_cfg, true);
+
if (!ret) {
flow->rule = rss_cfg;
} else {
--
2.25.1
