[dpdk-stable] patch 'net/ice: fix flow validation for unsupported patterns' has been queued to stable release 19.11.6
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Wed Oct 28 11:43:04 CET 2020
Hi,
FYI, your patch has been queued to stable release 19.11.6
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/20. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Thanks.
Luca Boccassi
---
>From 5071c928825fa508c86ef6b96f6510974ac2ff3a Mon Sep 17 00:00:00 2001
From: Guinan Sun <guinanx.sun at intel.com>
Date: Tue, 8 Sep 2020 03:15:05 +0000
Subject: [PATCH] net/ice: fix flow validation for unsupported patterns
[ upstream commit c28c993c8a255b13cb0fb5f8094cebf46176ef1d ]
When loading the OS default package and the pipeline mode is enabled
by the "pipeline-mode-support=1" operation. In this case, the wrong
parser is selected for processing and it will cause the unsupported
patterns(pppoes/pfcp/l2tpv3/esp/ah) to be validated successfully.
This patch corrects the parser selection issue.
Fixes: 47d460d63233 ("net/ice: rework switch filter")
Signed-off-by: Guinan Sun <guinanx.sun at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
drivers/net/ice/ice_switch_filter.c | 100 ++++++++++++++++++++++------
1 file changed, 81 insertions(+), 19 deletions(-)
diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c
index c2f5aa78d5..03493ee464 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -98,12 +98,47 @@ struct sw_meta {
static struct ice_flow_parser ice_switch_dist_parser_os;
static struct ice_flow_parser ice_switch_dist_parser_comms;
-static struct ice_flow_parser ice_switch_perm_parser;
+static struct ice_flow_parser ice_switch_perm_parser_os;
+static struct ice_flow_parser ice_switch_perm_parser_comms;
+
+static struct
+ice_pattern_match_item ice_switch_pattern_dist_os[] = {
+ {pattern_ethertype,
+ ICE_SW_INSET_ETHER, ICE_INSET_NONE},
+ {pattern_eth_arp,
+ ICE_INSET_NONE, ICE_INSET_NONE},
+ {pattern_eth_ipv4,
+ ICE_SW_INSET_MAC_IPV4, ICE_INSET_NONE},
+ {pattern_eth_ipv4_udp,
+ ICE_SW_INSET_MAC_IPV4_UDP, ICE_INSET_NONE},
+ {pattern_eth_ipv4_tcp,
+ ICE_SW_INSET_MAC_IPV4_TCP, ICE_INSET_NONE},
+ {pattern_eth_ipv6,
+ ICE_SW_INSET_MAC_IPV6, ICE_INSET_NONE},
+ {pattern_eth_ipv6_udp,
+ ICE_SW_INSET_MAC_IPV6_UDP, ICE_INSET_NONE},
+ {pattern_eth_ipv6_tcp,
+ ICE_SW_INSET_MAC_IPV6_TCP, ICE_INSET_NONE},
+ {pattern_eth_ipv4_udp_vxlan_eth_ipv4,
+ ICE_SW_INSET_DIST_VXLAN_IPV4, ICE_INSET_NONE},
+ {pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,
+ ICE_SW_INSET_DIST_VXLAN_IPV4_UDP, ICE_INSET_NONE},
+ {pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,
+ ICE_SW_INSET_DIST_VXLAN_IPV4_TCP, ICE_INSET_NONE},
+ {pattern_eth_ipv4_nvgre_eth_ipv4,
+ ICE_SW_INSET_DIST_NVGRE_IPV4, ICE_INSET_NONE},
+ {pattern_eth_ipv4_nvgre_eth_ipv4_udp,
+ ICE_SW_INSET_DIST_NVGRE_IPV4_UDP, ICE_INSET_NONE},
+ {pattern_eth_ipv4_nvgre_eth_ipv4_tcp,
+ ICE_SW_INSET_DIST_NVGRE_IPV4_TCP, ICE_INSET_NONE},
+};
static struct
ice_pattern_match_item ice_switch_pattern_dist_comms[] = {
{pattern_ethertype,
ICE_SW_INSET_ETHER, ICE_INSET_NONE},
+ {pattern_eth_arp,
+ ICE_INSET_NONE, ICE_INSET_NONE},
{pattern_eth_ipv4,
ICE_SW_INSET_MAC_IPV4, ICE_INSET_NONE},
{pattern_eth_ipv4_udp,
@@ -139,7 +174,7 @@ ice_pattern_match_item ice_switch_pattern_dist_comms[] = {
};
static struct
-ice_pattern_match_item ice_switch_pattern_dist_os[] = {
+ice_pattern_match_item ice_switch_pattern_perm_os[] = {
{pattern_ethertype,
ICE_SW_INSET_ETHER, ICE_INSET_NONE},
{pattern_eth_arp,
@@ -157,21 +192,25 @@ ice_pattern_match_item ice_switch_pattern_dist_os[] = {
{pattern_eth_ipv6_tcp,
ICE_SW_INSET_MAC_IPV6_TCP, ICE_INSET_NONE},
{pattern_eth_ipv4_udp_vxlan_eth_ipv4,
- ICE_SW_INSET_DIST_VXLAN_IPV4, ICE_INSET_NONE},
+ ICE_SW_INSET_PERM_TUNNEL_IPV4, ICE_INSET_NONE},
{pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,
- ICE_SW_INSET_DIST_VXLAN_IPV4_UDP, ICE_INSET_NONE},
+ ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP, ICE_INSET_NONE},
{pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,
- ICE_SW_INSET_DIST_VXLAN_IPV4_TCP, ICE_INSET_NONE},
+ ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP, ICE_INSET_NONE},
{pattern_eth_ipv4_nvgre_eth_ipv4,
- ICE_SW_INSET_DIST_NVGRE_IPV4, ICE_INSET_NONE},
+ ICE_SW_INSET_PERM_TUNNEL_IPV4, ICE_INSET_NONE},
{pattern_eth_ipv4_nvgre_eth_ipv4_udp,
- ICE_SW_INSET_DIST_NVGRE_IPV4_UDP, ICE_INSET_NONE},
+ ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP, ICE_INSET_NONE},
{pattern_eth_ipv4_nvgre_eth_ipv4_tcp,
- ICE_SW_INSET_DIST_NVGRE_IPV4_TCP, ICE_INSET_NONE},
+ ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP, ICE_INSET_NONE},
};
static struct
-ice_pattern_match_item ice_switch_pattern_perm[] = {
+ice_pattern_match_item ice_switch_pattern_perm_comms[] = {
+ {pattern_ethertype,
+ ICE_SW_INSET_ETHER, ICE_INSET_NONE},
+ {pattern_eth_arp,
+ ICE_INSET_NONE, ICE_INSET_NONE},
{pattern_eth_ipv4,
ICE_SW_INSET_MAC_IPV4, ICE_INSET_NONE},
{pattern_eth_ipv4_udp,
@@ -1215,7 +1254,7 @@ ice_switch_init(struct ice_adapter *ad)
{
int ret = 0;
struct ice_flow_parser *dist_parser;
- struct ice_flow_parser *perm_parser = &ice_switch_perm_parser;
+ struct ice_flow_parser *perm_parser;
if (ad->active_pkg_type == ICE_PKG_TYPE_COMMS)
dist_parser = &ice_switch_dist_parser_comms;
@@ -1224,10 +1263,16 @@ ice_switch_init(struct ice_adapter *ad)
else
return -EINVAL;
- if (ad->devargs.pipe_mode_support)
+ if (ad->devargs.pipe_mode_support) {
+ if (ad->active_pkg_type == ICE_PKG_TYPE_COMMS)
+ perm_parser = &ice_switch_perm_parser_comms;
+ else
+ perm_parser = &ice_switch_perm_parser_os;
+
ret = ice_register_parser(perm_parser, ad);
- else
+ } else {
ret = ice_register_parser(dist_parser, ad);
+ }
return ret;
}
@@ -1235,17 +1280,25 @@ static void
ice_switch_uninit(struct ice_adapter *ad)
{
struct ice_flow_parser *dist_parser;
- struct ice_flow_parser *perm_parser = &ice_switch_perm_parser;
+ struct ice_flow_parser *perm_parser;
if (ad->active_pkg_type == ICE_PKG_TYPE_COMMS)
dist_parser = &ice_switch_dist_parser_comms;
- else
+ else if (ad->active_pkg_type == ICE_PKG_TYPE_OS_DEFAULT)
dist_parser = &ice_switch_dist_parser_os;
+ else
+ return;
+
+ if (ad->devargs.pipe_mode_support) {
+ if (ad->active_pkg_type == ICE_PKG_TYPE_COMMS)
+ perm_parser = &ice_switch_perm_parser_comms;
+ else
+ perm_parser = &ice_switch_perm_parser_os;
- if (ad->devargs.pipe_mode_support)
ice_unregister_parser(perm_parser, ad);
- else
+ } else {
ice_unregister_parser(dist_parser, ad);
+ }
}
static struct
@@ -1278,10 +1331,19 @@ ice_flow_parser ice_switch_dist_parser_comms = {
};
static struct
-ice_flow_parser ice_switch_perm_parser = {
+ice_flow_parser ice_switch_perm_parser_os = {
.engine = &ice_switch_engine,
- .array = ice_switch_pattern_perm,
- .array_len = RTE_DIM(ice_switch_pattern_perm),
+ .array = ice_switch_pattern_perm_os,
+ .array_len = RTE_DIM(ice_switch_pattern_perm_os),
+ .parse_pattern_action = ice_switch_parse_pattern_action,
+ .stage = ICE_FLOW_STAGE_PERMISSION,
+};
+
+static struct
+ice_flow_parser ice_switch_perm_parser_comms = {
+ .engine = &ice_switch_engine,
+ .array = ice_switch_pattern_perm_comms,
+ .array_len = RTE_DIM(ice_switch_pattern_perm_comms),
.parse_pattern_action = ice_switch_parse_pattern_action,
.stage = ICE_FLOW_STAGE_PERMISSION,
};
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-10-28 10:35:12.572282725 +0000
+++ 0025-net-ice-fix-flow-validation-for-unsupported-patterns.patch 2020-10-28 10:35:11.452829258 +0000
@@ -1,8 +1,10 @@
-From c28c993c8a255b13cb0fb5f8094cebf46176ef1d Mon Sep 17 00:00:00 2001
+From 5071c928825fa508c86ef6b96f6510974ac2ff3a Mon Sep 17 00:00:00 2001
From: Guinan Sun <guinanx.sun at intel.com>
Date: Tue, 8 Sep 2020 03:15:05 +0000
Subject: [PATCH] net/ice: fix flow validation for unsupported patterns
+[ upstream commit c28c993c8a255b13cb0fb5f8094cebf46176ef1d ]
+
When loading the OS default package and the pipeline mode is enabled
by the "pipeline-mode-support=1" operation. In this case, the wrong
parser is selected for processing and it will cause the unsupported
@@ -10,124 +12,29 @@
This patch corrects the parser selection issue.
Fixes: 47d460d63233 ("net/ice: rework switch filter")
-Cc: stable at dpdk.org
Signed-off-by: Guinan Sun <guinanx.sun at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
- drivers/net/ice/ice_switch_filter.c | 258 +++++++++++++++++-----------
- 1 file changed, 160 insertions(+), 98 deletions(-)
+ drivers/net/ice/ice_switch_filter.c | 100 ++++++++++++++++++++++------
+ 1 file changed, 81 insertions(+), 19 deletions(-)
diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c
-index 24320ac7df..4dfeeef50f 100644
+index c2f5aa78d5..03493ee464 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
-@@ -139,93 +139,8 @@ struct sw_meta {
+@@ -98,12 +98,47 @@ struct sw_meta {
static struct ice_flow_parser ice_switch_dist_parser_os;
static struct ice_flow_parser ice_switch_dist_parser_comms;
-static struct ice_flow_parser ice_switch_perm_parser;
--
--static struct
--ice_pattern_match_item ice_switch_pattern_dist_comms[] = {
-- {pattern_ethertype,
-- ICE_SW_INSET_ETHER, ICE_INSET_NONE},
-- {pattern_ethertype_vlan,
-- ICE_SW_INSET_MAC_VLAN, ICE_INSET_NONE},
-- {pattern_eth_ipv4,
-- ICE_SW_INSET_MAC_IPV4, ICE_INSET_NONE},
-- {pattern_eth_ipv4_udp,
-- ICE_SW_INSET_MAC_IPV4_UDP, ICE_INSET_NONE},
-- {pattern_eth_ipv4_tcp,
-- ICE_SW_INSET_MAC_IPV4_TCP, ICE_INSET_NONE},
-- {pattern_eth_ipv6,
-- ICE_SW_INSET_MAC_IPV6, ICE_INSET_NONE},
-- {pattern_eth_ipv6_udp,
-- ICE_SW_INSET_MAC_IPV6_UDP, ICE_INSET_NONE},
-- {pattern_eth_ipv6_tcp,
-- ICE_SW_INSET_MAC_IPV6_TCP, ICE_INSET_NONE},
-- {pattern_eth_ipv4_udp_vxlan_eth_ipv4,
-- ICE_SW_INSET_DIST_VXLAN_IPV4, ICE_INSET_NONE},
-- {pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,
-- ICE_SW_INSET_DIST_VXLAN_IPV4_UDP, ICE_INSET_NONE},
-- {pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,
-- ICE_SW_INSET_DIST_VXLAN_IPV4_TCP, ICE_INSET_NONE},
-- {pattern_eth_ipv4_nvgre_eth_ipv4,
-- ICE_SW_INSET_DIST_NVGRE_IPV4, ICE_INSET_NONE},
-- {pattern_eth_ipv4_nvgre_eth_ipv4_udp,
-- ICE_SW_INSET_DIST_NVGRE_IPV4_UDP, ICE_INSET_NONE},
-- {pattern_eth_ipv4_nvgre_eth_ipv4_tcp,
-- ICE_SW_INSET_DIST_NVGRE_IPV4_TCP, ICE_INSET_NONE},
-- {pattern_eth_pppoes,
-- ICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE},
-- {pattern_eth_vlan_pppoes,
-- ICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE},
-- {pattern_eth_pppoes_proto,
-- ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE},
-- {pattern_eth_vlan_pppoes_proto,
-- ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE},
-- {pattern_eth_pppoes_ipv4,
-- ICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE},
-- {pattern_eth_pppoes_ipv4_tcp,
-- ICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE},
-- {pattern_eth_pppoes_ipv4_udp,
-- ICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE},
-- {pattern_eth_pppoes_ipv6,
-- ICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE},
-- {pattern_eth_pppoes_ipv6_tcp,
-- ICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE},
-- {pattern_eth_pppoes_ipv6_udp,
-- ICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE},
-- {pattern_eth_vlan_pppoes_ipv4,
-- ICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE},
-- {pattern_eth_vlan_pppoes_ipv4_tcp,
-- ICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE},
-- {pattern_eth_vlan_pppoes_ipv4_udp,
-- ICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE},
-- {pattern_eth_vlan_pppoes_ipv6,
-- ICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE},
-- {pattern_eth_vlan_pppoes_ipv6_tcp,
-- ICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE},
-- {pattern_eth_vlan_pppoes_ipv6_udp,
-- ICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE},
-- {pattern_eth_ipv4_esp,
-- ICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE},
-- {pattern_eth_ipv4_udp_esp,
-- ICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE},
-- {pattern_eth_ipv6_esp,
-- ICE_SW_INSET_MAC_IPV6_ESP, ICE_INSET_NONE},
-- {pattern_eth_ipv6_udp_esp,
-- ICE_SW_INSET_MAC_IPV6_ESP, ICE_INSET_NONE},
-- {pattern_eth_ipv4_ah,
-- ICE_SW_INSET_MAC_IPV4_AH, ICE_INSET_NONE},
-- {pattern_eth_ipv6_ah,
-- ICE_SW_INSET_MAC_IPV6_AH, ICE_INSET_NONE},
-- {pattern_eth_ipv6_udp_ah,
-- ICE_INSET_NONE, ICE_INSET_NONE},
-- {pattern_eth_ipv4_l2tp,
-- ICE_SW_INSET_MAC_IPV4_L2TP, ICE_INSET_NONE},
-- {pattern_eth_ipv6_l2tp,
-- ICE_SW_INSET_MAC_IPV6_L2TP, ICE_INSET_NONE},
-- {pattern_eth_ipv4_pfcp,
-- ICE_INSET_NONE, ICE_INSET_NONE},
-- {pattern_eth_ipv6_pfcp,
-- ICE_INSET_NONE, ICE_INSET_NONE},
--};
+static struct ice_flow_parser ice_switch_perm_parser_os;
+static struct ice_flow_parser ice_switch_perm_parser_comms;
-
- static struct
- ice_pattern_match_item ice_switch_pattern_dist_os[] = {
-@@ -262,11 +177,135 @@ ice_pattern_match_item ice_switch_pattern_dist_os[] = {
- };
-
- static struct
--ice_pattern_match_item ice_switch_pattern_perm[] = {
-+ice_pattern_match_item ice_switch_pattern_dist_comms[] = {
- {pattern_ethertype,
- ICE_SW_INSET_ETHER, ICE_INSET_NONE},
- {pattern_ethertype_vlan,
- ICE_SW_INSET_MAC_VLAN, ICE_INSET_NONE},
++
++static struct
++ice_pattern_match_item ice_switch_pattern_dist_os[] = {
++ {pattern_ethertype,
++ ICE_SW_INSET_ETHER, ICE_INSET_NONE},
+ {pattern_eth_arp,
+ ICE_INSET_NONE, ICE_INSET_NONE},
+ {pattern_eth_ipv4,
@@ -154,108 +61,60 @@
+ ICE_SW_INSET_DIST_NVGRE_IPV4_UDP, ICE_INSET_NONE},
+ {pattern_eth_ipv4_nvgre_eth_ipv4_tcp,
+ ICE_SW_INSET_DIST_NVGRE_IPV4_TCP, ICE_INSET_NONE},
-+ {pattern_eth_pppoes,
-+ ICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE},
-+ {pattern_eth_vlan_pppoes,
-+ ICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE},
-+ {pattern_eth_pppoes_proto,
-+ ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE},
-+ {pattern_eth_vlan_pppoes_proto,
-+ ICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE},
-+ {pattern_eth_pppoes_ipv4,
-+ ICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE},
-+ {pattern_eth_pppoes_ipv4_tcp,
-+ ICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE},
-+ {pattern_eth_pppoes_ipv4_udp,
-+ ICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE},
-+ {pattern_eth_pppoes_ipv6,
-+ ICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE},
-+ {pattern_eth_pppoes_ipv6_tcp,
-+ ICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE},
-+ {pattern_eth_pppoes_ipv6_udp,
-+ ICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE},
-+ {pattern_eth_vlan_pppoes_ipv4,
-+ ICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE},
-+ {pattern_eth_vlan_pppoes_ipv4_tcp,
-+ ICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE},
-+ {pattern_eth_vlan_pppoes_ipv4_udp,
-+ ICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE},
-+ {pattern_eth_vlan_pppoes_ipv6,
-+ ICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE},
-+ {pattern_eth_vlan_pppoes_ipv6_tcp,
-+ ICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE},
-+ {pattern_eth_vlan_pppoes_ipv6_udp,
-+ ICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE},
-+ {pattern_eth_ipv4_esp,
-+ ICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE},
-+ {pattern_eth_ipv4_udp_esp,
-+ ICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE},
-+ {pattern_eth_ipv6_esp,
-+ ICE_SW_INSET_MAC_IPV6_ESP, ICE_INSET_NONE},
-+ {pattern_eth_ipv6_udp_esp,
-+ ICE_SW_INSET_MAC_IPV6_ESP, ICE_INSET_NONE},
-+ {pattern_eth_ipv4_ah,
-+ ICE_SW_INSET_MAC_IPV4_AH, ICE_INSET_NONE},
-+ {pattern_eth_ipv6_ah,
-+ ICE_SW_INSET_MAC_IPV6_AH, ICE_INSET_NONE},
-+ {pattern_eth_ipv6_udp_ah,
-+ ICE_INSET_NONE, ICE_INSET_NONE},
-+ {pattern_eth_ipv4_l2tp,
-+ ICE_SW_INSET_MAC_IPV4_L2TP, ICE_INSET_NONE},
-+ {pattern_eth_ipv6_l2tp,
-+ ICE_SW_INSET_MAC_IPV6_L2TP, ICE_INSET_NONE},
-+ {pattern_eth_ipv4_pfcp,
-+ ICE_INSET_NONE, ICE_INSET_NONE},
-+ {pattern_eth_ipv6_pfcp,
-+ ICE_INSET_NONE, ICE_INSET_NONE},
+};
-+
-+static struct
-+ice_pattern_match_item ice_switch_pattern_perm_os[] = {
-+ {pattern_ethertype,
-+ ICE_SW_INSET_ETHER, ICE_INSET_NONE},
-+ {pattern_ethertype_vlan,
-+ ICE_SW_INSET_MAC_VLAN, ICE_INSET_NONE},
+
+ static struct
+ ice_pattern_match_item ice_switch_pattern_dist_comms[] = {
+ {pattern_ethertype,
+ ICE_SW_INSET_ETHER, ICE_INSET_NONE},
+ {pattern_eth_arp,
+ ICE_INSET_NONE, ICE_INSET_NONE},
-+ {pattern_eth_ipv4,
-+ ICE_SW_INSET_MAC_IPV4, ICE_INSET_NONE},
-+ {pattern_eth_ipv4_udp,
-+ ICE_SW_INSET_MAC_IPV4_UDP, ICE_INSET_NONE},
-+ {pattern_eth_ipv4_tcp,
-+ ICE_SW_INSET_MAC_IPV4_TCP, ICE_INSET_NONE},
-+ {pattern_eth_ipv6,
-+ ICE_SW_INSET_MAC_IPV6, ICE_INSET_NONE},
-+ {pattern_eth_ipv6_udp,
-+ ICE_SW_INSET_MAC_IPV6_UDP, ICE_INSET_NONE},
-+ {pattern_eth_ipv6_tcp,
-+ ICE_SW_INSET_MAC_IPV6_TCP, ICE_INSET_NONE},
-+ {pattern_eth_ipv4_udp_vxlan_eth_ipv4,
+ {pattern_eth_ipv4,
+ ICE_SW_INSET_MAC_IPV4, ICE_INSET_NONE},
+ {pattern_eth_ipv4_udp,
+@@ -139,7 +174,7 @@ ice_pattern_match_item ice_switch_pattern_dist_comms[] = {
+ };
+
+ static struct
+-ice_pattern_match_item ice_switch_pattern_dist_os[] = {
++ice_pattern_match_item ice_switch_pattern_perm_os[] = {
+ {pattern_ethertype,
+ ICE_SW_INSET_ETHER, ICE_INSET_NONE},
+ {pattern_eth_arp,
+@@ -157,21 +192,25 @@ ice_pattern_match_item ice_switch_pattern_dist_os[] = {
+ {pattern_eth_ipv6_tcp,
+ ICE_SW_INSET_MAC_IPV6_TCP, ICE_INSET_NONE},
+ {pattern_eth_ipv4_udp_vxlan_eth_ipv4,
+- ICE_SW_INSET_DIST_VXLAN_IPV4, ICE_INSET_NONE},
+ ICE_SW_INSET_PERM_TUNNEL_IPV4, ICE_INSET_NONE},
-+ {pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,
+ {pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp,
+- ICE_SW_INSET_DIST_VXLAN_IPV4_UDP, ICE_INSET_NONE},
+ ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP, ICE_INSET_NONE},
-+ {pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,
+ {pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp,
+- ICE_SW_INSET_DIST_VXLAN_IPV4_TCP, ICE_INSET_NONE},
+ ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP, ICE_INSET_NONE},
-+ {pattern_eth_ipv4_nvgre_eth_ipv4,
+ {pattern_eth_ipv4_nvgre_eth_ipv4,
+- ICE_SW_INSET_DIST_NVGRE_IPV4, ICE_INSET_NONE},
+ ICE_SW_INSET_PERM_TUNNEL_IPV4, ICE_INSET_NONE},
-+ {pattern_eth_ipv4_nvgre_eth_ipv4_udp,
+ {pattern_eth_ipv4_nvgre_eth_ipv4_udp,
+- ICE_SW_INSET_DIST_NVGRE_IPV4_UDP, ICE_INSET_NONE},
+ ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP, ICE_INSET_NONE},
-+ {pattern_eth_ipv4_nvgre_eth_ipv4_tcp,
+ {pattern_eth_ipv4_nvgre_eth_ipv4_tcp,
+- ICE_SW_INSET_DIST_NVGRE_IPV4_TCP, ICE_INSET_NONE},
+ ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP, ICE_INSET_NONE},
-+};
-+
-+static struct
+ };
+
+ static struct
+-ice_pattern_match_item ice_switch_pattern_perm[] = {
+ice_pattern_match_item ice_switch_pattern_perm_comms[] = {
+ {pattern_ethertype,
+ ICE_SW_INSET_ETHER, ICE_INSET_NONE},
-+ {pattern_ethertype_vlan,
-+ ICE_SW_INSET_MAC_VLAN, ICE_INSET_NONE},
+ {pattern_eth_arp,
+ ICE_INSET_NONE, ICE_INSET_NONE},
{pattern_eth_ipv4,
ICE_SW_INSET_MAC_IPV4, ICE_INSET_NONE},
{pattern_eth_ipv4_udp,
-@@ -1813,7 +1852,7 @@ ice_switch_init(struct ice_adapter *ad)
+@@ -1215,7 +1254,7 @@ ice_switch_init(struct ice_adapter *ad)
{
int ret = 0;
struct ice_flow_parser *dist_parser;
@@ -264,7 +123,7 @@
if (ad->active_pkg_type == ICE_PKG_TYPE_COMMS)
dist_parser = &ice_switch_dist_parser_comms;
-@@ -1822,10 +1861,16 @@ ice_switch_init(struct ice_adapter *ad)
+@@ -1224,10 +1263,16 @@ ice_switch_init(struct ice_adapter *ad)
else
return -EINVAL;
@@ -283,7 +142,7 @@
return ret;
}
-@@ -1833,17 +1878,25 @@ static void
+@@ -1235,17 +1280,25 @@ static void
ice_switch_uninit(struct ice_adapter *ad)
{
struct ice_flow_parser *dist_parser;
@@ -313,7 +172,7 @@
}
static struct
-@@ -1877,10 +1930,19 @@ ice_flow_parser ice_switch_dist_parser_comms = {
+@@ -1278,10 +1331,19 @@ ice_flow_parser ice_switch_dist_parser_comms = {
};
static struct
More information about the stable
mailing list