net/ice: fix fdir GTP-U pattern
PATCH v2 1/1 net/ice: fix fdir GTP-U pattern
Base on current fdir implementation for GTP-U, inner specification is not supported, issue a rule for eth/ipv4/gtpu/ipv4 will also match eth/ipv4/gtpu/ipv6, the patch add new pattern list to align with exist implementation.
---
v2:
- rename ICE_FDIR_INSET_GTPU_IPV4 to ICE_FDIR_INSET_GTPU
- rename ICE_FDIR_INSET_GTPU_EH_IPV4 to ICE_FDIR_INSET_GTPU_EH
drivers/net/ice/ice_fdir_filter.c | 9 ++++----- drivers/net/ice/ice_generic_flow.c | 15 +++++++++++++++ drivers/net/ice/ice_generic_flow.h | 2 ++ 3 files changed, 21 insertions(+), 5 deletions(-)
drivers/net/ice/ice_fdir_filter.c +4 -5
@@ -67,10 +67,10 @@ ICE_FDIR_INSET_VXLAN_IPV4 | \ ICE_INSET_TUN_SCTP_SRC_PORT | ICE_INSET_TUN_SCTP_DST_PORT) -#define ICE_FDIR_INSET_GTPU_IPV4 (\ +#define ICE_FDIR_INSET_GTPU (\ ICE_INSET_GTPU_TEID) -#define ICE_FDIR_INSET_GTPU_EH_IPV4 (\ +#define ICE_FDIR_INSET_GTPU_EH (\ ICE_INSET_GTPU_TEID | ICE_INSET_GTPU_QFI)static struct ice_pattern_match_item ice_fdir_pattern_os[] = {
@@ -125,9 +125,8 @@ static struct ice_pattern_match_item ice_fdir_pattern_comms[] = { ICE_FDIR_INSET_VXLAN_IPV4_TCP, ICE_INSET_NONE}, {pattern_eth_ipv4_udp_vxlan_eth_ipv4_sctp, ICE_FDIR_INSET_VXLAN_IPV4_SCTP, ICE_INSET_NONE}, - {pattern_eth_ipv4_gtpu_ipv4, ICE_FDIR_INSET_GTPU_IPV4, ICE_INSET_NONE}, - {pattern_eth_ipv4_gtpu_eh_ipv4, - ICE_FDIR_INSET_GTPU_EH_IPV4, ICE_INSET_NONE}, + {pattern_eth_ipv4_gtpu, ICE_FDIR_INSET_GTPU, ICE_INSET_NONE}, + {pattern_eth_ipv4_gtpu_eh, ICE_FDIR_INSET_GTPU_EH, ICE_INSET_NONE}, };static struct ice_flow_parser ice_fdir_parser_os;
drivers/net/ice/ice_generic_flow.c +15 -0
@@ -1034,6 +1034,13 @@ enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_icmp6[] = { };/* GTPU */ +enum rte_flow_item_type pattern_eth_ipv4_gtpu[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_GTPU , +RTE_FLOW_ITEM_TYPE_END , +};enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[] = {RTE_FLOW_ITEM_TYPE_ETH ,RTE_FLOW_ITEM_TYPE_IPV4 ,
@@ -1042,6 +1049,14 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[] = {RTE_FLOW_ITEM_TYPE_IPV4 , RTE_FLOW_ITEM_TYPE_END, }; +enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_GTPU , +RTE_FLOW_ITEM_TYPE_GTP_PSC , +RTE_FLOW_ITEM_TYPE_END , +};enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[] = {RTE_FLOW_ITEM_TYPE_ETH , RTE_FLOW_ITEM_TYPE_IPV4,
drivers/net/ice/ice_generic_flow.h +2 -0
@@ -336,7 +336,9 @@ extern enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_sctp[];extern enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_icmp6[];/* GTPU */ +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu[];extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[]; +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh[];extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[];extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_udp[];extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_tcp[];
Signature · 1 line
2.13.6
Quoted 99 lines · Qi Zhang
Base on current fdir implementation for GTP-U, inner specification is not supported, issue a rule for eth/ipv4/gtpu/ipv4 will also match eth/ipv4/gtpu/ipv6, the patch add new pattern list to align with exist implementation.
Fixes efc16c621415 ("net/ice: support flow director GTPU tunnel")Signed-off-by Qi Zhang <[email protected]>---
v2:
- renameICE_FDIR_INSET_GTPU_IPV4toICE_FDIR_INSET_GTPU
- renameICE_FDIR_INSET_GTPU_EH_IPV4toICE_FDIR_INSET_GTPU_EHdrivers/net/ice/ice_fdir_filter.c | 9 ++++----- drivers/net/ice/ice_generic_flow.c | 15 +++++++++++++++ drivers/net/ice/ice_generic_flow.h | 2 ++ 3 files changed, 21 insertions(+), 5 deletions(-)drivers/net/ice/ice_fdir_filter.c +4
-5@@ -67,10 +67,10 @@ ICE_FDIR_INSET_VXLAN_IPV4 | \ ICE_INSET_TUN_SCTP_SRC_PORT | ICE_INSET_TUN_SCTP_DST_PORT) -#define ICE_FDIR_INSET_GTPU_IPV4 (\ +#define ICE_FDIR_INSET_GTPU (\ ICE_INSET_GTPU_TEID) -#define ICE_FDIR_INSET_GTPU_EH_IPV4 (\ +#define ICE_FDIR_INSET_GTPU_EH (\ ICE_INSET_GTPU_TEID | ICE_INSET_GTPU_QFI)static struct ice_pattern_match_item ice_fdir_pattern_os[] = {@@ -125,9 +125,8 @@ static struct ice_pattern_match_item ice_fdir_pattern_comms[] = { ICE_FDIR_INSET_VXLAN_IPV4_TCP, ICE_INSET_NONE}, {pattern_eth_ipv4_udp_vxlan_eth_ipv4_sctp, ICE_FDIR_INSET_VXLAN_IPV4_SCTP, ICE_INSET_NONE}, - {pattern_eth_ipv4_gtpu_ipv4, ICE_FDIR_INSET_GTPU_IPV4, ICE_INSET_NONE}, - {pattern_eth_ipv4_gtpu_eh_ipv4, - ICE_FDIR_INSET_GTPU_EH_IPV4, ICE_INSET_NONE}, + {pattern_eth_ipv4_gtpu, ICE_FDIR_INSET_GTPU, ICE_INSET_NONE}, + {pattern_eth_ipv4_gtpu_eh, ICE_FDIR_INSET_GTPU_EH, ICE_INSET_NONE}, };static struct ice_flow_parser ice_fdir_parser_os;drivers/net/ice/ice_generic_flow.c +15
-0@@ -1034,6 +1034,13 @@ enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_icmp6[] = { };/* GTPU */ +enum rte_flow_item_type pattern_eth_ipv4_gtpu[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_GTPU , +RTE_FLOW_ITEM_TYPE_END , +};enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[] = {RTE_FLOW_ITEM_TYPE_ETH ,RTE_FLOW_ITEM_TYPE_IPV4 ,@@ -1042,6 +1049,14 @@ enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[] = {RTE_FLOW_ITEM_TYPE_IPV4 , RTE_FLOW_ITEM_TYPE_END, }; +enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_GTPU , +RTE_FLOW_ITEM_TYPE_GTP_PSC , +RTE_FLOW_ITEM_TYPE_END , +};enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[] = {RTE_FLOW_ITEM_TYPE_ETH , RTE_FLOW_ITEM_TYPE_IPV4,drivers/net/ice/ice_generic_flow.h +2
-0@@ -336,7 +336,9 @@ extern enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_sctp[];extern enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_icmp6[];/* GTPU */ +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu[];extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[]; +extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh[];extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4[];extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_udp[];extern enum rte_flow_item_type pattern_eth_ipv4_gtpu_eh_ipv4_tcp[];Signature · 1 line
2.13.6
Applied to dpdk-next-net-intel, Thanks.