net/ice: fix flow validation for unsupported patterns
PATCH 1/1 net/ice: fix flow validation for unsupported patterns
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.
--- drivers/net/ice/ice_switch_filter.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ice/ice_switch_filter.c +4 -2
@@ -1806,7 +1806,8 @@ ice_switch_init(struct ice_adapter *ad)else return -EINVAL ; -if (ad->devargs.pipe_mode_support) +if (ad->devargs.pipe_mode_support && + ad->active_pkg_type !=ICE_PKG_TYPE_OS_DEFAULT ) ret =ice_register_parser (perm_parser, ad);else ret =ice_register_parser (dist_parser, ad);
@@ -1824,7 +1825,8 @@ ice_switch_uninit(struct ice_adapter *ad)else dist_parser = &ice_switch_dist_parser_os; -if (ad->devargs.pipe_mode_support) +if (ad->devargs.pipe_mode_support && + ad->active_pkg_type !=ICE_PKG_TYPE_OS_DEFAULT )ice_unregister_parser (perm_parser, ad);else ice_unregister_parser (dist_parser, ad);
Signature · 1 line
2.17.1
Quoted 31 lines
-----Original Message-----
From: Sun, GuinanX <[email protected]>
Sent: Friday, August 28, 2020 10:33 AM
To: [email protected]
Cc: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>; Sun, GuinanX <[email protected]>; [email protected]
Subject: [PATCH] net/ice: fix flow validation for unsupported patternsWhen 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 <[email protected]>--- drivers/net/ice/ice_switch_filter.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/net/ice/ice_switch_filter.c +0
-0
drivers/net/ice/ice_switch_filter.c ice_switch_init(struct ice_adapter *ad) · line 1811
Quoted 7 lines
drivers/net/ice/ice_switch_filter.c +2
-1@@ -1806,7 +1806,8 @@ ice_switch_init(struct ice_adapter *ad)else return -EINVAL ; -if (ad->devargs.pipe_mode_support) +if (ad->devargs.pipe_mode_support && + ad->active_pkg_type !=ICE_PKG_TYPE_OS_DEFAULT ) ret =ice_register_parser (perm_parser, ad);
This is not correct, package type should not related with pipe line mode.
Quoted 14 lines
drivers/net/ice/ice_switch_filter.c +0
-0else ret = ice_register_parser(dist_parser, ad); @@ -1824,7 +1825,8 @@
ice_switch_uninit(struct ice_adapter *ad)drivers/net/ice/ice_switch_filter.c +2
-2else dist_parser = &ice_switch_dist_parser_os; -if (ad->devargs.pipe_mode_support) +if (ad->devargs.pipe_mode_support && + ad->active_pkg_type !=ICE_PKG_TYPE_OS_DEFAULT )ice_unregister_parser (perm_parser, ad);else ice_unregister_parser (dist_parser, ad); --2.17.1
Hi qi
Quoted 41 lines
-----Original Message-----
From: Zhang, Qi Z
Sent: Monday, August 31, 2020 12:23 PM
To: Sun, GuinanX <[email protected]>; [email protected]
Cc: Yang, Qiming <[email protected]>; [email protected]
Subject: RE: [PATCH] net/ice: fix flow validation for unsupported patternsQuoted 32 lines
-----Original Message-----
From: Sun, GuinanX <[email protected]>
Sent: Friday, August 28, 2020 10:33 AM
To: [email protected]
Cc: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>; Sun, GuinanX <[email protected]>; [email protected]
Subject: [PATCH] net/ice: fix flow validation for unsupported patternsWhen 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 <[email protected]>--- drivers/net/ice/ice_switch_filter.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/net/ice/ice_switch_filter.c +0
-0@@ -1806,7 +1806,8 @@ ice_switch_init(struct ice_adapter *ad)else return -EINVAL ;
Quoted 6 lines
drivers/net/ice/ice_switch_filter.c ice_switch_init(struct ice_adapter *ad) · line 1811
Quoted 4 lines
drivers/net/ice/ice_switch_filter.c +2
-1-if (ad->devargs.pipe_mode_support) +if (ad->devargs.pipe_mode_support && + ad->active_pkg_type !=ICE_PKG_TYPE_OS_DEFAULT ) ret =ice_register_parser (perm_parser, ad);This is not correct, package type should not related with pipe line mode.
Under the premise of pipe-mode support, the choice of parser for different package types will be added. Patch v2 will fix it.
Quoted 17 lines
drivers/net/ice/ice_switch_filter.c ice_switch_init(struct ice_adapter *ad) · line 1813
Quoted 4 lines
drivers/net/ice/ice_switch_filter.c +0
-0else ret = ice_register_parser(dist_parser, ad); @@ -1824,7+1825,8 @@
Quoted 12 lines
ice_switch_uninit(struct ice_adapter *ad)drivers/net/ice/ice_switch_filter.c +2
-2else dist_parser = &ice_switch_dist_parser_os; -if (ad->devargs.pipe_mode_support) +if (ad->devargs.pipe_mode_support && + ad->active_pkg_type !=ICE_PKG_TYPE_OS_DEFAULT )ice_unregister_parser (perm_parser, ad);else ice_unregister_parser (dist_parser, ad); --2.17.1
PATCH v2 1/1 net/ice: fix flow validation for unsupported patterns
In reply to Guinan SunWhen 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.
---
v2:
* Add parser selector in pipline-mode.
--- drivers/net/ice/ice_switch_filter.c | 100 ++++++++++++++++++++++------ 1 file changed, 81 insertions(+), 19 deletions(-)
drivers/net/ice/ice_switch_filter.c +81 -19
@@ -139,7 +139,42 @@ 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_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, +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[] = {
@@ -147,6 +182,8 @@ ice_pattern_match_item ice_switch_pattern_dist_comms[] = { 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,
@@ -228,7 +265,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_ethertype_vlan,
@@ -248,25 +285,27 @@ 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_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) {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;
@@ -1822,10 +1861,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; }
@@ -1833,17 +1878,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
@@ -1877,10 +1930,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_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, - .array_len =RTE_DIM (ice_switch_pattern_perm), + .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 , };
Signature · 1 line
2.17.1
Quoted 17 lines
-----Original Message-----
From: Sun, GuinanX <[email protected]>
Sent: Tuesday, September 8, 2020 11:15 AM
To: [email protected]
Cc: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>; Sun, GuinanX <[email protected]>; [email protected]
Subject: [PATCH v2] net/ice: fix flow validation for unsupported patternsWhen 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.
Quoted 4 lines
Fixes 47d460d63233 ("net/ice: rework switch filter")Signed-off-by Guinan Sun <[email protected]>
Applied to dpdk-next-net-intel.
Thanks
Qi