Add L4 support for QinQ switch filter as following flow patterns:
eth / vlan / vlan / ipv4 / udp
eth / vlan / vlan / ipv4 / tcp
eth / vlan / vlan / ipv6 / udp
eth / vlan / vlan / ipv6 / tcp
Signed-off-by: Steve Yang <stevex.y...@intel.com>
---
drivers/net/ice/ice_generic_flow.c | 4 ++++
drivers/net/ice/ice_switch_filter.c | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/drivers/net/ice/ice_generic_flow.c
b/drivers/net/ice/ice_generic_flow.c
index c2fa75f165..9e03c2856c 100644
--- a/drivers/net/ice/ice_generic_flow.c
+++ b/drivers/net/ice/ice_generic_flow.c
@@ -2134,11 +2134,15 @@ static struct ice_ptype_match ice_ptype_map[] = {
{pattern_eth_arp, ICE_PTYPE_MAC_PAY},
{pattern_eth_vlan_ipv4, ICE_PTYPE_IPV4_PAY},
{pattern_eth_qinq_ipv4, ICE_PTYPE_IPV4_PAY},
+ {pattern_eth_qinq_ipv4_udp, ICE_PTYPE_IPV4_UDP_PAY},
+ {pattern_eth_qinq_ipv4_tcp, ICE_PTYPE_IPV4_TCP_PAY},
{pattern_eth_vlan_ipv4_udp, ICE_PTYPE_IPV4_UDP_PAY},
{pattern_eth_vlan_ipv4_tcp, ICE_PTYPE_IPV4_TCP_PAY},
{pattern_eth_vlan_ipv4_sctp,
ICE_PTYPE_IPV4_SCTP_PAY},
{pattern_eth_vlan_ipv6, ICE_PTYPE_IPV6_PAY},
{pattern_eth_qinq_ipv6, ICE_PTYPE_IPV6_PAY},
+ {pattern_eth_qinq_ipv6_udp, ICE_PTYPE_IPV6_UDP_PAY},
+ {pattern_eth_qinq_ipv6_tcp, ICE_PTYPE_IPV6_TCP_PAY},
{pattern_eth_vlan_ipv6_udp, ICE_PTYPE_IPV6_UDP_PAY},
{pattern_eth_vlan_ipv6_tcp, ICE_PTYPE_IPV6_TCP_PAY},
{pattern_eth_vlan_ipv6_sctp,
ICE_PTYPE_IPV6_SCTP_PAY},
diff --git a/drivers/net/ice/ice_switch_filter.c
b/drivers/net/ice/ice_switch_filter.c
index f222cb9cb0..bbd2805c37 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -44,6 +44,12 @@
ICE_INSET_IPV4_PROTO | ICE_INSET_IPV4_TTL | ICE_INSET_IPV4_TOS)
#define ICE_SW_INSET_MAC_QINQ_IPV4 ( \
ICE_SW_INSET_MAC_QINQ | ICE_SW_INSET_MAC_IPV4)
+#define ICE_SW_INSET_MAC_QINQ_IPV4_TCP ( \
+ ICE_SW_INSET_MAC_QINQ_IPV4 | \
+ ICE_INSET_TCP_DST_PORT | ICE_INSET_TCP_SRC_PORT)
+#define ICE_SW_INSET_MAC_QINQ_IPV4_UDP ( \
+ ICE_SW_INSET_MAC_QINQ_IPV4 | \
+ ICE_INSET_UDP_DST_PORT | ICE_INSET_UDP_SRC_PORT)
#define ICE_SW_INSET_MAC_IPV4_TCP ( \
ICE_INSET_DMAC | ICE_INSET_IPV4_DST | ICE_INSET_IPV4_SRC | \
ICE_INSET_IPV4_TTL | ICE_INSET_IPV4_TOS | \
@@ -58,6 +64,12 @@
ICE_INSET_IPV6_NEXT_HDR)
#define ICE_SW_INSET_MAC_QINQ_IPV6 ( \
ICE_SW_INSET_MAC_QINQ | ICE_SW_INSET_MAC_IPV6)
+#define ICE_SW_INSET_MAC_QINQ_IPV6_TCP ( \
+ ICE_SW_INSET_MAC_QINQ_IPV6 | \
+ ICE_INSET_TCP_DST_PORT | ICE_INSET_TCP_SRC_PORT)
+#define ICE_SW_INSET_MAC_QINQ_IPV6_UDP ( \
+ ICE_SW_INSET_MAC_QINQ_IPV6 | \
+ ICE_INSET_UDP_DST_PORT | ICE_INSET_UDP_SRC_PORT)
#define ICE_SW_INSET_MAC_IPV6_TCP ( \
ICE_INSET_DMAC | ICE_INSET_IPV6_DST | ICE_INSET_IPV6_SRC | \
ICE_INSET_IPV6_HOP_LIMIT | ICE_INSET_IPV6_TC | \
@@ -216,7 +228,11 @@ ice_pattern_match_item ice_switch_pattern_dist_list[] = {
{pattern_eth_ipv4_pfcp, ICE_INSET_NONE,
ICE_INSET_NONE, ICE_INSET_NONE},
{pattern_eth_ipv6_pfcp, ICE_INSET_NONE,
ICE_INSET_NONE, ICE_INSET_NONE},
{pattern_eth_qinq_ipv4,
ICE_SW_INSET_MAC_QINQ_IPV4, ICE_INSET_NONE,
ICE_INSET_NONE},
+ {pattern_eth_qinq_ipv4_tcp,
ICE_SW_INSET_MAC_QINQ_IPV4_TCP, ICE_INSET_NONE,
ICE_INSET_NONE},
+ {pattern_eth_qinq_ipv4_udp,
ICE_SW_INSET_MAC_QINQ_IPV4_UDP, ICE_INSET_NONE,
ICE_INSET_NONE},
{pattern_eth_qinq_ipv6,
ICE_SW_INSET_MAC_QINQ_IPV6, ICE_INSET_NONE,
ICE_INSET_NONE},
+ {pattern_eth_qinq_ipv6_tcp,
ICE_SW_INSET_MAC_QINQ_IPV6_TCP, ICE_INSET_NONE,
ICE_INSET_NONE},
+ {pattern_eth_qinq_ipv6_udp,
ICE_SW_INSET_MAC_QINQ_IPV6_UDP, ICE_INSET_NONE,
ICE_INSET_NONE},
{pattern_eth_qinq_pppoes, ICE_SW_INSET_MAC_PPPOE,
ICE_INSET_NONE, ICE_INSET_NONE},
{pattern_eth_qinq_pppoes_proto,
ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE,
ICE_INSET_NONE},
{pattern_eth_qinq_pppoes_ipv4,
ICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE,
ICE_INSET_NONE},
@@ -295,7 +311,11 @@ ice_pattern_match_item ice_switch_pattern_perm_list[] = {
{pattern_eth_ipv4_pfcp, ICE_INSET_NONE,
ICE_INSET_NONE, ICE_INSET_NONE},
{pattern_eth_ipv6_pfcp, ICE_INSET_NONE,
ICE_INSET_NONE, ICE_INSET_NONE},
{pattern_eth_qinq_ipv4,
ICE_SW_INSET_MAC_QINQ_IPV4, ICE_INSET_NONE,
ICE_INSET_NONE},
+ {pattern_eth_qinq_ipv4_tcp,
ICE_SW_INSET_MAC_QINQ_IPV4_TCP, ICE_INSET_NONE,
ICE_INSET_NONE},
+ {pattern_eth_qinq_ipv4_udp,
ICE_SW_INSET_MAC_QINQ_IPV4_UDP, ICE_INSET_NONE,
ICE_INSET_NONE},
{pattern_eth_qinq_ipv6,
ICE_SW_INSET_MAC_QINQ_IPV6, ICE_INSET_NONE,
ICE_INSET_NONE},
+ {pattern_eth_qinq_ipv6_tcp,
ICE_SW_INSET_MAC_QINQ_IPV6_TCP, ICE_INSET_NONE,
ICE_INSET_NONE},
+ {pattern_eth_qinq_ipv6_udp,
ICE_SW_INSET_MAC_QINQ_IPV6_UDP, ICE_INSET_NONE,
ICE_INSET_NONE},
{pattern_eth_qinq_pppoes, ICE_SW_INSET_MAC_PPPOE,
ICE_INSET_NONE, ICE_INSET_NONE},
{pattern_eth_qinq_pppoes_proto,
ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE,
ICE_INSET_NONE},
{pattern_eth_qinq_pppoes_ipv4,
ICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE,
ICE_INSET_NONE},
--
2.27.0
