From: Alvin Zhang <alvinx.zh...@intel.com>
Add patterns and headers for GTPC, now outer IP hash can be configured
as input sets for GTPC packet.
Signed-off-by: Alvin Zhang <alvinx.zh...@intel.com>
---
drivers/net/iavf/iavf_generic_flow.c | 18 ++++++++++++++++++
drivers/net/iavf/iavf_generic_flow.h | 6 ++++++
drivers/net/iavf/iavf_hash.c | 15 +++++++++++++++
3 files changed, 39 insertions(+)
diff --git a/drivers/net/iavf/iavf_generic_flow.c
b/drivers/net/iavf/iavf_generic_flow.c
index 321a4dc..00e7f15 100644
--- a/drivers/net/iavf/iavf_generic_flow.c
+++ b/drivers/net/iavf/iavf_generic_flow.c
@@ -315,6 +315,15 @@ enum rte_flow_item_type iavf_pattern_eth_qinq_ipv6_icmp6[]
= {
RTE_FLOW_ITEM_TYPE_END,
};
+/* IPv4 GTPC */
+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpc[] = {
+ RTE_FLOW_ITEM_TYPE_ETH,
+ RTE_FLOW_ITEM_TYPE_IPV4,
+ RTE_FLOW_ITEM_TYPE_UDP,
+ RTE_FLOW_ITEM_TYPE_GTPC,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
/* IPV4 GTPU (EH) */
enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu[] = {
RTE_FLOW_ITEM_TYPE_ETH,
@@ -333,6 +342,15 @@ enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh[] = {
RTE_FLOW_ITEM_TYPE_END,
};
+/* IPv6 GTPC */
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpc[] = {
+ RTE_FLOW_ITEM_TYPE_ETH,
+ RTE_FLOW_ITEM_TYPE_IPV6,
+ RTE_FLOW_ITEM_TYPE_UDP,
+ RTE_FLOW_ITEM_TYPE_GTPC,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
/* IPV6 GTPU (EH) */
enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu[] = {
RTE_FLOW_ITEM_TYPE_ETH,
diff --git a/drivers/net/iavf/iavf_generic_flow.h
b/drivers/net/iavf/iavf_generic_flow.h
index f365cc3..dbc7294 100644
--- a/drivers/net/iavf/iavf_generic_flow.h
+++ b/drivers/net/iavf/iavf_generic_flow.h
@@ -182,10 +182,16 @@
extern enum rte_flow_item_type iavf_pattern_eth_vlan_ipv6_icmp6[];
extern enum rte_flow_item_type iavf_pattern_eth_qinq_ipv6_icmp6[];
+/* IPv4 GTPC */
+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpc[];
+
/* IPv4 GTPU (EH) */
extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu[];
extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh[];
+/* IPv4 GTPC */
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpc[];
+
/* IPv6 GTPU (EH) */
extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu[];
extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh[];
diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c
index aab8b14..ddea3dd 100644
--- a/drivers/net/iavf/iavf_hash.c
+++ b/drivers/net/iavf/iavf_hash.c
@@ -132,6 +132,9 @@ struct iavf_hash_flow_cfg {
VIRTCHNL_PROTO_HDR_PFCP, \
FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_PFCP_SEID), {BUFF_NOUSED} }
+#define proto_hdr_gtpc { \
+ VIRTCHNL_PROTO_HDR_GTPC, 0, {BUFF_NOUSED} }
+
#define TUNNEL_LEVEL_OUTER 0
#define TUNNEL_LEVEL_INNER 1
@@ -256,6 +259,14 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
TUNNEL_LEVEL_OUTER, 2, {proto_hdr_ipv6, proto_hdr_pfcp}
};
+struct virtchnl_proto_hdrs ipv4_udp_gtpc_tmplt = {
+ TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv4, proto_hdr_udp, proto_hdr_gtpc}
+};
+
+struct virtchnl_proto_hdrs ipv6_udp_gtpc_tmplt = {
+ TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv6, proto_hdr_udp, proto_hdr_gtpc}
+};
+
/* rss type super set */
/* IPv4 outer */
@@ -365,6 +376,7 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
{iavf_pattern_eth_ipv4_ah, IAVF_RSS_TYPE_IPV4_AH,
&ipv4_ah_tmplt},
{iavf_pattern_eth_ipv4_l2tpv3,
IAVF_RSS_TYPE_IPV4_L2TPV3, &ipv4_l2tpv3_tmplt},
{iavf_pattern_eth_ipv4_pfcp,
IAVF_RSS_TYPE_IPV4_PFCP, &ipv4_pfcp_tmplt},
+ {iavf_pattern_eth_ipv4_gtpc, ETH_RSS_IPV4,
&ipv4_udp_gtpc_tmplt},
/* IPv6 */
{iavf_pattern_eth_ipv6,
IAVF_RSS_TYPE_OUTER_IPV6, &outer_ipv6_tmplt},
{iavf_pattern_eth_ipv6_udp,
IAVF_RSS_TYPE_OUTER_IPV6_UDP, &outer_ipv6_udp_tmplt},
@@ -391,6 +403,7 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
{iavf_pattern_eth_ipv6_ah, IAVF_RSS_TYPE_IPV6_AH,
&ipv6_ah_tmplt},
{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},
};
struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
@@ -592,6 +605,8 @@ struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
else if (rss_type & ETH_RSS_L4_DST_ONLY)
VIRTCHNL_DEL_PROTO_HDR_FIELD(hdr,
VIRTCHNL_PROTO_HDR_UDP_SRC_PORT);
+ } else {
+ hdr->field_selector = 0;
}
break;
case VIRTCHNL_PROTO_HDR_TCP:
--
1.8.3.1
