rework for ice generic flow framework and switch filter
cover rework for ice generic flow framework and switch filter
patch 1/4 adds devargs to control pipeline mode patch 2/4 rework for ice generic flow framework patch 3/4 add rte_flow pattern list patch 4/4 rework switch filter on new framework
This patchset depend on the following patches on patchwork:
(1) http://patches.dpdk.org/patch/58445/
[v3] net/ice: support device-specific DDP package loading
(2) http://patches.dpdk.org/patch/58102/
[v4,1/2] ethdev: add GTP extension header to flow API
(3) http://patches.dpdk.org/patch/58103/
[v4,2/2] ethdev: add PPPoE to flow API
Qiming Yang (1):
net/ice: add devargs to control pipeline mode
Ying Wang (2):
net/ice: rework for generic flow enabling net/ice: add pattern manifest
wei zhao (1):
net/ice: rework switch filter
doc/guides/nics/ice.rst | 11 + drivers/net/ice/ice_ethdev.c | 38 +- drivers/net/ice/ice_ethdev.h | 16 +- drivers/net/ice/ice_generic_flow.c | 2055 +++++++++++++++++++++++++++-------- drivers/net/ice/ice_generic_flow.h | 938 ++++++---------- drivers/net/ice/ice_switch_filter.c | 1025 ++++++++++++++--- drivers/net/ice/ice_switch_filter.h | 24 - 7 files changed, 2920 insertions(+), 1187 deletions(-) delete mode 100644 drivers/net/ice/ice_switch_filter.h
Signature · 1 line
2.15.1
PATCH 1/4 net/ice: add devargs to control pipeline mode
From: Qiming Yang <[email protected]>
Added a devarg to control the mode in generic flow API. We use none-pipeline mode by default.
--- doc/guides/nics/ice.rst | 11 +++++++++++ drivers/net/ice/ice_ethdev.c | 16 +++++++++++++++- drivers/net/ice/ice_ethdev.h | 1 + 3 files changed, 27 insertions(+), 1 deletion(-)
doc/guides/nics/ice.rst +11 -0
@@ -61,6 +61,17 @@ Runtime Config Options NOTE: In Safe mode, only very limited features are available, features like RSS, checksum, fdir, tunneling ... are all disabled. +- ``Generic Flow Pipeline Mode Support`` (default ``0``) + + In pipeline mode, a flow can be setted at one specific stage by setting parameter + ``priority``. Currently, we support two stages, priority 0 for permission and 1 for + distributor. For none-pipeline mode, all flows are assumed to be at the same pipeline + stage, priority is ignored. Default, generic flow API is enabled in none pipeline mode, + user can choose to use pipeline mode by set ``devargs`` parameter ``pipeline-mode-support``, + for example:: + + -w 80:00.0, pipleline-mode-support=1 + Driver compilation and testing ------------------------------
drivers/net/ice/ice_ethdev.c +15 -1
@@ -19,9 +19,11 @@/* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support" +#define ICE_PIPELINE_MODE_SUPPORT_ARG "pipeline-mode-support"static const char *const ice_valid_args[] = {ICE_SAFE_MODE_SUPPORT_ARG , +ICE_PIPELINE_MODE_SUPPORT_ARG ,NULL };
@@ -1510,7 +1512,18 @@ static int ice_parse_devargs(struct rte_eth_dev *dev) ret =rte_kvargs_process (kvlist,ICE_SAFE_MODE_SUPPORT_ARG , &parse_bool, &ad->devargs.safe_mode_support); +if (ret) + goto err_devargs; + + ret =rte_kvargs_process (kvlist,ICE_PIPELINE_MODE_SUPPORT_ARG , + &parse_bool, &ad->devargs.pipeline_mode_support); +if (ret) + goto err_devargs; + +rte_kvargs_free (kvlist); +return ret; +err_devargs:rte_kvargs_free (kvlist);return ret; }
@@ -3925,7 +3938,8 @@ RTE_PMD_REGISTER_PCI(net_ice, rte_ice_pmd);RTE_PMD_REGISTER_PCI_TABLE (net_ice, pci_id_ice_map);RTE_PMD_REGISTER_KMOD_DEP (net_ice,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (net_ice, -ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>" ); +ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>" +ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>" );RTE_INIT (ice_init_log) {
drivers/net/ice/ice_ethdev.h +1 -0
@@ -285,6 +285,7 @@ struct ice_pf {*/ struct ice_devargs {int safe_mode_support; +int pipeline_mode_support; };/**
Signature · 1 line
2.15.1
Re: [dpdk-dev] [PATCH 1/4] net/ice: add devargs to control pipeline mode
Quoted 17 lines · Ying Wang
From: Qiming Yang <[email protected]>
Added a devarg to control the mode in generic flow API. We use none-pipeline mode by default.
Signed-off-by Qiming Yang <[email protected]>---
doc/guides/nics/ice.rst | 11 +++++++++++ drivers/net/ice/ice_ethdev.c | 16 +++++++++++++++- drivers/net/ice/ice_ethdev.h | 1 + 3 files changed, 27 insertions(+), 1 deletion(-)doc/guides/nics/ice.rst +0
-0
doc/guides/nics/ice.rst Runtime Config Options · line 66
Quoted 6 lines
doc/guides/nics/ice.rst +3
-0@@ -61,6 +61,17 @@ Runtime Config Options NOTE: In Safe mode, only very limited features are available, features like RSS, checksum, fdir, tunneling ... are all disabled. +- ``Generic Flow Pipeline Mode Support`` (default ``0``) + + In pipeline mode, a flow can be setted at one specific stage by setting parameter
s/setted/set
doc/guides/nics/ice.rst Runtime Config Options · line 68
Quoted 2 lines
doc/guides/nics/ice.rst +2
-0+ ``priority``. Currently, we support two stages, priority 0 for permission and 1 for + distributor. For none-pipeline mode, all flows are assumed to be at the same pipeline
Can we have more description of the 'permission' and 'distributor' in the doc? And we also need update in 19.11 release note, maybe in Ying's patch.
doc/guides/nics/ice.rst Runtime Config Options · line 69
Quoted 1 line
doc/guides/nics/ice.rst +1
-0+ stage, priority is ignored. Default, generic flow API is enabled in none pipeline mode,
s/Default/By default
doc/guides/nics/ice.rst Runtime Config Options · line 70
Quoted 1 line
doc/guides/nics/ice.rst +1
-0+ user can choose to use pipeline mode by set ``devargs`` parameter ``pipeline-mode-support``,
s/set/setting
Quoted 28 lines
doc/guides/nics/ice.rst +4
-0+ for example:: + + -w 80:00.0, pipleline-mode-support=1 +Driver compilation and testing
------------------------------drivers/net/ice/ice_ethdev.c +3
-0@@ -19,9 +19,11 @@/* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support" +#define ICE_PIPELINE_MODE_SUPPORT_ARG "pipeline-mode-support"static const char *const ice_valid_args[] = {ICE_SAFE_MODE_SUPPORT_ARG , +ICE_PIPELINE_MODE_SUPPORT_ARG ,NULL };@@ -1510,7 +1512,18 @@ static int ice_parse_devargs(struct rte_eth_dev *dev) ret =rte_kvargs_process (kvlist,ICE_SAFE_MODE_SUPPORT_ARG , &parse_bool, &ad->devargs.safe_mode_support); +if (ret)
drivers/net/ice/ice_ethdev.c static int ice_parse_devargs(struct rte_eth_dev *dev) · line 1525
Quoted 10 lines
drivers/net/ice/ice_ethdev.c +9
-0+ goto err_devargs; + + ret =rte_kvargs_process (kvlist,ICE_PIPELINE_MODE_SUPPORT_ARG , + &parse_bool, &ad->devargs.pipeline_mode_support); +if (ret) + goto err_devargs; + +rte_kvargs_free (kvlist); +return ret;
These 2 lines are duplicated with below code.
Quoted 29 lines
drivers/net/ice/ice_ethdev.c +3
-1+err_devargs:rte_kvargs_free (kvlist);return ret; }@@ -3925,7 +3938,8 @@ RTE_PMD_REGISTER_PCI(net_ice, rte_ice_pmd);RTE_PMD_REGISTER_PCI_TABLE (net_ice, pci_id_ice_map);RTE_PMD_REGISTER_KMOD_DEP (net_ice,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (net_ice, -ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>" ); +ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>" +ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>" );RTE_INIT (ice_init_log) {drivers/net/ice/ice_ethdev.h +1
-0@@ -285,6 +285,7 @@ struct ice_pf {*/ struct ice_devargs {int safe_mode_support; +int pipeline_mode_support; };/** Signature · 1 line
2.15.1
Re: [dpdk-dev] [PATCH 1/4] net/ice: add devargs to control pipeline mode
Quoted 31 lines
-----Original Message-----
From: Ye, Xiaolong
Sent: Wednesday, September 4, 2019 8:34 PM
To: Wang, Ying A <[email protected]>
Cc: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>; [email protected]; Zhao1, Wei <[email protected]>
Subject: Re: [PATCH 1/4] net/ice: add devargs to control pipeline modeQuoted 17 lines · Ying Wang
From: Qiming Yang <[email protected]>
Added a devarg to control the mode in generic flow API. We use none-pipeline mode by default.
Signed-off-by Qiming Yang <[email protected]>---
doc/guides/nics/ice.rst | 11 +++++++++++ drivers/net/ice/ice_ethdev.c | 16 +++++++++++++++- drivers/net/ice/ice_ethdev.h | 1 + 3 files changed, 27 insertions(+), 1 deletion(-)doc/guides/nics/ice.rst index renamed from doc/guides/nics/ice.rst +0
-0
03819d29f..a8429a535100644doc/guides/nics/ice.rst Runtime Config Options · line 61
Quoted 1 line
doc/guides/nics/ice.rst +0
-0@@ -61,6 +61,17 @@ Runtime Config Options NOTE: In Safe mode, only very limited features are available, features likeRSS,
Quoted 8 lines
doc/guides/nics/ice.rst Runtime Config Options
Quoted 6 lines
doc/guides/nics/ice.rst +4
-0checksum, fdir, tunneling ... are all disabled. +- ``Generic Flow Pipeline Mode Support`` (default ``0``) + + In pipeline mode, a flow can be setted at one specific stage by + setting parameters/setted/set
Got
Quoted 8 lines
doc/guides/nics/ice.rst Runtime Config Options · line 70
Quoted 4 lines
doc/guides/nics/ice.rst +3
-0+ ``priority``. Currently, we support two stages, priority 0 for + permission and 1 for distributor. For none-pipeline mode, all flows + are assumed to be at the same pipelineCan we have more description of the 'permission' and 'distributor' in the doc? And we also need update in 19.11 release note, maybe in Ying's patch.
I think you can ignore these concepts, just our design used, user will only know we have two stages. I'll delete this sentence.
Quoted 5 lines
doc/guides/nics/ice.rst Runtime Config Options · line 72
Quoted 2 lines
doc/guides/nics/ice.rst +2
-0+ stage, priority is ignored. Default, generic flow API is enabled in + none pipeline mode,s/Default/By default
Got
Quoted 5 lines
doc/guides/nics/ice.rst Runtime Config Options · line 74
Quoted 2 lines
doc/guides/nics/ice.rst +2
-0+ user can choose to use pipeline mode by set ``devargs`` parameter + ``pipeline-mode-support``,s/set/setting
Got
Quoted 35 lines
Quoted 35 lines
doc/guides/nics/ice.rst +4
-0+ for example:: + + -w 80:00.0, pipleline-mode-support=1 +Driver compilation and testing
------------------------------(quoted diff) +0
-0
b/drivers/net/ice/ice_ethdev.cindex9aa7506ba..4e0645db1100644drivers/net/ice/ice_ethdev.c +7
-0@@ -19,9 +19,11 @@/* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support" +#define ICE_PIPELINE_MODE_SUPPORT_ARG "pipeline-mode-support"static const char *const ice_valid_args[] = {ICE_SAFE_MODE_SUPPORT_ARG , +ICE_PIPELINE_MODE_SUPPORT_ARG ,NULL };@@ -1510,7 +1512,18 @@ static int ice_parse_devargs(struct rte_eth_dev *dev) ret =rte_kvargs_process (kvlist,ICE_SAFE_MODE_SUPPORT_ARG , &parse_bool, &ad- devargs.safe_mode_support); +if (ret) + goto err_devargs; + + ret =rte_kvargs_process (kvlist,ICE_PIPELINE_MODE_SUPPORT_ARG , + &parse_bool, &ad- devargs.pipeline_mode_support);
Quoted 8 lines
drivers/net/ice/ice_ethdev.c static int ice_parse_devargs(struct rte_eth_dev *dev) · line 1525
Quoted 6 lines
drivers/net/ice/ice_ethdev.c +5
-0+if (ret) + goto err_devargs; + +rte_kvargs_free (kvlist); +return ret;These 2 lines are duplicated with below code.
Not duplicated, one for normal case, one for error case. If no this two lines, the first argument's return value will be covered by the second one.
Quoted 30 lines
Quoted 30 lines
drivers/net/ice/ice_ethdev.c +1
-0+err_devargs:rte_kvargs_free(kvlist); return ret; }drivers/net/ice/ice_ethdev.c +0
-0@@ -3925,7 +3938,8 @@ RTE_PMD_REGISTER_PCI(net_ice, rte_ice_pmd);RTE_PMD_REGISTER_PCI_TABLE (net_ice, pci_id_ice_map);
RTE_PMD_REGISTER_KMOD_DEP(net_ice, "* igb_uio | uio_pci_generic | vfio-pci"); RTE_PMD_REGISTER_PARAM_STRING(net_ice,drivers/net/ice/ice_ethdev.c +2
-1- ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>"); +ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>" + ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>");
RTE_INIT(ice_init_log)
{(quoted diff) +0
-0
b/drivers/net/ice/ice_ethdev.hindex926db23d2..9bf5de08d100644drivers/net/ice/ice_ethdev.h +1
-1@@ -285,6 +285,7 @@ struct ice_pf {*/ struct ice_devargs {int safe_mode_support; +int pipeline_mode_support; };/** -- 2.15.1
Re: [dpdk-dev] [PATCH 1/4] net/ice: add devargs to control pipeline mode
Quoted 5 lines · Qiming
Quoted 3 lines
Can we have more description of the 'permission' and 'distributor' in the doc? And we also need update in 19.11 release note, maybe in Ying's patch.
I think you can ignore these concepts, just our design used, user will only know we have two stages. I'll delete this sentence.
At least we'll still need to tell user how to use these two stages in practice.
Quoted 60 lines
Quoted 6 lines
Quoted 3 lines
+ stage, priority is ignored. Default, generic flow API is enabled in
+ none pipeline mode,s/Default/By default
Got
Quoted 5 lines
Quoted 2 lines
+ user can choose to use pipeline mode by set ``devargs`` parameter
+ ``pipeline-mode-support``,s/set/setting
Got
Quoted 35 lines
Quoted 35 lines
doc/guides/nics/ice.rst +4
-0+ for example:: + + -w 80:00.0, pipleline-mode-support=1 +Driver compilation and testing
------------------------------(quoted diff) +0
-0
b/drivers/net/ice/ice_ethdev.cindex9aa7506ba..4e0645db1100644drivers/net/ice/ice_ethdev.c +7
-0@@ -19,9 +19,11 @@/* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support" +#define ICE_PIPELINE_MODE_SUPPORT_ARG "pipeline-mode-support"static const char *const ice_valid_args[] = {ICE_SAFE_MODE_SUPPORT_ARG , +ICE_PIPELINE_MODE_SUPPORT_ARG ,NULL };@@ -1510,7 +1512,18 @@ static int ice_parse_devargs(struct rte_eth_dev *dev) ret =rte_kvargs_process (kvlist,ICE_SAFE_MODE_SUPPORT_ARG , &parse_bool, &ad- devargs.safe_mode_support); +if (ret) + goto err_devargs; + + ret =rte_kvargs_process (kvlist,ICE_PIPELINE_MODE_SUPPORT_ARG , + &parse_bool, &ad- devargs.pipeline_mode_support);Quoted 8 lines
drivers/net/ice/ice_ethdev.c static int ice_parse_devargs(struct rte_eth_dev *dev) · line 1525
Quoted 6 lines
drivers/net/ice/ice_ethdev.c +5
-0+if (ret) + goto err_devargs; + +rte_kvargs_free (kvlist); +return ret;These 2 lines are duplicated with below code.
Quoted 1 line
Not duplicated, one for normal case, one for error case. If no this two lines, the first argument's return value will be covered by the second one.
I don't get it, they are literally the same thing, it's a normal case or a error case depends on the ret value obtained. What do you mean by "will be covered by the second one"? If the first argument process succeeds, the ret is 0, it will continue to parse the second one, if ret is non-zero, it just goes out by the goto statement.
Thanks,
Xiaolong
Quoted 31 lines
Quoted 31 lines
Quoted 31 lines
drivers/net/ice/ice_ethdev.c +1
-0+err_devargs:rte_kvargs_free(kvlist); return ret; }drivers/net/ice/ice_ethdev.c +0
-0@@ -3925,7 +3938,8 @@ RTE_PMD_REGISTER_PCI(net_ice, rte_ice_pmd);RTE_PMD_REGISTER_PCI_TABLE (net_ice, pci_id_ice_map);
RTE_PMD_REGISTER_KMOD_DEP(net_ice, "* igb_uio | uio_pci_generic | vfio-pci"); RTE_PMD_REGISTER_PARAM_STRING(net_ice,drivers/net/ice/ice_ethdev.c +2
-1- ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>"); +ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>" + ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>");
RTE_INIT(ice_init_log)
{(quoted diff) +0
-0
b/drivers/net/ice/ice_ethdev.hindex926db23d2..9bf5de08d100644drivers/net/ice/ice_ethdev.h +1
-1@@ -285,6 +285,7 @@ struct ice_pf {*/ struct ice_devargs {int safe_mode_support; +int pipeline_mode_support; };/** -- 2.15.1
Re: [dpdk-dev] [PATCH 1/4] net/ice: add devargs to control pipeline mode
I got you, will fix it in v2
Qiming
-----Original Message-----
From: Ye, Xiaolong
Sent: Monday, September 9, 2019 17:17
To: Yang, Qiming <[email protected]>
Cc: Wang, Ying A <[email protected]>; Zhang, Qi Z <[email protected]>; [email protected]; Zhao1, Wei <[email protected]>
Subject: Re: [PATCH 1/4] net/ice: add devargs to control pipeline mode
Quoted 5 lines · Qiming
Quoted 3 lines
Can we have more description of the 'permission' and 'distributor' in the doc? And we also need update in 19.11 release note, maybe in Ying's patch.
I think you can ignore these concepts, just our design used, user will only know we have two stages. I'll delete this sentence.
At least we'll still need to tell user how to use these two stages in practice.
Quoted 61 lines
Quoted 6 lines
Quoted 3 lines
+ stage, priority is ignored. Default, generic flow API is enabled
+ in none pipeline mode,s/Default/By default
Got
Quoted 5 lines
Quoted 2 lines
+ user can choose to use pipeline mode by set ``devargs`` parameter
+ ``pipeline-mode-support``,s/set/setting
Got
Quoted 36 lines
Quoted 36 lines
doc/guides/nics/ice.rst +4
-0+ for example:: + + -w 80:00.0, pipleline-mode-support=1 +Driver compilation and testing
------------------------------(quoted diff) +0
-0
b/drivers/net/ice/ice_ethdev.cindex9aa7506ba..4e0645db1100644drivers/net/ice/ice_ethdev.c +2
-0@@ -19,9 +19,11 @@/* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support" +#define ICE_PIPELINE_MODE_SUPPORT_ARG "pipeline-mode-support"static const char *const ice_valid_args[] = {ICE_SAFE_MODE_SUPPORT_ARG , +ICE_PIPELINE_MODE_SUPPORT_ARG ,NULL };@@ -1510,7 +1512,18 @@ static int ice_parse_devargs(struct
rte_eth_dev
*dev)ret = rte_kvargs_process(kvlist, ICE_SAFE_MODE_SUPPORT_ARG, &parse_bool, &ad-devargs.safe_mode_support);
drivers/net/ice/ice_ethdev.c +5
-0+if (ret) + goto err_devargs; + + ret = rte_kvargs_process(kvlist, ICE_PIPELINE_MODE_SUPPORT_ARG, + &parse_bool, &ad-devargs.pipeline_mode_support);
Quoted 8 lines
drivers/net/ice/ice_ethdev.c static int ice_parse_devargs(struct rte_eth_dev *dev) · line 1524
Quoted 6 lines
drivers/net/ice/ice_ethdev.c +5
-0+if (ret) + goto err_devargs; + +rte_kvargs_free (kvlist); +return ret;These 2 lines are duplicated with below code.
Quoted 1 line
Not duplicated, one for normal case, one for error case. If no this two lines, the first argument's return value will be covered by the second one.
I don't get it, they are literally the same thing, it's a normal case or a error case depends on the ret value obtained. What do you mean by "will be covered by the second one"? If the first argument process succeeds, the ret is 0, it will continue to parse the second one, if ret is non-zero, it just goes out by the goto statement.
Thanks,
Xiaolong
Quoted 31 lines
Quoted 31 lines
Quoted 31 lines
+err_devargs:
rte_kvargs_free(kvlist); return ret; }drivers/net/ice/ice_ethdev.c +0
-0@@ -3925,7 +3938,8 @@ RTE_PMD_REGISTER_PCI(net_ice, rte_ice_pmd);RTE_PMD_REGISTER_PCI_TABLE (net_ice, pci_id_ice_map);
RTE_PMD_REGISTER_KMOD_DEP(net_ice, "* igb_uio | uio_pci_generic | vfio-pci"); RTE_PMD_REGISTER_PARAM_STRING(net_ice,drivers/net/ice/ice_ethdev.c +2
-1- ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>"); +ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>" + ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>");
RTE_INIT(ice_init_log)
{(quoted diff) +0
-0
b/drivers/net/ice/ice_ethdev.hindex926db23d2..9bf5de08d100644drivers/net/ice/ice_ethdev.h +1
-1@@ -285,6 +285,7 @@ struct ice_pf {*/ struct ice_devargs {int safe_mode_support; +int pipeline_mode_support; };/** -- 2.15.1
Re: [dpdk-dev] [PATCH 1/4] net/ice: add devargs to control pipeline mode
In reply to Ying WangQuoted 27 lines
-----Original Message-----
From: dev <[email protected]> On Behalf Of Ying Wang
Sent: Tuesday, September 3, 2019 3:15 PM
To: Zhang, Qi Z <[email protected]>
Cc: Ye, Xiaolong <[email protected]>; Yang, Qiming <[email protected]>; [email protected]; Wang, Ying A <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [dpdk-dev] [PATCH 1/4] net/ice: add devargs to control pipeline modeFrom: Qiming Yang <[email protected]>
Added a devarg to control the mode in generic flow API. We use none-pipeline mode by default.
Signed-off-by Qiming Yang <[email protected]>--- doc/guides/nics/ice.rst | 11 +++++++++++ drivers/net/ice/ice_ethdev.c | 16 +++++++++++++++- drivers/net/ice/ice_ethdev.h | 1 + 3 files changed, 27 insertions(+), 1 deletion(-)doc/guides/nics/ice.rst index renamed from doc/guides/nics/ice.rst +0
-0
03819d29f..a8429a535100644
doc/guides/nics/ice.rst Runtime Config Options · line 67
Quoted 7 lines
doc/guides/nics/ice.rst +3
-0@@ -61,6 +61,17 @@ Runtime Config Options NOTE: In Safe mode, only very limited features are available, features like RSS, checksum, fdir, tunneling ... are all disabled. +- ``Generic Flow Pipeline Mode Support`` (default ``0``) + + In pipeline mode, a flow can be setted at one specific stage by
setted => set
doc/guides/nics/ice.rst Runtime Config Options · line 69
Quoted 2 lines
doc/guides/nics/ice.rst +2
-0+ setting parameter ``priority``. Currently, we support two stages, + priority 0 for permission and 1 for distributor. For none-pipeline
none-pipeline => non-pipeline
doc/guides/nics/ice.rst Runtime Config Options · line 71
Quoted 2 lines
doc/guides/nics/ice.rst +2
-0+ mode, all flows are assumed to be at the same pipeline stage, + priority is ignored. Default, generic flow API is enabled in none
none => non
Quoted 71 lines
doc/guides/nics/ice.rst +1
-0+ pipeline mode, user can choose to use pipeline mode by set ``devargs``parameter ``pipeline-mode-support``, for example::
doc/guides/nics/ice.rst +3
-0+ + -w 80:00.0, pipleline-mode-support=1 + Driver compilation and testing ------------------------------drivers/net/ice/ice_ethdev.c +13
-0@@ -19,9 +19,11 @@/* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support" +#define ICE_PIPELINE_MODE_SUPPORT_ARG "pipeline-mode-support"static const char *const ice_valid_args[] = {ICE_SAFE_MODE_SUPPORT_ARG , +ICE_PIPELINE_MODE_SUPPORT_ARG ,NULL };@@ -1510,7 +1512,18 @@ static int ice_parse_devargs(struct rte_eth_dev *dev) ret =rte_kvargs_process (kvlist,ICE_SAFE_MODE_SUPPORT_ARG , &parse_bool, &ad- >devargs.safe_mode_support); +if (ret) + goto err_devargs; + + ret =rte_kvargs_process (kvlist,ICE_PIPELINE_MODE_SUPPORT_ARG , + &parse_bool, &ad- >devargs.pipeline_mode_support); +if (ret) + goto err_devargs; + +rte_kvargs_free (kvlist); +return ret; +err_devargs:rte_kvargs_free (kvlist);return ret; }@@ -3925,7 +3938,8 @@ RTE_PMD_REGISTER_PCI(net_ice, rte_ice_pmd);RTE_PMD_REGISTER_PCI_TABLE (net_ice, pci_id_ice_map);
RTE_PMD_REGISTER_KMOD_DEP(net_ice, "* igb_uio | uio_pci_generic | vfio-pci"); RTE_PMD_REGISTER_PARAM_STRING(net_ice,drivers/net/ice/ice_ethdev.c +2
-1- ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>"); +ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>" + ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>");RTE_INIT (ice_init_log) {drivers/net/ice/ice_ethdev.h +1
-1@@ -285,6 +285,7 @@ struct ice_pf {*/ struct ice_devargs {int safe_mode_support; +int pipeline_mode_support; };/** -- 2.15.1
v2 cover rework for ice generic flow framework and switch filter
In reply to Ying Wangpatch 1/5 minor code clean
patch 2/5 adds devargs to control pipeline mode patch 3/5 rework for ice generic flow framework patch 4/5 add rte_flow pattern list patch 5/5 rework switch filter on new framework
The patchset depend on the following patches in patchwork:
(1) http://patches.dpdk.org/patch/59286/
[v8] net/ice: support device-specific DDP package loading
(2) http://patches.dpdk.org/patch/58102/
[v4,1/2] ethdev: add GTP extension header to flow API
(3) http://patches.dpdk.org/patch/58103/
[v4,2/2] ethdev: add PPPoE to flow API
Qiming Yang (1):
net/ice: add devargs to control pipeline mode
Ying Wang (3):
net/ice: minor code clean
net/ice: rework for generic flow enabling net/ice: add pattern manifest
wei zhao (1):
net/ice: rework switch filter
---
v2: modify codes according to the comments;
update doc and release note;
add a separate code clean patch;---
doc/guides/nics/ice.rst | 19 + doc/guides/rel_notes/release_19_11.rst | 3 + drivers/net/ice/ice_ethdev.c | 32 +- drivers/net/ice/ice_ethdev.h | 16 +- drivers/net/ice/ice_generic_flow.c | 2073 +++++++++++++++++++++++++------- drivers/net/ice/ice_generic_flow.h | 941 ++++++--------- drivers/net/ice/ice_switch_filter.c | 883 ++++++++++++-- drivers/net/ice/ice_switch_filter.h | 24 - 8 files changed, 2810 insertions(+), 1181 deletions(-) delete mode 100644 drivers/net/ice/ice_switch_filter.h
Signature · 1 line
2.15.1
PATCH v2 1/5 net/ice: minor code clean
The patch removes redundant code and cleans up some wrong indentations.
--- drivers/net/ice/ice_generic_flow.c | 39 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 20 deletions(-)
drivers/net/ice/ice_generic_flow.c +19 -20
@@ -44,21 +44,21 @@ const struct rte_flow_ops ice_flow_ops = {static int ice_flow_valid_attr (const struct rte_flow_attr *attr, -struct rte_flow_error *error) +struct rte_flow_error *error) {/* Must be input direction */ if (!attr->ingress) {rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ATTR_INGRESS , - attr,"Only support ingress." ); +RTE_FLOW_ERROR_TYPE_ATTR_INGRESS , + attr,"Only support ingress." );return -rte_errno; }/* Not supported */ if (attr->egress) {rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ATTR_EGRESS , - attr,"Not support egress." ); +RTE_FLOW_ERROR_TYPE_ATTR_EGRESS , + attr,"Not support egress." );return -rte_errno; }
@@ -73,8 +73,8 @@ ice_flow_valid_attr(const struct rte_flow_attr *attr,/* Not supported */ if (attr->group) {rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ATTR_GROUP , - attr,"Not support group." ); +RTE_FLOW_ERROR_TYPE_ATTR_GROUP , + attr,"Not support group." );return -rte_errno; }
@@ -102,7 +102,7 @@ ice_find_first_item(const struct rte_flow_item *item, bool is_void)/* Skip all VOID items of the pattern */ static void ice_pattern_skip_void_item (struct rte_flow_item *items, -const struct rte_flow_item *pattern) +const struct rte_flow_item *pattern) {uint32_t cpy_count =0 ;const struct rte_flow_item *pb = pattern, *pe = pattern;
@@ -124,7 +124,6 @@ ice_pattern_skip_void_item(struct rte_flow_item *items, items += cpy_count;if (pe->type ==RTE_FLOW_ITEM_TYPE_END ) { - pb = pe;break ; }
@@ -560,10 +559,10 @@ static int ice_flow_valid_action(struct rte_eth_dev *dev,static int ice_flow_validate (struct rte_eth_dev *dev, -const struct rte_flow_attr *attr, -const struct rte_flow_item pattern[], -const struct rte_flow_action actions[], -struct rte_flow_error *error) +const struct rte_flow_attr *attr, +const struct rte_flow_item pattern[], +const struct rte_flow_action actions[], +struct rte_flow_error *error) {uint64_t inset =0 ;int ret =ICE_ERR_NOT_SUPPORTED ;
@@ -609,10 +608,10 @@ ice_flow_validate(struct rte_eth_dev *dev,static struct rte_flow *ice_flow_create (struct rte_eth_dev *dev, -const struct rte_flow_attr *attr, -const struct rte_flow_item pattern[], -const struct rte_flow_action actions[], -struct rte_flow_error *error) +const struct rte_flow_attr *attr, +const struct rte_flow_item pattern[], +const struct rte_flow_action actions[], +struct rte_flow_error *error) {struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private);struct rte_flow *flow =NULL ;
@@ -647,8 +646,8 @@ ice_flow_create(struct rte_eth_dev *dev,static int ice_flow_destroy (struct rte_eth_dev *dev, -struct rte_flow *flow, -struct rte_flow_error *error) +struct rte_flow *flow, +struct rte_flow_error *error) {struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private);int ret =0 ;
@@ -669,7 +668,7 @@ ice_flow_destroy(struct rte_eth_dev *dev,static int ice_flow_flush (struct rte_eth_dev *dev, -struct rte_flow_error *error) +struct rte_flow_error *error) {struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private);struct rte_flow *p_flow;
Signature · 1 line
2.15.1
v3 cover rework for ice generic flow framework and switch filter
patch 1/5 minor code clean
patch 2/5 adds devargs to control pipeline mode patch 3/5 rework for ice generic flow framework patch 4/5 add rte_flow pattern list patch 5/5 rework switch filter on new framework
The patchset depend on the following patches in patchwork:
(1) http://patches.dpdk.org/patch/58102/
[v4,1/2] ethdev: add GTP extension header to flow API
(2) http://patches.dpdk.org/patch/58103/
[v4,2/2] ethdev: add PPPoE to flow API
Qiming Yang (1):
net/ice: add devargs to control pipeline mode
Ying Wang (3):
net/ice: minor code clean
net/ice: rework for generic flow enabling net/ice: add pattern manifest
wei zhao (1):
net/ice: rework switch filter
---
v3: rebase patches to solve merge conflict;
redefine inpustet bit field;
v2: modify codes according to the comments;
update doc and release note;
add a separate code clean patch;---
doc/guides/nics/ice.rst | 19 + doc/guides/rel_notes/release_19_11.rst | 3 + drivers/net/ice/ice_ethdev.c | 31 +- drivers/net/ice/ice_ethdev.h | 16 +- drivers/net/ice/ice_generic_flow.c | 2072 +++++++++++++++++++++++++------- drivers/net/ice/ice_generic_flow.h | 1042 +++++++--------- drivers/net/ice/ice_switch_filter.c | 918 ++++++++++++-- drivers/net/ice/ice_switch_filter.h | 24 - 8 files changed, 2944 insertions(+), 1181 deletions(-) delete mode 100644 drivers/net/ice/ice_switch_filter.h
Signature · 1 line
2.15.1
PATCH v3 1/5 net/ice: minor code clean
The patch removes redundant code and cleans up some wrong indentations.
--- drivers/net/ice/ice_generic_flow.c | 39 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 20 deletions(-)
drivers/net/ice/ice_generic_flow.c +19 -20
@@ -44,21 +44,21 @@ const struct rte_flow_ops ice_flow_ops = {static int ice_flow_valid_attr (const struct rte_flow_attr *attr, -struct rte_flow_error *error) +struct rte_flow_error *error) {/* Must be input direction */ if (!attr->ingress) {rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ATTR_INGRESS , - attr,"Only support ingress." ); +RTE_FLOW_ERROR_TYPE_ATTR_INGRESS , + attr,"Only support ingress." );return -rte_errno; }/* Not supported */ if (attr->egress) {rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ATTR_EGRESS , - attr,"Not support egress." ); +RTE_FLOW_ERROR_TYPE_ATTR_EGRESS , + attr,"Not support egress." );return -rte_errno; }
@@ -73,8 +73,8 @@ ice_flow_valid_attr(const struct rte_flow_attr *attr,/* Not supported */ if (attr->group) {rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ATTR_GROUP , - attr,"Not support group." ); +RTE_FLOW_ERROR_TYPE_ATTR_GROUP , + attr,"Not support group." );return -rte_errno; }
@@ -102,7 +102,7 @@ ice_find_first_item(const struct rte_flow_item *item, bool is_void)/* Skip all VOID items of the pattern */ static void ice_pattern_skip_void_item (struct rte_flow_item *items, -const struct rte_flow_item *pattern) +const struct rte_flow_item *pattern) {uint32_t cpy_count =0 ;const struct rte_flow_item *pb = pattern, *pe = pattern;
@@ -124,7 +124,6 @@ ice_pattern_skip_void_item(struct rte_flow_item *items, items += cpy_count;if (pe->type ==RTE_FLOW_ITEM_TYPE_END ) { - pb = pe;break ; }
@@ -560,10 +559,10 @@ static int ice_flow_valid_action(struct rte_eth_dev *dev,static int ice_flow_validate (struct rte_eth_dev *dev, -const struct rte_flow_attr *attr, -const struct rte_flow_item pattern[], -const struct rte_flow_action actions[], -struct rte_flow_error *error) +const struct rte_flow_attr *attr, +const struct rte_flow_item pattern[], +const struct rte_flow_action actions[], +struct rte_flow_error *error) {uint64_t inset =0 ;int ret =ICE_ERR_NOT_SUPPORTED ;
@@ -609,10 +608,10 @@ ice_flow_validate(struct rte_eth_dev *dev,static struct rte_flow *ice_flow_create (struct rte_eth_dev *dev, -const struct rte_flow_attr *attr, -const struct rte_flow_item pattern[], -const struct rte_flow_action actions[], -struct rte_flow_error *error) +const struct rte_flow_attr *attr, +const struct rte_flow_item pattern[], +const struct rte_flow_action actions[], +struct rte_flow_error *error) {struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private);struct rte_flow *flow =NULL ;
@@ -647,8 +646,8 @@ ice_flow_create(struct rte_eth_dev *dev,static int ice_flow_destroy (struct rte_eth_dev *dev, -struct rte_flow *flow, -struct rte_flow_error *error) +struct rte_flow *flow, +struct rte_flow_error *error) {struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private);int ret =0 ;
@@ -669,7 +668,7 @@ ice_flow_destroy(struct rte_eth_dev *dev,static int ice_flow_flush (struct rte_eth_dev *dev, -struct rte_flow_error *error) +struct rte_flow_error *error) {struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private);struct rte_flow *p_flow;
Signature · 1 line
2.15.1
v4 cover rework for ice generic flow framework and switch filter
patch 1/5 minor code clean
patch 2/5 adds devargs to control pipeline mode patch 3/5 rework for ice generic flow framework patch 4/5 add rte_flow pattern list patch 5/5 rework switch filter on new framework
Qiming Yang (1):
net/ice: add devargs to control pipeline mode
Ying Wang (3):
net/ice: minor code clean
net/ice: rework for generic flow enabling net/ice: add pattern manifest
wei zhao (1):
net/ice: rework switch filter
---
v4: rebase patches to solve merge conflict;
fix patch 2/5 doc typo;
v3: rebase patches to solve merge conflict;
redefine inpustet bit field;
v2: modify codes according to the comments;
update doc and release note;
add a separate code clean patch;
---
doc/guides/nics/ice.rst | 19 +
doc/guides/rel_notes/release_19_11.rst | 3 +
drivers/net/ice/ice_ethdev.c | 30 +-
drivers/net/ice/ice_ethdev.h | 16 +-
drivers/net/ice/ice_generic_flow.c | 2072 +++++++++++++++++++++++++-------
drivers/net/ice/ice_generic_flow.h | 1042 +++++++---------
drivers/net/ice/ice_switch_filter.c | 927 ++++++++++++--
drivers/net/ice/ice_switch_filter.h | 24 -
8 files changed, 2953 insertions(+), 1180 deletions(-)
delete mode 100644 drivers/net/ice/ice_switch_filter.hSignature · 1 line
2.15.1
PATCH v4 1/5 net/ice: minor code clean
The patch removes redundant code and cleans up some wrong indentations.
--- drivers/net/ice/ice_generic_flow.c | 39 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 20 deletions(-)
drivers/net/ice/ice_generic_flow.c +19 -20
@@ -44,21 +44,21 @@ const struct rte_flow_ops ice_flow_ops = {static int ice_flow_valid_attr (const struct rte_flow_attr *attr, -struct rte_flow_error *error) +struct rte_flow_error *error) {/* Must be input direction */ if (!attr->ingress) {rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ATTR_INGRESS , - attr,"Only support ingress." ); +RTE_FLOW_ERROR_TYPE_ATTR_INGRESS , + attr,"Only support ingress." );return -rte_errno; }/* Not supported */ if (attr->egress) {rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ATTR_EGRESS , - attr,"Not support egress." ); +RTE_FLOW_ERROR_TYPE_ATTR_EGRESS , + attr,"Not support egress." );return -rte_errno; }
@@ -73,8 +73,8 @@ ice_flow_valid_attr(const struct rte_flow_attr *attr,/* Not supported */ if (attr->group) {rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ATTR_GROUP , - attr,"Not support group." ); +RTE_FLOW_ERROR_TYPE_ATTR_GROUP , + attr,"Not support group." );return -rte_errno; }
@@ -102,7 +102,7 @@ ice_find_first_item(const struct rte_flow_item *item, bool is_void)/* Skip all VOID items of the pattern */ static void ice_pattern_skip_void_item (struct rte_flow_item *items, -const struct rte_flow_item *pattern) +const struct rte_flow_item *pattern) {uint32_t cpy_count =0 ;const struct rte_flow_item *pb = pattern, *pe = pattern;
@@ -124,7 +124,6 @@ ice_pattern_skip_void_item(struct rte_flow_item *items, items += cpy_count;if (pe->type ==RTE_FLOW_ITEM_TYPE_END ) { - pb = pe;break ; }
@@ -560,10 +559,10 @@ static int ice_flow_valid_action(struct rte_eth_dev *dev,static int ice_flow_validate (struct rte_eth_dev *dev, -const struct rte_flow_attr *attr, -const struct rte_flow_item pattern[], -const struct rte_flow_action actions[], -struct rte_flow_error *error) +const struct rte_flow_attr *attr, +const struct rte_flow_item pattern[], +const struct rte_flow_action actions[], +struct rte_flow_error *error) {uint64_t inset =0 ;int ret =ICE_ERR_NOT_SUPPORTED ;
@@ -609,10 +608,10 @@ ice_flow_validate(struct rte_eth_dev *dev,static struct rte_flow *ice_flow_create (struct rte_eth_dev *dev, -const struct rte_flow_attr *attr, -const struct rte_flow_item pattern[], -const struct rte_flow_action actions[], -struct rte_flow_error *error) +const struct rte_flow_attr *attr, +const struct rte_flow_item pattern[], +const struct rte_flow_action actions[], +struct rte_flow_error *error) {struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private);struct rte_flow *flow =NULL ;
@@ -647,8 +646,8 @@ ice_flow_create(struct rte_eth_dev *dev,static int ice_flow_destroy (struct rte_eth_dev *dev, -struct rte_flow *flow, -struct rte_flow_error *error) +struct rte_flow *flow, +struct rte_flow_error *error) {struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private);int ret =0 ;
@@ -669,7 +668,7 @@ ice_flow_destroy(struct rte_eth_dev *dev,static int ice_flow_flush (struct rte_eth_dev *dev, -struct rte_flow_error *error) +struct rte_flow_error *error) {struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private);struct rte_flow *p_flow;
Signature · 1 line
2.15.1
v5 cover rework for ice generic flow framework and switch filter
patch 1/5 minor code clean
patch 2/5 adds devargs to control pipeline mode patch 3/5 rework for ice generic flow framework patch 4/5 add rte_flow pattern list patch 5/5 rework switch filter on new framework
Qiming Yang (1):
net/ice: add devargs to control pipeline mode
Ying Wang (3):
net/ice: minor code clean
net/ice: rework for generic flow enabling net/ice: add pattern manifest
wei zhao (1):
net/ice: rework switch filter
---
v5: rebase patches to solve merge conflict;
v4: rebase patches to solve merge conflict;
fix patch 2/5 doc typo;
v3: rebase patches to solve merge conflict;
redefine inpustet bit field;
v2: modify codes according to the comments;
update doc and release note;
add a separate code clean patch;
---
doc/guides/nics/ice.rst | 19 +
doc/guides/rel_notes/release_19_11.rst | 3 +
drivers/net/ice/ice_ethdev.c | 30 +-
drivers/net/ice/ice_ethdev.h | 16 +-
drivers/net/ice/ice_generic_flow.c | 2072 +++++++++++++++++++++++++-------
drivers/net/ice/ice_generic_flow.h | 1042 +++++++---------
drivers/net/ice/ice_switch_filter.c | 927 ++++++++++++--
drivers/net/ice/ice_switch_filter.h | 24 -
8 files changed, 2953 insertions(+), 1180 deletions(-)
delete mode 100644 drivers/net/ice/ice_switch_filter.hSignature · 1 line
2.15.1
PATCH v5 1/5 net/ice: minor code clean
The patch removes redundant code and cleans up some wrong indentations.
--- drivers/net/ice/ice_generic_flow.c | 39 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 20 deletions(-)
drivers/net/ice/ice_generic_flow.c +19 -20
@@ -44,21 +44,21 @@ const struct rte_flow_ops ice_flow_ops = {static int ice_flow_valid_attr (const struct rte_flow_attr *attr, -struct rte_flow_error *error) +struct rte_flow_error *error) {/* Must be input direction */ if (!attr->ingress) {rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ATTR_INGRESS , - attr,"Only support ingress." ); +RTE_FLOW_ERROR_TYPE_ATTR_INGRESS , + attr,"Only support ingress." );return -rte_errno; }/* Not supported */ if (attr->egress) {rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ATTR_EGRESS , - attr,"Not support egress." ); +RTE_FLOW_ERROR_TYPE_ATTR_EGRESS , + attr,"Not support egress." );return -rte_errno; }
@@ -73,8 +73,8 @@ ice_flow_valid_attr(const struct rte_flow_attr *attr,/* Not supported */ if (attr->group) {rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ATTR_GROUP , - attr,"Not support group." ); +RTE_FLOW_ERROR_TYPE_ATTR_GROUP , + attr,"Not support group." );return -rte_errno; }
@@ -102,7 +102,7 @@ ice_find_first_item(const struct rte_flow_item *item, bool is_void)/* Skip all VOID items of the pattern */ static void ice_pattern_skip_void_item (struct rte_flow_item *items, -const struct rte_flow_item *pattern) +const struct rte_flow_item *pattern) {uint32_t cpy_count =0 ;const struct rte_flow_item *pb = pattern, *pe = pattern;
@@ -124,7 +124,6 @@ ice_pattern_skip_void_item(struct rte_flow_item *items, items += cpy_count;if (pe->type ==RTE_FLOW_ITEM_TYPE_END ) { - pb = pe;break ; }
@@ -560,10 +559,10 @@ static int ice_flow_valid_action(struct rte_eth_dev *dev,static int ice_flow_validate (struct rte_eth_dev *dev, -const struct rte_flow_attr *attr, -const struct rte_flow_item pattern[], -const struct rte_flow_action actions[], -struct rte_flow_error *error) +const struct rte_flow_attr *attr, +const struct rte_flow_item pattern[], +const struct rte_flow_action actions[], +struct rte_flow_error *error) {uint64_t inset =0 ;int ret =ICE_ERR_NOT_SUPPORTED ;
@@ -609,10 +608,10 @@ ice_flow_validate(struct rte_eth_dev *dev,static struct rte_flow *ice_flow_create (struct rte_eth_dev *dev, -const struct rte_flow_attr *attr, -const struct rte_flow_item pattern[], -const struct rte_flow_action actions[], -struct rte_flow_error *error) +const struct rte_flow_attr *attr, +const struct rte_flow_item pattern[], +const struct rte_flow_action actions[], +struct rte_flow_error *error) {struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private);struct rte_flow *flow =NULL ;
@@ -647,8 +646,8 @@ ice_flow_create(struct rte_eth_dev *dev,static int ice_flow_destroy (struct rte_eth_dev *dev, -struct rte_flow *flow, -struct rte_flow_error *error) +struct rte_flow *flow, +struct rte_flow_error *error) {struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private);int ret =0 ;
@@ -669,7 +668,7 @@ ice_flow_destroy(struct rte_eth_dev *dev,static int ice_flow_flush (struct rte_eth_dev *dev, -struct rte_flow_error *error) +struct rte_flow_error *error) {struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private);struct rte_flow *p_flow;
Signature · 1 line
2.15.1
PATCH v5 2/5 net/ice: add devargs to control pipeline mode
In reply to Ying WangFrom: Qiming Yang <[email protected]>
Added a devarg to control the mode in generic flow API. We use none-pipeline mode by default.
--- doc/guides/nics/ice.rst | 19 +++++++++++++++++++ doc/guides/rel_notes/release_19_11.rst | 2 ++ drivers/net/ice/ice_ethdev.c | 10 +++++++++- drivers/net/ice/ice_ethdev.h | 1 + 4 files changed, 31 insertions(+), 1 deletion(-)
doc/guides/nics/ice.rst +19 -0
@@ -61,6 +61,25 @@ Runtime Config Options NOTE: In Safe mode, only very limited features are available, features like RSS, checksum, fdir, tunneling ... are all disabled. +- ``Generic Flow Pipeline Mode Support`` (default ``0``) + + In pipeline mode, a flow can be set at one specific stage by setting parameter + ``priority``. Currently, we support two stages: priority = 0 or !0. Flows with + priority 0 located at the first pipeline stage which typically be used as a firewall + to drop the packet on a blacklist(we called it permission stage). At this stage, + flow rules are created for the device's exact match engine: switch. Flows with priority + !0 located at the second stage, typically packets are classified here and be steered to + specific queue or queue group (we called it distribution stage), At this stage, flow + rules are created for device's flow director engine. + For none-pipeline mode, ``priority`` is ignored, a flow rule can be created as a flow director + rule or a switch rule depends on its pattern/action and the resource allocation situation, + all flows are virtually at the same pipeline stage. + By default, generic flow API is enabled in none-pipeline mode, user can choose to + use pipeline mode by setting ``devargs`` parameter ``pipeline-mode-support``, + for example:: + + -w 80:00.0,pipeline-mode-support=1 + - ``Protocol extraction for per queue`` Configure the RX queues to do protocol extraction into ``rte_mbuf::udata64``
doc/guides/rel_notes/release_19_11.rst +2 -0
@@ -100,6 +100,8 @@ New Features * Added support for handling Receive Flex Descriptor. * Added support for protocol extraction on per Rx queue. * Added support for the ``RTE_ETH_DEV_CLOSE_REMOVE`` flag. + * Generic filter enhancement + - Supported pipeline mode. * **Updated the enic driver.**
drivers/net/ice/ice_ethdev.c +9 -1
@@ -19,10 +19,12 @@/* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support" +#define ICE_PIPELINE_MODE_SUPPORT_ARG "pipeline-mode-support"#define ICE_PROTO_XTR_ARG "proto_xtr"static const char *const ice_valid_args[] = {ICE_SAFE_MODE_SUPPORT_ARG , +ICE_PIPELINE_MODE_SUPPORT_ARG ,ICE_PROTO_XTR_ARG ,NULL };
@@ -1833,6 +1835,11 @@ static int ice_parse_devargs(struct rte_eth_dev *dev) ret =rte_kvargs_process (kvlist,ICE_SAFE_MODE_SUPPORT_ARG , &parse_bool, &ad->devargs.safe_mode_support); +if (ret) + goto bail; + + ret =rte_kvargs_process (kvlist,ICE_PIPELINE_MODE_SUPPORT_ARG , + &parse_bool, &ad->devargs.pipe_mode_support); bail:rte_kvargs_free (kvlist);
@@ -4298,7 +4305,8 @@ RTE_PMD_REGISTER_PCI_TABLE(net_ice, pci_id_ice_map);RTE_PMD_REGISTER_KMOD_DEP (net_ice,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (net_ice,ICE_PROTO_XTR_ARG "=[queue:]<vlan|ipv4|ipv6|ipv6_flow|tcp>" -ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>" ); +ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>" +ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>" );RTE_INIT (ice_init_log) {
drivers/net/ice/ice_ethdev.h +1 -0
@@ -289,6 +289,7 @@ struct ice_pf {struct ice_devargs {int safe_mode_support;uint8_t proto_xtr_dflt; +int pipe_mode_support;uint8_t proto_xtr[ICE_MAX_QUEUE_NUM ]; };
Signature · 1 line
2.15.1
PATCH v5 3/5 net/ice: rework for generic flow enabling
In reply to Ying WangThe patch reworks the generic flow API (rte_flow) implementation. It introduces an abstract layer which provides a unified interface for low-level filter engine (switch, fdir, hash) to register supported patterns and actions and implement flow validate/create/destroy/flush/ query activities.
The patch also removes the existing switch filter implementation to avoid compile error. Switch filter implementation for the new framework will be added in the following patch.
--- drivers/net/ice/ice_ethdev.c | 20 +- drivers/net/ice/ice_ethdev.h | 15 +- drivers/net/ice/ice_generic_flow.c | 746 ++++++++++++++---------------- drivers/net/ice/ice_generic_flow.h | 885 +++++++++++------------------------- drivers/net/ice/ice_switch_filter.c | 512 --------------------- drivers/net/ice/ice_switch_filter.h | 20 - 6 files changed, 633 insertions(+), 1565 deletions(-)
drivers/net/ice/ice_ethdev.c +10 -10
@@ -15,7 +15,7 @@#include "base/ice_dcb.h" #include "ice_ethdev.h" #include "ice_rxtx.h" -#include "ice_switch_filter.h" +#include "ice_generic_flow.h" /* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support"
@@ -2009,7 +2009,11 @@ ice_dev_init(struct rte_eth_dev *dev)/* get base queue pairs index in the device */ ice_base_queue_get (pf); -TAILQ_INIT (&pf->flow_list); + ret =ice_flow_init (ad); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to initialize flow" ); +return ret; + }return 0 ;
@@ -2131,7 +2135,8 @@ ice_dev_close(struct rte_eth_dev *dev)struct ice_hw *hw =ICE_DEV_PRIVATE_TO_HW (dev->data->dev_private);struct rte_pci_device *pci_dev =RTE_ETH_DEV_TO_PCI (dev);struct rte_intr_handle *intr_handle = &pci_dev->intr_handle; -struct rte_flow *p_flow; +struct ice_adapter *ad = +ICE_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private);/* Since stop will make link down, then the link event will be * triggered, disable the irq firstly to avoid the port_infoe etc
@@ -2142,6 +2147,8 @@ ice_dev_close(struct rte_eth_dev *dev)ice_dev_stop (dev); +ice_flow_uninit (ad); +/* release all queue resource */ ice_free_queues (dev);
@@ -2167,13 +2174,6 @@ ice_dev_close(struct rte_eth_dev *dev)/* unregister callback func from eal lib */ rte_intr_callback_unregister (intr_handle, ice_interrupt_handler, dev); - -/* Remove all flows */ -while ((p_flow =TAILQ_FIRST (&pf->flow_list))) { -TAILQ_REMOVE (&pf->flow_list, p_flow, node); -ice_free_switch_filter_rule (p_flow->rule); -rte_free (p_flow); - } } static int
drivers/net/ice/ice_ethdev.h +7 -8
@@ -241,16 +241,12 @@ struct ice_vsi {bool offset_loaded; }; -extern const struct rte_flow_ops ice_flow_ops; - -/* Struct to store flow created. */ -struct rte_flow { -TAILQ_ENTRY (rte_flow) node; -void *rule; -}; - +struct rte_flow ;TAILQ_HEAD (ice_flow_list, rte_flow); +struct ice_flow_parser_node ; +TAILQ_HEAD (ice_parser_list, ice_flow_parser_node); +struct ice_pf {struct ice_adapter *adapter;/* The adapter this PF associate to */ struct ice_vsi *main_vsi;/* pointer to main VSI structure */
@@ -279,6 +275,9 @@ struct ice_pf {bool offset_loaded;bool adapter_stopped;struct ice_flow_list flow_list; +struct ice_parser_list rss_parser_list; +struct ice_parser_list perm_parser_list; +struct ice_parser_list dist_parser_list; };#define ICE_MAX_QUEUE_NUM 2048
drivers/net/ice/ice_generic_flow.c +342 -404
870 lines not on this page · raw message
drivers/net/ice/ice_generic_flow.h +274 -611
889 lines not on this page · raw message
drivers/net/ice/ice_switch_filter.c +0 -512
515 lines not on this page · raw message
drivers/net/ice/ice_switch_filter.h +0 -20
@@ -2,23 +2,3 @@* Copyright(c) 2019 Intel Corporation */ -#ifndef _ICE_SWITCH_FILTER_H_ -#define _ICE_SWITCH_FILTER_H_ - -#include "base/ice_switch.h" -#include "base/ice_type.h" -#include "ice_ethdev.h" - -int -ice_create_switch_filter (struct ice_pf *pf, -const struct rte_flow_item pattern[], -const struct rte_flow_action actions[], -struct rte_flow *flow, -struct rte_flow_error *error); -int -ice_destroy_switch_filter (struct ice_pf *pf, -struct rte_flow *flow, -struct rte_flow_error *error); -void -ice_free_switch_filter_rule (void *rule); -#endif /* _ICE_SWITCH_FILTER_H_ */
Signature · 1 line
2.15.1
PATCH v5 4/5 net/ice: add pattern manifest
In reply to Ying WangThe patch adds a manifest for all patterns which can be selected by low level filter engine to compose their supported list.
--- drivers/net/ice/ice_generic_flow.c | 1287 ++++++++++++++++++++++++++++++++++++ drivers/net/ice/ice_generic_flow.h | 201 ++++++ 2 files changed, 1488 insertions(+)
drivers/net/ice/ice_generic_flow.c +1287 -0
@@ -60,6 +60,1293 @@ const struct rte_flow_ops ice_flow_ops = { .query = ice_flow_query, }; +/* empty */ +enum rte_flow_item_type pattern_empty[] = { +RTE_FLOW_ITEM_TYPE_END , +}; + +/* L2 */ +enum rte_flow_item_type pattern_ethertype[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_ethertype_vlan[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_ethertype_qinq[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* ARP */ +enum rte_flow_item_type pattern_eth_arp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_ARP_ETH_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* non-tunnel IPv4 */ +enum rte_flow_item_type pattern_eth_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* non-tunnel IPv6 */ +enum rte_flow_item_type pattern_eth_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 VXLAN IPv4 */ +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 VXLAN MAC IPv4 */ +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 VXLAN IPv4 */ +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 VXLAN MAC IPv4 */ +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 VXLAN IPv6 */ +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 VXLAN MAC IPv6 */ +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 VXLAN IPv6 */ +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 VXLAN MAC IPv6 */ +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 NVGRE IPv4 */ +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 NVGRE MAC IPv4 */ +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 NVGRE IPv4 */ +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 NVGRE MAC IPv4 */ +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 NVGRE IPv6 */ +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 NVGRE MAC IPv6 */ +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 NVGRE IPv6 */ +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 NVGRE MAC IPv6 */ +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* GTPU */ +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[] = { +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_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_udp[] = { +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_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_tcp[] = { +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_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , + +}; +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_icmp[] = { +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_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* PPPoE */ +enum rte_flow_item_type pattern_eth_pppoed[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOED , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoed[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOED , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoed[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOED , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; +void ice_register_flow_engine (struct ice_flow_engine *engine) {
drivers/net/ice/ice_generic_flow.h +201 -0
207 lines not on this page · raw message
Signature · 1 line
2.15.1
PATCH v5 5/5 net/ice: rework switch filter
In reply to Ying WangFrom: wei zhao <[email protected]>
The patch reworks packet process engine's binary classifier (switch) for the new framework. It also adds support for new packet type like PPPoE for switch filter.
--- doc/guides/rel_notes/release_19_11.rst | 1 + drivers/net/ice/ice_switch_filter.c | 1191 ++++++++++++++++++++++++++++++++ drivers/net/ice/ice_switch_filter.h | 4 - 3 files changed, 1192 insertions(+), 4 deletions(-) delete mode 100644 drivers/net/ice/ice_switch_filter.h
doc/guides/rel_notes/release_19_11.rst +1 -0
@@ -102,6 +102,7 @@ New Features * Added support for the ``RTE_ETH_DEV_CLOSE_REMOVE`` flag. * Generic filter enhancement - Supported pipeline mode. + - Supported new packet type like PPPoE for switch filter. * **Updated the enic driver.**
drivers/net/ice/ice_switch_filter.c +1191 -0
1,194 lines not on this page · raw message
drivers/net/ice/ice_switch_filter.h deleted +0 -4
@@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2019 Intel Corporation -*/ -
Signature · 1 line
2.15.1
Quoted 39 lines · Ying Wang
patch 1/5 minor code clean
patch 2/5 adds devargs to control pipeline mode patch 3/5 rework for ice generic flow framework patch 4/5 addrte_flowpattern list
patch 5/5 rework switch filter on new frameworkQiming Yang (1):
net/ice: add devargs to control pipeline modeYing Wang (3):
net/ice: minor code clean
net/ice: rework for generic flow enabling net/ice: add pattern manifestwei zhao (1):
net/ice: rework switch filter---
v5: rebase patches to solve merge conflict;v4: rebase patches to solve merge conflict;
fix patch 2/5 doc typo;v3: rebase patches to solve merge conflict;
redefine inpustet bit field;v2: modify codes according to the comments;
update doc and release note;
add a separate code clean patch;
---doc/guides/nics/ice.rst | 19 + doc/guides/rel_notes/release_19_11.rst | 3 + drivers/net/ice/ice_ethdev.c | 30 +- drivers/net/ice/ice_ethdev.h | 16 +- drivers/net/ice/ice_generic_flow.c | 2072 +++++++++++++++++++++++++------- drivers/net/ice/ice_generic_flow.h | 1042 +++++++--------- drivers/net/ice/ice_switch_filter.c | 927 ++++++++++++-- drivers/net/ice/ice_switch_filter.h | 24 - 8 files changed, 2953 insertions(+), 1180 deletions(-)
Quoted 5 lines
delete mode 100644
drivers/net/ice/ice_switch_filter.hSignature · 1 line
2.15.1
Series applied to dpdk-next-net-intel.
PATCH v4 2/5 net/ice: add devargs to control pipeline mode
In reply to Ying WangFrom: Qiming Yang <[email protected]>
Added a devarg to control the mode in generic flow API. We use none-pipeline mode by default.
--- doc/guides/nics/ice.rst | 19 +++++++++++++++++++ doc/guides/rel_notes/release_19_11.rst | 2 ++ drivers/net/ice/ice_ethdev.c | 10 +++++++++- drivers/net/ice/ice_ethdev.h | 1 + 4 files changed, 31 insertions(+), 1 deletion(-)
doc/guides/nics/ice.rst +19 -0
@@ -61,6 +61,25 @@ Runtime Config Options NOTE: In Safe mode, only very limited features are available, features like RSS, checksum, fdir, tunneling ... are all disabled. +- ``Generic Flow Pipeline Mode Support`` (default ``0``) + + In pipeline mode, a flow can be set at one specific stage by setting parameter + ``priority``. Currently, we support two stages: priority = 0 or !0. Flows with + priority 0 located at the first pipeline stage which typically be used as a firewall + to drop the packet on a blacklist(we called it permission stage). At this stage, + flow rules are created for the device's exact match engine: switch. Flows with priority + !0 located at the second stage, typically packets are classified here and be steered to + specific queue or queue group (we called it distribution stage), At this stage, flow + rules are created for device's flow director engine. + For none-pipeline mode, ``priority`` is ignored, a flow rule can be created as a flow director + rule or a switch rule depends on its pattern/action and the resource allocation situation, + all flows are virtually at the same pipeline stage. + By default, generic flow API is enabled in none-pipeline mode, user can choose to + use pipeline mode by setting ``devargs`` parameter ``pipeline-mode-support``, + for example:: + + -w 80:00.0,pipeline-mode-support=1 + - ``Protocol extraction for per queue`` Configure the RX queues to do protocol extraction into ``rte_mbuf::udata64``
doc/guides/rel_notes/release_19_11.rst +2 -0
@@ -94,6 +94,8 @@ New Features * Added support for handling Receive Flex Descriptor. * Added support for protocol extraction on per Rx queue. * Added support for the ``RTE_ETH_DEV_CLOSE_REMOVE`` flag. + * Generic filter enhancement + - Supported pipeline mode. * **Updated the enic driver.**
drivers/net/ice/ice_ethdev.c +9 -1
@@ -19,10 +19,12 @@/* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support" +#define ICE_PIPELINE_MODE_SUPPORT_ARG "pipeline-mode-support"#define ICE_PROTO_XTR_ARG "proto_xtr"static const char *const ice_valid_args[] = {ICE_SAFE_MODE_SUPPORT_ARG , +ICE_PIPELINE_MODE_SUPPORT_ARG ,ICE_PROTO_XTR_ARG ,NULL };
@@ -1815,6 +1817,11 @@ static int ice_parse_devargs(struct rte_eth_dev *dev) ret =rte_kvargs_process (kvlist,ICE_SAFE_MODE_SUPPORT_ARG , &parse_bool, &ad->devargs.safe_mode_support); +if (ret) + goto bail; + + ret =rte_kvargs_process (kvlist,ICE_PIPELINE_MODE_SUPPORT_ARG , + &parse_bool, &ad->devargs.pipe_mode_support); bail:rte_kvargs_free (kvlist);
@@ -4278,7 +4285,8 @@ RTE_PMD_REGISTER_PCI_TABLE(net_ice, pci_id_ice_map);RTE_PMD_REGISTER_KMOD_DEP (net_ice,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (net_ice,ICE_PROTO_XTR_ARG "=[queue:]<vlan|ipv4|ipv6|ipv6_flow|tcp>" -ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>" ); +ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>" +ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>" );RTE_INIT (ice_init_log) {
drivers/net/ice/ice_ethdev.h +1 -0
@@ -288,6 +288,7 @@ struct ice_pf {*/ struct ice_devargs {int safe_mode_support; +int pipe_mode_support;uint8_t proto_xtr[ICE_MAX_QUEUE_NUM ]; };
Signature · 1 line
2.15.1
PATCH v4 3/5 net/ice: rework for generic flow enabling
In reply to Ying WangThe patch reworks the generic flow API (rte_flow) implementation. It introduces an abstract layer which provides a unified interface for low-level filter engine (switch, fdir, hash) to register supported patterns and actions and implement flow validate/create/destroy/flush/ query activities.
The patch also removes the existing switch filter implementation to avoid compile error. Switch filter implementation for the new framework will be added in the following patch.
--- drivers/net/ice/ice_ethdev.c | 20 +- drivers/net/ice/ice_ethdev.h | 15 +- drivers/net/ice/ice_generic_flow.c | 746 ++++++++++++++---------------- drivers/net/ice/ice_generic_flow.h | 885 +++++++++++------------------------- drivers/net/ice/ice_switch_filter.c | 512 --------------------- drivers/net/ice/ice_switch_filter.h | 20 - 6 files changed, 633 insertions(+), 1565 deletions(-)
drivers/net/ice/ice_ethdev.c +10 -10
@@ -15,7 +15,7 @@#include "base/ice_dcb.h" #include "ice_ethdev.h" #include "ice_rxtx.h" -#include "ice_switch_filter.h" +#include "ice_generic_flow.h" /* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support"
@@ -1991,7 +1991,11 @@ ice_dev_init(struct rte_eth_dev *dev)/* get base queue pairs index in the device */ ice_base_queue_get (pf); -TAILQ_INIT (&pf->flow_list); + ret =ice_flow_init (ad); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to initialize flow" ); +return ret; + }return 0 ;
@@ -2113,7 +2117,8 @@ ice_dev_close(struct rte_eth_dev *dev)struct ice_hw *hw =ICE_DEV_PRIVATE_TO_HW (dev->data->dev_private);struct rte_pci_device *pci_dev =RTE_ETH_DEV_TO_PCI (dev);struct rte_intr_handle *intr_handle = &pci_dev->intr_handle; -struct rte_flow *p_flow; +struct ice_adapter *ad = +ICE_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private);/* Since stop will make link down, then the link event will be * triggered, disable the irq firstly to avoid the port_infoe etc
@@ -2124,6 +2129,8 @@ ice_dev_close(struct rte_eth_dev *dev)ice_dev_stop (dev); +ice_flow_uninit (ad); +/* release all queue resource */ ice_free_queues (dev);
@@ -2147,13 +2154,6 @@ ice_dev_close(struct rte_eth_dev *dev)/* unregister callback func from eal lib */ rte_intr_callback_unregister (intr_handle, ice_interrupt_handler, dev); - -/* Remove all flows */ -while ((p_flow =TAILQ_FIRST (&pf->flow_list))) { -TAILQ_REMOVE (&pf->flow_list, p_flow, node); -ice_free_switch_filter_rule (p_flow->rule); -rte_free (p_flow); - } } static int
drivers/net/ice/ice_ethdev.h +7 -8
@@ -241,16 +241,12 @@ struct ice_vsi {bool offset_loaded; }; -extern const struct rte_flow_ops ice_flow_ops; - -/* Struct to store flow created. */ -struct rte_flow { -TAILQ_ENTRY (rte_flow) node; -void *rule; -}; - +struct rte_flow ;TAILQ_HEAD (ice_flow_list, rte_flow); +struct ice_flow_parser_node ; +TAILQ_HEAD (ice_parser_list, ice_flow_parser_node); +struct ice_pf {struct ice_adapter *adapter;/* The adapter this PF associate to */ struct ice_vsi *main_vsi;/* pointer to main VSI structure */
@@ -279,6 +275,9 @@ struct ice_pf {bool offset_loaded;bool adapter_stopped;struct ice_flow_list flow_list; +struct ice_parser_list rss_parser_list; +struct ice_parser_list perm_parser_list; +struct ice_parser_list dist_parser_list; };#define ICE_MAX_QUEUE_NUM 2048
drivers/net/ice/ice_generic_flow.c +342 -404
870 lines not on this page · raw message
drivers/net/ice/ice_generic_flow.h +274 -611
889 lines not on this page · raw message
drivers/net/ice/ice_switch_filter.c +0 -512
515 lines not on this page · raw message
drivers/net/ice/ice_switch_filter.h +0 -20
@@ -2,23 +2,3 @@* Copyright(c) 2019 Intel Corporation */ -#ifndef _ICE_SWITCH_FILTER_H_ -#define _ICE_SWITCH_FILTER_H_ - -#include "base/ice_switch.h" -#include "base/ice_type.h" -#include "ice_ethdev.h" - -int -ice_create_switch_filter (struct ice_pf *pf, -const struct rte_flow_item pattern[], -const struct rte_flow_action actions[], -struct rte_flow *flow, -struct rte_flow_error *error); -int -ice_destroy_switch_filter (struct ice_pf *pf, -struct rte_flow *flow, -struct rte_flow_error *error); -void -ice_free_switch_filter_rule (void *rule); -#endif /* _ICE_SWITCH_FILTER_H_ */
Signature · 1 line
2.15.1
PATCH v4 4/5 net/ice: add pattern manifest
In reply to Ying WangThe patch adds a manifest for all patterns which can be selected by low level filter engine to compose their supported list.
--- drivers/net/ice/ice_generic_flow.c | 1287 ++++++++++++++++++++++++++++++++++++ drivers/net/ice/ice_generic_flow.h | 201 ++++++ 2 files changed, 1488 insertions(+)
drivers/net/ice/ice_generic_flow.c +1287 -0
@@ -60,6 +60,1293 @@ const struct rte_flow_ops ice_flow_ops = { .query = ice_flow_query, }; +/* empty */ +enum rte_flow_item_type pattern_empty[] = { +RTE_FLOW_ITEM_TYPE_END , +}; + +/* L2 */ +enum rte_flow_item_type pattern_ethertype[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_ethertype_vlan[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_ethertype_qinq[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* ARP */ +enum rte_flow_item_type pattern_eth_arp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_ARP_ETH_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* non-tunnel IPv4 */ +enum rte_flow_item_type pattern_eth_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* non-tunnel IPv6 */ +enum rte_flow_item_type pattern_eth_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 VXLAN IPv4 */ +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 VXLAN MAC IPv4 */ +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 VXLAN IPv4 */ +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 VXLAN MAC IPv4 */ +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 VXLAN IPv6 */ +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 VXLAN MAC IPv6 */ +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 VXLAN IPv6 */ +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 VXLAN MAC IPv6 */ +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 NVGRE IPv4 */ +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 NVGRE MAC IPv4 */ +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 NVGRE IPv4 */ +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 NVGRE MAC IPv4 */ +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 NVGRE IPv6 */ +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 NVGRE MAC IPv6 */ +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 NVGRE IPv6 */ +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 NVGRE MAC IPv6 */ +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* GTPU */ +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[] = { +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_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_udp[] = { +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_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_tcp[] = { +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_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , + +}; +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_icmp[] = { +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_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* PPPoE */ +enum rte_flow_item_type pattern_eth_pppoed[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOED , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoed[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOED , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoed[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOED , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; +void ice_register_flow_engine (struct ice_flow_engine *engine) {
drivers/net/ice/ice_generic_flow.h +201 -0
207 lines not on this page · raw message
Signature · 1 line
2.15.1
PATCH v4 5/5 net/ice: rework switch filter
In reply to Ying WangFrom: wei zhao <[email protected]>
The patch reworks packet process engine's binary classifier (switch) for the new framework. It also adds support for new packet type like PPPoE for switch filter.
--- doc/guides/rel_notes/release_19_11.rst | 1 + drivers/net/ice/ice_switch_filter.c | 1191 ++++++++++++++++++++++++++++++++ drivers/net/ice/ice_switch_filter.h | 4 - 3 files changed, 1192 insertions(+), 4 deletions(-) delete mode 100644 drivers/net/ice/ice_switch_filter.h
doc/guides/rel_notes/release_19_11.rst +1 -0
@@ -96,6 +96,7 @@ New Features * Added support for the ``RTE_ETH_DEV_CLOSE_REMOVE`` flag. * Generic filter enhancement - Supported pipeline mode. + - Supported new packet type like PPPoE for switch filter. * **Updated the enic driver.**
drivers/net/ice/ice_switch_filter.c +1191 -0
1,194 lines not on this page · raw message
drivers/net/ice/ice_switch_filter.h deleted +0 -4
@@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2019 Intel Corporation -*/ -
Signature · 1 line
2.15.1
Re: [dpdk-dev] [PATCH v4 5/5] net/ice: rework switch filter
Hi,
Could you check below warning in patchwork?
http://mails.dpdk.org/archives/test-report/2019-October/102523.html
Thanks,
Xiaolong
Quoted 1,239 lines · Ying Wang
From: wei zhao <[email protected]>
The patch reworks packet process engine's binary classifier (switch) for the new framework. It also adds support for new packet type like PPPoE for switch filter.
Signed-off-by Wei Zhao <[email protected]>Acked-by Qi Zhang <[email protected]>---
doc/guides/rel_notes/release_19_11.rst | 1 + drivers/net/ice/ice_switch_filter.c | 1191 ++++++++++++++++++++++++++++++++ drivers/net/ice/ice_switch_filter.h | 4 - 3 files changed, 1192 insertions(+), 4 deletions(-)delete mode 100644
drivers/net/ice/ice_switch_filter.hdoc/guides/rel_notes/release_19_11.rst +1
-0@@ -96,6 +96,7 @@ New Features * Added support for the ``RTE_ETH_DEV_CLOSE_REMOVE`` flag. * Generic filter enhancement - Supported pipeline mode. + - Supported new packet type like PPPoE for switch filter. * **Updated the enic driver.**drivers/net/ice/ice_switch_filter.c +1191
-0@@ -2,3 +2,1194 @@* Copyright(c) 2019 Intel Corporation */ +#include <sys/queue.h> +#include <stdio.h> +#include <errno.h> +#include <stdint.h> +#include <string.h> +#include <unistd.h> +#include <stdarg.h> +#include <rte_debug.h> +#include <rte_ether.h> +#include <rte_ethdev_driver.h> +#include <rte_log.h> +#include <rte_malloc.h> +#include <rte_eth_ctrl.h> +#include <rte_tailq.h> +#include <rte_flow_driver.h> +#include <rte_flow.h> +#include "base/ice_type.h" +#include "base/ice_switch.h" +#include "base/ice_type.h" +#include "ice_logs.h" +#include "ice_ethdev.h" +#include "ice_generic_flow.h" + + +#define MAX_QGRP_NUM_TYPE 7 + +#define ICE_SW_INSET_ETHER ( \ + ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE) +#define ICE_SW_INSET_MAC_IPV4 ( \ + ICE_INSET_DMAC | ICE_INSET_IPV4_DST | ICE_INSET_IPV4_SRC | \ + ICE_INSET_IPV4_PROTO | ICE_INSET_IPV4_TTL | ICE_INSET_IPV4_TOS) +#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 | \ + ICE_INSET_TCP_DST_PORT | ICE_INSET_TCP_SRC_PORT) +#define ICE_SW_INSET_MAC_IPV4_UDP ( \ + ICE_INSET_DMAC | ICE_INSET_IPV4_DST | ICE_INSET_IPV4_SRC | \ + ICE_INSET_IPV4_TTL | ICE_INSET_IPV4_TOS | \ + ICE_INSET_UDP_DST_PORT | ICE_INSET_UDP_SRC_PORT) +#define ICE_SW_INSET_MAC_IPV6 ( \ + ICE_INSET_DMAC | ICE_INSET_IPV6_DST | ICE_INSET_IPV6_SRC | \ + ICE_INSET_IPV6_TC | ICE_INSET_IPV6_HOP_LIMIT | \ + ICE_INSET_IPV6_NEXT_HDR) +#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 | \ + ICE_INSET_TCP_DST_PORT | ICE_INSET_TCP_SRC_PORT) +#define ICE_SW_INSET_MAC_IPV6_UDP ( \ + ICE_INSET_DMAC | ICE_INSET_IPV6_DST | ICE_INSET_IPV6_SRC | \ + ICE_INSET_IPV6_HOP_LIMIT | ICE_INSET_IPV6_TC | \ + ICE_INSET_UDP_DST_PORT | ICE_INSET_UDP_SRC_PORT) +#define ICE_SW_INSET_DIST_NVGRE_IPV4 ( \ + ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \ + ICE_INSET_TUN_DMAC | ICE_INSET_TUN_NVGRE_TNI | ICE_INSET_IPV4_DST) +#define ICE_SW_INSET_DIST_VXLAN_IPV4 ( \ + ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \ + ICE_INSET_TUN_DMAC | ICE_INSET_TUN_VXLAN_VNI | ICE_INSET_IPV4_DST) +#define ICE_SW_INSET_DIST_NVGRE_IPV4_TCP ( \ + ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \ + ICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT | \ + ICE_INSET_TUN_DMAC | ICE_INSET_TUN_NVGRE_TNI | ICE_INSET_IPV4_DST) +#define ICE_SW_INSET_DIST_NVGRE_IPV4_UDP ( \ + ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \ + ICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT | \ + ICE_INSET_TUN_DMAC | ICE_INSET_TUN_NVGRE_TNI | ICE_INSET_IPV4_DST) +#define ICE_SW_INSET_DIST_VXLAN_IPV4_TCP ( \ + ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \ + ICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT | \ + ICE_INSET_TUN_DMAC | ICE_INSET_TUN_VXLAN_VNI | ICE_INSET_IPV4_DST) +#define ICE_SW_INSET_DIST_VXLAN_IPV4_UDP ( \ + ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \ + ICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT | \ + ICE_INSET_TUN_DMAC | ICE_INSET_TUN_VXLAN_VNI | ICE_INSET_IPV4_DST) +#define ICE_SW_INSET_PERM_TUNNEL_IPV4 ( \ + ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \ + ICE_INSET_TUN_IPV4_PROTO | ICE_INSET_TUN_IPV4_TOS) +#define ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP ( \ + ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \ + ICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT | \ + ICE_INSET_TUN_IPV4_TOS) +#define ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP ( \ + ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \ + ICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT | \ + ICE_INSET_TUN_IPV4_TOS) +#define ICE_SW_INSET_MAC_PPPOE ( \ + ICE_INSET_VLAN_OUTER | ICE_INSET_VLAN_INNER | \ + ICE_INSET_DMAC | ICE_INSET_ETHERTYPE) + +struct sw_meta { +struct ice_adv_lkup_elem *list; +uint16_t lkups_num; +struct ice_adv_rule_info rule_info; +}; + +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_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_pppoed, +ICE_SW_INSET_MAC_PPPOE ,ICE_INSET_NONE }, + {pattern_eth_vlan_pppoed, +ICE_SW_INSET_MAC_PPPOE ,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 }, +}; + +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_perm[] = { + {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_PERM_TUNNEL_IPV4 ,ICE_INSET_NONE }, + {pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp, +ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP ,ICE_INSET_NONE }, + {pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp, +ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP ,ICE_INSET_NONE }, + {pattern_eth_ipv4_nvgre_eth_ipv4, +ICE_SW_INSET_PERM_TUNNEL_IPV4 ,ICE_INSET_NONE }, + {pattern_eth_ipv4_nvgre_eth_ipv4_udp, +ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP ,ICE_INSET_NONE }, + {pattern_eth_ipv4_nvgre_eth_ipv4_tcp, +ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP ,ICE_INSET_NONE }, +}; + +static int +ice_switch_create (struct ice_adapter *ad, +struct rte_flow *flow, +void *meta, +struct rte_flow_error *error) +{ +int ret =0 ; +struct ice_pf *pf = &ad->pf; +struct ice_hw *hw =ICE_PF_TO_HW (pf); +struct ice_rule_query_data rule_added = {0 }; +struct ice_rule_query_data *filter_ptr; +struct ice_adv_lkup_elem *list = + ((struct sw_meta *)meta)->list; +uint16_t lkups_cnt = + ((struct sw_meta *)meta)->lkups_num; +struct ice_adv_rule_info *rule_info = + &((struct sw_meta *)meta)->rule_info; + +if (lkups_cnt >ICE_MAX_CHAIN_WORDS ) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM ,NULL , +"item number too large for rule" ); + goto error; + } +if (!list) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM ,NULL , +"lookup list should not be NULL" ); + goto error; + } + ret =ice_add_adv_rule (hw, list, lkups_cnt, rule_info, &rule_added); +if (!ret) { + filter_ptr =rte_zmalloc ("ice_switch_filter" , +sizeof (struct ice_rule_query_data ),0 ); +if (!filter_ptr) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , +"No memory for ice_switch_filter" ); + goto error; + } + flow->rule = filter_ptr; +rte_memcpy (filter_ptr, + &rule_added, +sizeof (struct ice_rule_query_data )); + }else { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , +"switch filter create flow fail" ); + goto error; + } + +rte_free (list); +rte_free (meta); +return 0 ; + +error: +rte_free (list); +rte_free (meta); + +return -rte_errno; +} + +static int +ice_switch_destroy (struct ice_adapter *ad, +struct rte_flow *flow, +struct rte_flow_error *error) +{ +struct ice_hw *hw = &ad->hw; +int ret; +struct ice_rule_query_data *filter_ptr; + + filter_ptr = (struct ice_rule_query_data *) + flow->rule; + +if (!filter_ptr) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , +"no such flow" +" create by switch filter" ); +return -rte_errno; + } + + ret =ice_rem_adv_rule_by_id (hw, filter_ptr); +if (ret) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , +"fail to destroy switch filter rule" ); +return -rte_errno; + } + +rte_free (filter_ptr); +return ret; +} + +static void +ice_switch_filter_rule_free (struct rte_flow *flow) +{ +rte_free (flow->rule); +} + +static uint64_t +ice_switch_inset_get (const struct rte_flow_item pattern[], +struct rte_flow_error *error, +struct ice_adv_lkup_elem *list, +uint16_t *lkups_num, +enum ice_sw_tunnel_type tun_type) +{ +const struct rte_flow_item *item = pattern; +enum rte_flow_item_type item_type; +const struct rte_flow_item_eth *eth_spec, *eth_mask; +const struct rte_flow_item_ipv4 *ipv4_spec, *ipv4_mask; +const struct rte_flow_item_ipv6 *ipv6_spec, *ipv6_mask; +const struct rte_flow_item_tcp *tcp_spec, *tcp_mask; +const struct rte_flow_item_udp *udp_spec, *udp_mask; +const struct rte_flow_item_sctp *sctp_spec, *sctp_mask; +const struct rte_flow_item_nvgre *nvgre_spec, *nvgre_mask; +const struct rte_flow_item_vxlan *vxlan_spec, *vxlan_mask; +const struct rte_flow_item_vlan *vlan_spec, *vlan_mask; +const struct rte_flow_item_pppoe *pppoe_spec, *pppoe_mask; +uint8_t ipv6_addr_mask[16 ] = { +0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF , +0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF }; +uint64_t input_set =ICE_INSET_NONE ; +uint16_t j, t =0 ; +uint16_t tunnel_valid =0 ; + + +for (item = pattern; item->type != +RTE_FLOW_ITEM_TYPE_END ; item++) { +if (item->last) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"Not support range" ); +return 0 ; + } + item_type = item->type; + +switch (item_type) { +case RTE_FLOW_ITEM_TYPE_ETH : + eth_spec = item->spec; + eth_mask = item->mask; +if (eth_spec && eth_mask) { +if (tunnel_valid && +rte_is_broadcast_ether_addr (ð_mask->src)) + input_set |=ICE_INSET_TUN_SMAC ; +else if ( +rte_is_broadcast_ether_addr (ð_mask->src)) + input_set |=ICE_INSET_SMAC ; +if (tunnel_valid && +rte_is_broadcast_ether_addr (ð_mask->dst)) + input_set |=ICE_INSET_TUN_DMAC ; +else if ( +rte_is_broadcast_ether_addr (ð_mask->dst)) + input_set |=ICE_INSET_DMAC ; +if (eth_mask->type ==RTE_BE16 (0xffff )) + input_set |=ICE_INSET_ETHERTYPE ; + list[t].type = (tunnel_valid ==0 ) ? +ICE_MAC_OFOS :ICE_MAC_IL ; +struct ice_ether_hdr *h; +struct ice_ether_hdr *m; +uint16_t i =0 ; + h = &list[t].h_u.eth_hdr; + m = &list[t].m_u.eth_hdr; +for (j =0 ; j <RTE_ETHER_ADDR_LEN ; j++) { +if (eth_mask->src.addr_bytes[j] == +UINT8_MAX ) { + h->src_addr[j] = + eth_spec->src.addr_bytes[j]; + m->src_addr[j] = + eth_mask->src.addr_bytes[j]; + i =1 ; + } +if (eth_mask->dst.addr_bytes[j] == +UINT8_MAX ) { + h->dst_addr[j] = + eth_spec->dst.addr_bytes[j]; + m->dst_addr[j] = + eth_mask->dst.addr_bytes[j]; + i =1 ; + } + } +if (i) + t++; +if (eth_mask->type ==UINT16_MAX ) { + list[t].type =ICE_ETYPE_OL ; + list[t].h_u.ethertype.ethtype_id = + eth_spec->type; + list[t].m_u.ethertype.ethtype_id = +UINT16_MAX ; + t++; + } + }else if (!eth_spec && !eth_mask) { + list[t].type = (tun_type ==ICE_NON_TUN ) ? +ICE_MAC_OFOS :ICE_MAC_IL ; + } +break ; + +case RTE_FLOW_ITEM_TYPE_IPV4 : + ipv4_spec = item->spec; + ipv4_mask = item->mask; +if (ipv4_spec && ipv4_mask) { +/* Check IPv4 mask and update input set */ +if (ipv4_mask->hdr.version_ihl || + ipv4_mask->hdr.total_length || + ipv4_mask->hdr.packet_id || + ipv4_mask->hdr.hdr_checksum) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"Invalid IPv4 mask." ); +return 0 ; + } + +if (tunnel_valid) { +if (ipv4_mask->hdr.type_of_service == +UINT8_MAX ) + input_set |= +ICE_INSET_TUN_IPV4_TOS ; +if (ipv4_mask->hdr.src_addr == +UINT32_MAX ) + input_set |= +ICE_INSET_TUN_IPV4_SRC ; +if (ipv4_mask->hdr.dst_addr == +UINT32_MAX ) + input_set |= +ICE_INSET_TUN_IPV4_DST ; +if (ipv4_mask->hdr.time_to_live == +UINT8_MAX ) + input_set |= +ICE_INSET_TUN_IPV4_TTL ; +if (ipv4_mask->hdr.next_proto_id == +UINT8_MAX ) + input_set |= +ICE_INSET_TUN_IPV4_PROTO ; + }else { +if (ipv4_mask->hdr.src_addr == +UINT32_MAX ) + input_set |=ICE_INSET_IPV4_SRC ; +if (ipv4_mask->hdr.dst_addr == +UINT32_MAX ) + input_set |=ICE_INSET_IPV4_DST ; +if (ipv4_mask->hdr.time_to_live == +UINT8_MAX ) + input_set |=ICE_INSET_IPV4_TTL ; +if (ipv4_mask->hdr.next_proto_id == +UINT8_MAX ) + input_set |= +ICE_INSET_IPV4_PROTO ; +if (ipv4_mask->hdr.type_of_service == +UINT8_MAX ) + input_set |= +ICE_INSET_IPV4_TOS ; + } + list[t].type = (tunnel_valid ==0 ) ? +ICE_IPV4_OFOS :ICE_IPV4_IL ; +if (ipv4_mask->hdr.src_addr ==UINT32_MAX ) { + list[t].h_u.ipv4_hdr.src_addr = + ipv4_spec->hdr.src_addr; + list[t].m_u.ipv4_hdr.src_addr = +UINT32_MAX ; + } +if (ipv4_mask->hdr.dst_addr ==UINT32_MAX ) { + list[t].h_u.ipv4_hdr.dst_addr = + ipv4_spec->hdr.dst_addr; + list[t].m_u.ipv4_hdr.dst_addr = +UINT32_MAX ; + } +if (ipv4_mask->hdr.time_to_live ==UINT8_MAX ) { + list[t].h_u.ipv4_hdr.time_to_live = + ipv4_spec->hdr.time_to_live; + list[t].m_u.ipv4_hdr.time_to_live = +UINT8_MAX ; + } +if (ipv4_mask->hdr.next_proto_id ==UINT8_MAX ) { + list[t].h_u.ipv4_hdr.protocol = + ipv4_spec->hdr.next_proto_id; + list[t].m_u.ipv4_hdr.protocol = +UINT8_MAX ; + } +if (ipv4_mask->hdr.type_of_service == +UINT8_MAX ) { + list[t].h_u.ipv4_hdr.tos = + ipv4_spec->hdr.type_of_service; + list[t].m_u.ipv4_hdr.tos =UINT8_MAX ; + } + t++; + }else if (!ipv4_spec && !ipv4_mask) { + list[t].type = (tunnel_valid ==0 ) ? +ICE_IPV4_OFOS :ICE_IPV4_IL ; + } +break ; + +case RTE_FLOW_ITEM_TYPE_IPV6 : + ipv6_spec = item->spec; + ipv6_mask = item->mask; +if (ipv6_spec && ipv6_mask) { +if (ipv6_mask->hdr.payload_len) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"Invalid IPv6 mask" ); +return 0 ; + } + +if (tunnel_valid) { +if (!memcmp (ipv6_mask->hdr.src_addr, + ipv6_addr_mask, +RTE_DIM (ipv6_mask->hdr.src_addr))) + input_set |= +ICE_INSET_TUN_IPV6_SRC ; +if (!memcmp (ipv6_mask->hdr.dst_addr, + ipv6_addr_mask, +RTE_DIM (ipv6_mask->hdr.dst_addr))) + input_set |= +ICE_INSET_TUN_IPV6_DST ; +if (ipv6_mask->hdr.proto ==UINT8_MAX ) + input_set |= +ICE_INSET_TUN_IPV6_NEXT_HDR ; +if (ipv6_mask->hdr.hop_limits == +UINT8_MAX ) + input_set |= +ICE_INSET_TUN_IPV6_HOP_LIMIT ; +if ((ipv6_mask->hdr.vtc_flow & +rte_cpu_to_be_32 + (RTE_IPV6_HDR_TC_MASK )) + ==rte_cpu_to_be_32 + (RTE_IPV6_HDR_TC_MASK )) + input_set |= +ICE_INSET_TUN_IPV6_TC ; + }else { +if (!memcmp (ipv6_mask->hdr.src_addr, + ipv6_addr_mask, +RTE_DIM (ipv6_mask->hdr.src_addr))) + input_set |=ICE_INSET_IPV6_SRC ; +if (!memcmp (ipv6_mask->hdr.dst_addr, + ipv6_addr_mask, +RTE_DIM (ipv6_mask->hdr.dst_addr))) + input_set |=ICE_INSET_IPV6_DST ; +if (ipv6_mask->hdr.proto ==UINT8_MAX ) + input_set |= +ICE_INSET_IPV6_NEXT_HDR ; +if (ipv6_mask->hdr.hop_limits == +UINT8_MAX ) + input_set |= +ICE_INSET_IPV6_HOP_LIMIT ; +if ((ipv6_mask->hdr.vtc_flow & +rte_cpu_to_be_32 + (RTE_IPV6_HDR_TC_MASK )) + ==rte_cpu_to_be_32 + (RTE_IPV6_HDR_TC_MASK )) + input_set |=ICE_INSET_IPV6_TC ; + } + list[t].type = (tunnel_valid ==0 ) ? +ICE_IPV6_OFOS :ICE_IPV6_IL ; +struct ice_ipv6_hdr *f; +struct ice_ipv6_hdr *s; + f = &list[t].h_u.ipv6_hdr; + s = &list[t].m_u.ipv6_hdr; +for (j =0 ; j <ICE_IPV6_ADDR_LENGTH ; j++) { +if (ipv6_mask->hdr.src_addr[j] == +UINT8_MAX ) { + f->src_addr[j] = + ipv6_spec->hdr.src_addr[j]; + s->src_addr[j] = + ipv6_mask->hdr.src_addr[j]; + } +if (ipv6_mask->hdr.dst_addr[j] == +UINT8_MAX ) { + f->dst_addr[j] = + ipv6_spec->hdr.dst_addr[j]; + s->dst_addr[j] = + ipv6_mask->hdr.dst_addr[j]; + } + } +if (ipv6_mask->hdr.proto ==UINT8_MAX ) { + f->next_hdr = + ipv6_spec->hdr.proto; + s->next_hdr =UINT8_MAX ; + } +if (ipv6_mask->hdr.hop_limits ==UINT8_MAX ) { + f->hop_limit = + ipv6_spec->hdr.hop_limits; + s->hop_limit =UINT8_MAX ; + } +if ((ipv6_mask->hdr.vtc_flow & +rte_cpu_to_be_32 + (RTE_IPV6_HDR_TC_MASK )) + ==rte_cpu_to_be_32 + (RTE_IPV6_HDR_TC_MASK )) { + f->tc = (rte_be_to_cpu_32 + (ipv6_spec->hdr.vtc_flow) & +RTE_IPV6_HDR_TC_MASK ) >> +RTE_IPV6_HDR_TC_SHIFT ; + s->tc =UINT8_MAX ; + } + t++; + }else if (!ipv6_spec && !ipv6_mask) { + list[t].type = (tun_type ==ICE_NON_TUN ) ? +ICE_IPV4_OFOS :ICE_IPV4_IL ; + } +break ; + +case RTE_FLOW_ITEM_TYPE_UDP : + udp_spec = item->spec; + udp_mask = item->mask; +if (udp_spec && udp_mask) { +/* Check UDP mask and update input set*/ +if (udp_mask->hdr.dgram_len || + udp_mask->hdr.dgram_cksum) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"Invalid UDP mask" ); +return 0 ; + } + +if (tunnel_valid) { +if (udp_mask->hdr.src_port == +UINT16_MAX ) + input_set |= +ICE_INSET_TUN_UDP_SRC_PORT ; +if (udp_mask->hdr.dst_port == +UINT16_MAX ) + input_set |= +ICE_INSET_TUN_UDP_DST_PORT ; + }else { +if (udp_mask->hdr.src_port == +UINT16_MAX ) + input_set |= +ICE_INSET_UDP_SRC_PORT ; +if (udp_mask->hdr.dst_port == +UINT16_MAX ) + input_set |= +ICE_INSET_UDP_DST_PORT ; + } +if (tun_type ==ICE_SW_TUN_VXLAN && + tunnel_valid ==0 ) + list[t].type =ICE_UDP_OF ; +else + list[t].type =ICE_UDP_ILOS ; +if (udp_mask->hdr.src_port ==UINT16_MAX ) { + list[t].h_u.l4_hdr.src_port = + udp_spec->hdr.src_port; + list[t].m_u.l4_hdr.src_port = + udp_mask->hdr.src_port; + } +if (udp_mask->hdr.dst_port ==UINT16_MAX ) { + list[t].h_u.l4_hdr.dst_port = + udp_spec->hdr.dst_port; + list[t].m_u.l4_hdr.dst_port = + udp_mask->hdr.dst_port; + } + t++; + }else if (!udp_spec && !udp_mask) { + list[t].type =ICE_UDP_ILOS ; + } +break ; + +case RTE_FLOW_ITEM_TYPE_TCP : + tcp_spec = item->spec; + tcp_mask = item->mask; +if (tcp_spec && tcp_mask) { +/* Check TCP mask and update input set */ +if (tcp_mask->hdr.sent_seq || + tcp_mask->hdr.recv_ack || + tcp_mask->hdr.data_off || + tcp_mask->hdr.tcp_flags || + tcp_mask->hdr.rx_win || + tcp_mask->hdr.cksum || + tcp_mask->hdr.tcp_urp) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"Invalid TCP mask" ); +return 0 ; + } + +if (tunnel_valid) { +if (tcp_mask->hdr.src_port == +UINT16_MAX ) + input_set |= +ICE_INSET_TUN_TCP_SRC_PORT ; +if (tcp_mask->hdr.dst_port == +UINT16_MAX ) + input_set |= +ICE_INSET_TUN_TCP_DST_PORT ; + }else { +if (tcp_mask->hdr.src_port == +UINT16_MAX ) + input_set |= +ICE_INSET_TCP_SRC_PORT ; +if (tcp_mask->hdr.dst_port == +UINT16_MAX ) + input_set |= +ICE_INSET_TCP_DST_PORT ; + } + list[t].type =ICE_TCP_IL ; +if (tcp_mask->hdr.src_port ==UINT16_MAX ) { + list[t].h_u.l4_hdr.src_port = + tcp_spec->hdr.src_port; + list[t].m_u.l4_hdr.src_port = + tcp_mask->hdr.src_port; + } +if (tcp_mask->hdr.dst_port ==UINT16_MAX ) { + list[t].h_u.l4_hdr.dst_port = + tcp_spec->hdr.dst_port; + list[t].m_u.l4_hdr.dst_port = + tcp_mask->hdr.dst_port; + } + t++; + }else if (!tcp_spec && !tcp_mask) { + list[t].type =ICE_TCP_IL ; + } +break ; + +case RTE_FLOW_ITEM_TYPE_SCTP : + sctp_spec = item->spec; + sctp_mask = item->mask; +if (sctp_spec && sctp_mask) { +/* Check SCTP mask and update input set */ +if (sctp_mask->hdr.cksum) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"Invalid SCTP mask" ); +return 0 ; + } + +if (tunnel_valid) { +if (sctp_mask->hdr.src_port == +UINT16_MAX ) + input_set |= +ICE_INSET_TUN_SCTP_SRC_PORT ; +if (sctp_mask->hdr.dst_port == +UINT16_MAX ) + input_set |= +ICE_INSET_TUN_SCTP_DST_PORT ; + }else { +if (sctp_mask->hdr.src_port == +UINT16_MAX ) + input_set |= +ICE_INSET_SCTP_SRC_PORT ; +if (sctp_mask->hdr.dst_port == +UINT16_MAX ) + input_set |= +ICE_INSET_SCTP_DST_PORT ; + } + list[t].type =ICE_SCTP_IL ; +if (sctp_mask->hdr.src_port ==UINT16_MAX ) { + list[t].h_u.sctp_hdr.src_port = + sctp_spec->hdr.src_port; + list[t].m_u.sctp_hdr.src_port = + sctp_mask->hdr.src_port; + } +if (sctp_mask->hdr.dst_port ==UINT16_MAX ) { + list[t].h_u.sctp_hdr.dst_port = + sctp_spec->hdr.dst_port; + list[t].m_u.sctp_hdr.dst_port = + sctp_mask->hdr.dst_port; + } + t++; + }else if (!sctp_spec && !sctp_mask) { + list[t].type =ICE_SCTP_IL ; + } +break ; + +case RTE_FLOW_ITEM_TYPE_VXLAN : + vxlan_spec = item->spec; + vxlan_mask = item->mask; +/* Check if VXLAN item is used to describe protocol. +* If yes, both spec and mask should be NULL. +* If no, both spec and mask shouldn't be NULL. +*/ +if ((!vxlan_spec && vxlan_mask) || + (vxlan_spec && !vxlan_mask)) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"Invalid VXLAN item" ); +return 0 ; + } + + tunnel_valid =1 ; +if (vxlan_spec && vxlan_mask) { + list[t].type =ICE_VXLAN ; +if (vxlan_mask->vni[0 ] ==UINT8_MAX && + vxlan_mask->vni[1 ] ==UINT8_MAX && + vxlan_mask->vni[2 ] ==UINT8_MAX ) { + list[t].h_u.tnl_hdr.vni = + (vxlan_spec->vni[2 ] <<16 ) | + (vxlan_spec->vni[1 ] <<8 ) | + vxlan_spec->vni[0 ]; + list[t].m_u.tnl_hdr.vni = +UINT32_MAX ; + input_set |= +ICE_INSET_TUN_VXLAN_VNI ; + } + t++; + }else if (!vxlan_spec && !vxlan_mask) { + list[t].type =ICE_VXLAN ; + } +break ; + +case RTE_FLOW_ITEM_TYPE_NVGRE : + nvgre_spec = item->spec; + nvgre_mask = item->mask; +/* Check if NVGRE item is used to describe protocol. +* If yes, both spec and mask should be NULL. +* If no, both spec and mask shouldn't be NULL. +*/ +if ((!nvgre_spec && nvgre_mask) || + (nvgre_spec && !nvgre_mask)) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"Invalid NVGRE item" ); +return 0 ; + } + tunnel_valid =1 ; +if (nvgre_spec && nvgre_mask) { + list[t].type =ICE_NVGRE ; +if (nvgre_mask->tni[0 ] ==UINT8_MAX && + nvgre_mask->tni[1 ] ==UINT8_MAX && + nvgre_mask->tni[2 ] ==UINT8_MAX ) { + list[t].h_u.nvgre_hdr.tni_flow = + (nvgre_spec->tni[2 ] <<16 ) | + (nvgre_spec->tni[1 ] <<8 ) | + nvgre_spec->tni[0 ]; + list[t].m_u.nvgre_hdr.tni_flow = +UINT32_MAX ; + input_set |= +ICE_INSET_TUN_NVGRE_TNI ; + } + t++; + }else if (!nvgre_spec && !nvgre_mask) { + list[t].type =ICE_NVGRE ; + } +break ; + +case RTE_FLOW_ITEM_TYPE_VLAN : + vlan_spec = item->spec; + vlan_mask = item->mask; +/* Check if VLAN item is used to describe protocol. +* If yes, both spec and mask should be NULL. +* If no, both spec and mask shouldn't be NULL. +*/ +if ((!vlan_spec && vlan_mask) || + (vlan_spec && !vlan_mask)) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"Invalid VLAN item" ); +return 0 ; + } +if (vlan_spec && vlan_mask) { + list[t].type =ICE_VLAN_OFOS ; +if (vlan_mask->tci ==UINT16_MAX ) { + list[t].h_u.vlan_hdr.vlan = + vlan_spec->tci; + list[t].m_u.vlan_hdr.vlan = +UINT16_MAX ; + input_set |=ICE_INSET_VLAN_OUTER ; + } +if (vlan_mask->inner_type ==UINT16_MAX ) { + list[t].h_u.vlan_hdr.type = + vlan_spec->inner_type; + list[t].m_u.vlan_hdr.type = +UINT16_MAX ; + input_set |=ICE_INSET_VLAN_OUTER ; + } + t++; + }else if (!vlan_spec && !vlan_mask) { + list[t].type =ICE_VLAN_OFOS ; + } +break ; + +case RTE_FLOW_ITEM_TYPE_PPPOED : +case RTE_FLOW_ITEM_TYPE_PPPOES : + pppoe_spec = item->spec; + pppoe_mask = item->mask; +/* Check if PPPoE item is used to describe protocol. +* If yes, both spec and mask should be NULL. +*/ +if (pppoe_spec || pppoe_mask) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"Invalid pppoe item" ); +return 0 ; + } +break ; + +case RTE_FLOW_ITEM_TYPE_VOID : +break ; + +default : +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , pattern, +"Invalid pattern item." ); + goto out; + } + } + + *lkups_num = t; + +return input_set; +out: +return 0 ; +} + + +static int +ice_switch_parse_action (struct ice_pf *pf, +const struct rte_flow_action *actions, +struct rte_flow_error *error, +struct ice_adv_rule_info *rule_info) +{ +struct ice_vsi *vsi = pf->main_vsi; +struct rte_eth_dev *dev = pf->adapter->eth_dev; +const struct rte_flow_action_queue *act_q; +const struct rte_flow_action_rss *act_qgrop; +uint16_t base_queue, i; +const struct rte_flow_action *action; +enum rte_flow_action_type action_type; +uint16_t valid_qgrop_number[MAX_QGRP_NUM_TYPE ] = { +2 ,4 ,8 ,16 ,32 ,64 ,128 }; + + base_queue = pf->base_queue; +for (action = actions; action->type != +RTE_FLOW_ACTION_TYPE_END ; action++) { + action_type = action->type; +switch (action_type) { +case RTE_FLOW_ACTION_TYPE_RSS : + act_qgrop = action->conf; + rule_info->sw_act.fltr_act = +ICE_FWD_TO_QGRP ; + rule_info->sw_act.fwd_id.q_id = + base_queue + act_qgrop->queue[0 ]; +for (i =0 ; i <MAX_QGRP_NUM_TYPE ; i++) { +if (act_qgrop->queue_num == + valid_qgrop_number[i]) +break ; + } +if (i ==MAX_QGRP_NUM_TYPE ) + goto error; +if ((act_qgrop->queue[0 ] + + act_qgrop->queue_num) > + dev->data->nb_rx_queues) + goto error; +for (i =0 ; i < act_qgrop->queue_num -1 ; i++) +if (act_qgrop->queue[i +1 ] != + act_qgrop->queue[i] +1 ) + goto error; + rule_info->sw_act.qgrp_size = + act_qgrop->queue_num; +break ; +case RTE_FLOW_ACTION_TYPE_QUEUE : + act_q = action->conf; +if (act_q->index >= dev->data->nb_rx_queues) + goto error; + rule_info->sw_act.fltr_act = +ICE_FWD_TO_Q ; + rule_info->sw_act.fwd_id.q_id = + base_queue + act_q->index; +break ; + +case RTE_FLOW_ACTION_TYPE_DROP : + rule_info->sw_act.fltr_act = +ICE_DROP_PACKET ; +break ; + +case RTE_FLOW_ACTION_TYPE_VOID : +break ; + +default : + goto error; + } + } + + rule_info->sw_act.vsi_handle = vsi->idx; + rule_info->rx =1 ; + rule_info->sw_act.src = vsi->idx; + rule_info->priority =5 ; + +return 0 ; + +error: +rte_flow_error_set (error, +EINVAL ,RTE_FLOW_ERROR_TYPE_ACTION , + actions, +"Invalid action type or queue number" ); +return -rte_errno; +} + +static int +ice_switch_parse_pattern_action (struct ice_adapter *ad, +struct ice_pattern_match_item *array, +uint32_t array_len, +const struct rte_flow_item pattern[], +const struct rte_flow_action actions[], +void **meta, +struct rte_flow_error *error) +{ +struct ice_pf *pf = &ad->pf; +uint64_t inputset =0 ; +int ret =0 ; +struct sw_meta *sw_meta_ptr =NULL ; +struct ice_adv_rule_info rule_info; +struct ice_adv_lkup_elem *list =NULL ; +uint16_t lkups_num =0 ; +const struct rte_flow_item *item = pattern; +uint16_t item_num =0 ; +enum ice_sw_tunnel_type tun_type =ICE_NON_TUN ; +struct ice_pattern_match_item *pattern_match_item =NULL ; + +for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) { + item_num++; +if (item->type ==RTE_FLOW_ITEM_TYPE_VXLAN ) + tun_type =ICE_SW_TUN_VXLAN ; +if (item->type ==RTE_FLOW_ITEM_TYPE_NVGRE ) + tun_type =ICE_SW_TUN_NVGRE ; +if (item->type ==RTE_FLOW_ITEM_TYPE_PPPOED || + item->type ==RTE_FLOW_ITEM_TYPE_PPPOES ) + tun_type =ICE_SW_TUN_PPPOE ; +if (item->type ==RTE_FLOW_ITEM_TYPE_ETH ) { +const struct rte_flow_item_eth *eth_mask; +if (item->mask) + eth_mask = item->mask; +else +continue ; +if (eth_mask->type ==UINT16_MAX ) + tun_type =ICE_SW_TUN_AND_NON_TUN ; + } +/* reserve one more memory slot for ETH which may +* consume 2 lookup items. +*/ +if (item->type ==RTE_FLOW_ITEM_TYPE_ETH ) + item_num++; + } + + list =rte_zmalloc (NULL , item_num *sizeof (*list),0 ); +if (!list) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , +"No memory for PMD internal items" ); +return -rte_errno; + } + + rule_info.tun_type = tun_type; + + sw_meta_ptr = +rte_zmalloc (NULL ,sizeof (*sw_meta_ptr),0 ); +if (!sw_meta_ptr) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , +"No memory for sw_pattern_meta_ptr" ); + goto error; + } + + pattern_match_item = +ice_search_pattern_match_item (pattern, array, array_len, error); +if (!pattern_match_item) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , +"Invalid input pattern" ); + goto error; + } + + inputset =ice_switch_inset_get + (pattern, error, list, &lkups_num, tun_type); +if (!inputset || (inputset & ~pattern_match_item->input_set_mask)) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM_SPEC , + pattern, +"Invalid input set" ); + goto error; + } + + ret =ice_switch_parse_action (pf, actions, error, &rule_info); +if (ret) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , +"Invalid input action" ); + goto error; + } + *meta = sw_meta_ptr; + ((struct sw_meta *)*meta)->list = list; + ((struct sw_meta *)*meta)->lkups_num = lkups_num; + ((struct sw_meta *)*meta)->rule_info = rule_info; +rte_free (pattern_match_item); + +return 0 ; + +error: +rte_free (list); +rte_free (sw_meta_ptr); +rte_free (pattern_match_item); + +return -rte_errno; +} + +static int +ice_switch_query(struct ice_adapter *ad __rte_unused, + struct rte_flow *flow __rte_unused, + struct rte_flow_query_count *count __rte_unused, +struct rte_flow_error *error) +{ +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_HANDLE , +NULL , +"count action not supported by switch filter" ); + +return -rte_errno; +} + +static int +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; + +if (ad->active_pkg_type ==ICE_PKG_TYPE_COMMS ) + dist_parser = &ice_switch_dist_parser_comms; +else + dist_parser = &ice_switch_dist_parser_os; + +if (ad->devargs.pipe_mode_support) + ret =ice_register_parser (perm_parser, ad); +else + ret =ice_register_parser (dist_parser, ad); +return ret; +} + +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; + +if (ad->active_pkg_type ==ICE_PKG_TYPE_COMMS ) + dist_parser = &ice_switch_dist_parser_comms; +else + dist_parser = &ice_switch_dist_parser_os; + +if (ad->devargs.pipe_mode_support) +ice_unregister_parser (perm_parser, ad); +else +ice_unregister_parser (dist_parser, ad); +} + +static struct +ice_flow_engine ice_switch_engine = { + .init = ice_switch_init, + .uninit = ice_switch_uninit, + .create = ice_switch_create, + .destroy = ice_switch_destroy, + .query_count = ice_switch_query, + .free = ice_switch_filter_rule_free, + .type =ICE_FLOW_ENGINE_SWITCH , +}; + +static struct +ice_flow_parser ice_switch_dist_parser_os = { + .engine = &ice_switch_engine, + .array = ice_switch_pattern_dist_os, + .array_len =RTE_DIM (ice_switch_pattern_dist_os), + .parse_pattern_action = ice_switch_parse_pattern_action, + .stage =ICE_FLOW_STAGE_DISTRIBUTOR , +}; + +static struct +ice_flow_parser ice_switch_dist_parser_comms = { + .engine = &ice_switch_engine, + .array = ice_switch_pattern_dist_comms, + .array_len =RTE_DIM (ice_switch_pattern_dist_comms), + .parse_pattern_action = ice_switch_parse_pattern_action, + .stage =ICE_FLOW_STAGE_DISTRIBUTOR , +}; + +static struct +ice_flow_parser ice_switch_perm_parser = { + .engine = &ice_switch_engine, + .array = ice_switch_pattern_perm, + .array_len =RTE_DIM (ice_switch_pattern_perm), + .parse_pattern_action = ice_switch_parse_pattern_action, + .stage =ICE_FLOW_STAGE_PERMISSION , +}; + +RTE_INIT (ice_sw_engine_init) +{ +struct ice_flow_engine *engine = &ice_switch_engine; +ice_register_flow_engine (engine); +}drivers/net/ice/ice_switch_filter.h deleted +0
-4@@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2019 Intel Corporation -*/ -Signature · 1 line
2.15.1
Re: [dpdk-dev] [PATCH v4 5/5] net/ice: rework switch filter
Hi, Xiaolong
I will fix the coding style warning and send v5.
Thanks
-Ying
Quoted 1,311 lines
-----Original Message-----
From: Ye, Xiaolong
Sent: Wednesday, October 16, 2019 10:55 AM
To: Wang, Ying A <[email protected]>
Cc: Zhang, Qi Z <[email protected]>; [email protected]; Yang, Qiming <[email protected]>; Zhao1, Wei <[email protected]>
Subject: Re: [PATCH v4 5/5] net/ice: rework switch filterHi,
Could you check below warning in patchwork?
http://mails.dpdk.org/archives/test-report/2019-October/102523.html
Thanks,
XiaolongQuoted 11 lines · Ying Wang
From: wei zhao <[email protected]>
The patch reworks packet process engine's binary classifier (switch) for the new framework. It also adds support for new packet type like PPPoE for switch filter.
Signed-off-by Wei Zhao <[email protected]>Acked-by Qi Zhang <[email protected]>---
doc/guides/rel_notes/release_19_11.rst| 1 +drivers/net/ice/ice_switch_filter.c| 1191++++++++++++++++++++++++++++++++
Quoted 70 lines
drivers/net/ice/ice_switch_filter.h| 4 -3 files changed, 1192 insertions(+), 4 deletions(-) delete mode100644
drivers/net/ice/ice_switch_filter.hdoc/guides/rel_notes/release_19_11.rst +1
-0@@ -96,6 +96,7 @@ New Features * Added support for the ``RTE_ETH_DEV_CLOSE_REMOVE`` flag. * Generic filter enhancement - Supported pipeline mode. + - Supported new packet type like PPPoE for switch filter. * **Updated the enic driver.**drivers/net/ice/ice_switch_filter.c +44
-0@@ -2,3 +2,1194 @@* Copyright(c) 2019 Intel Corporation */ +#include <sys/queue.h> +#include <stdio.h> +#include <errno.h> +#include <stdint.h> +#include <string.h> +#include <unistd.h> +#include <stdarg.h> +#include <rte_debug.h> +#include <rte_ether.h> +#include <rte_ethdev_driver.h> +#include <rte_log.h> +#include <rte_malloc.h> +#include <rte_eth_ctrl.h> +#include <rte_tailq.h> +#include <rte_flow_driver.h> +#include <rte_flow.h> +#include "base/ice_type.h" +#include "base/ice_switch.h" +#include "base/ice_type.h" +#include "ice_logs.h" +#include "ice_ethdev.h" +#include "ice_generic_flow.h" + + +#define MAX_QGRP_NUM_TYPE 7 + +#define ICE_SW_INSET_ETHER ( \ + ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE) #define +ICE_SW_INSET_MAC_IPV4 ( \ +ICE_INSET_DMAC |ICE_INSET_IPV4_DST |ICE_INSET_IPV4_SRC | \ + ICE_INSET_IPV4_PROTO | ICE_INSET_IPV4_TTL | ICE_INSET_IPV4_TOS) +#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 | \ + ICE_INSET_TCP_DST_PORT | ICE_INSET_TCP_SRC_PORT) #define +ICE_SW_INSET_MAC_IPV4_UDP ( \ +ICE_INSET_DMAC |ICE_INSET_IPV4_DST |ICE_INSET_IPV4_SRC | \ +ICE_INSET_IPV4_TTL |ICE_INSET_IPV4_TOS | \ + ICE_INSET_UDP_DST_PORT | ICE_INSET_UDP_SRC_PORT) #define +ICE_SW_INSET_MAC_IPV6 ( \ + ICE_INSET_DMAC | ICE_INSET_IPV6_DST | ICE_INSET_IPV6_SRC | \ + ICE_INSET_IPV6_TC | ICE_INSET_IPV6_HOP_LIMIT | \ + ICE_INSET_IPV6_NEXT_HDR) +#define ICE_SW_INSET_MAC_IPV6_TCP ( \drivers/net/ice/ice_switch_filter.c line 58
Quoted 10 lines
drivers/net/ice/ice_switch_filter.c +10
-0+ ICE_INSET_DMAC | ICE_INSET_IPV6_DST | ICE_INSET_IPV6_SRC | \ + ICE_INSET_IPV6_HOP_LIMIT | ICE_INSET_IPV6_TC | \ + ICE_INSET_TCP_DST_PORT | ICE_INSET_TCP_SRC_PORT) #define +ICE_SW_INSET_MAC_IPV6_UDP ( \ + ICE_INSET_DMAC | ICE_INSET_IPV6_DST | ICE_INSET_IPV6_SRC | \ + ICE_INSET_IPV6_HOP_LIMIT | ICE_INSET_IPV6_TC | \ + ICE_INSET_UDP_DST_PORT | ICE_INSET_UDP_SRC_PORT) #define +ICE_SW_INSET_DIST_NVGRE_IPV4 ( \ + ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \ + ICE_INSET_TUN_DMAC | ICE_INSET_TUN_NVGRE_TNI |
ICE_INSET_IPV4_DST)drivers/net/ice/ice_switch_filter.c
Quoted 3 lines
drivers/net/ice/ice_switch_filter.c +3
-0+#define ICE_SW_INSET_DIST_VXLAN_IPV4 ( \ + ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \ + ICE_INSET_TUN_DMAC | ICE_INSET_TUN_VXLAN_VNI |
ICE_INSET_IPV4_DST)drivers/net/ice/ice_switch_filter.c
Quoted 4 lines
drivers/net/ice/ice_switch_filter.c +4
-0+#define ICE_SW_INSET_DIST_NVGRE_IPV4_TCP ( \ + ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \ + ICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT | \ + ICE_INSET_TUN_DMAC | ICE_INSET_TUN_NVGRE_TNI |
ICE_INSET_IPV4_DST)drivers/net/ice/ice_switch_filter.c
Quoted 3 lines
drivers/net/ice/ice_switch_filter.c +3
-0+#define ICE_SW_INSET_DIST_NVGRE_IPV4_UDP ( \ + ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \ + ICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT |\
drivers/net/ice/ice_switch_filter.c line 69
Quoted 1 line
drivers/net/ice/ice_switch_filter.c +1
-0+ ICE_INSET_TUN_DMAC | ICE_INSET_TUN_NVGRE_TNI |
ICE_INSET_IPV4_DST)drivers/net/ice/ice_switch_filter.c
Quoted 4 lines
drivers/net/ice/ice_switch_filter.c +4
-0+#define ICE_SW_INSET_DIST_VXLAN_IPV4_TCP ( \ + ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \ + ICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT | \ + ICE_INSET_TUN_DMAC | ICE_INSET_TUN_VXLAN_VNI |
ICE_INSET_IPV4_DST)drivers/net/ice/ice_switch_filter.c
Quoted 3 lines
drivers/net/ice/ice_switch_filter.c +3
-0+#define ICE_SW_INSET_DIST_VXLAN_IPV4_UDP ( \ + ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \ + ICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT |\
drivers/net/ice/ice_switch_filter.c line 77
Quoted 1 line
drivers/net/ice/ice_switch_filter.c +1
-0+ ICE_INSET_TUN_DMAC | ICE_INSET_TUN_VXLAN_VNI |
ICE_INSET_IPV4_DST)drivers/net/ice/ice_switch_filter.c
Quoted 10 lines
drivers/net/ice/ice_switch_filter.c +10
-0+#define ICE_SW_INSET_PERM_TUNNEL_IPV4 ( \ + ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \ + ICE_INSET_TUN_IPV4_PROTO | ICE_INSET_TUN_IPV4_TOS) #define +ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP ( \ +ICE_INSET_TUN_IPV4_SRC |ICE_INSET_TUN_IPV4_DST | \ +ICE_INSET_TUN_TCP_SRC_PORT |ICE_INSET_TUN_TCP_DST_PORT | \ + ICE_INSET_TUN_IPV4_TOS) +#define ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP ( \ + ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \ + ICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT |\
Quoted 25 lines
drivers/net/ice/ice_switch_filter.c +25
-0+ ICE_INSET_TUN_IPV4_TOS) +#define ICE_SW_INSET_MAC_PPPOE ( \ + ICE_INSET_VLAN_OUTER | ICE_INSET_VLAN_INNER | \ + ICE_INSET_DMAC | ICE_INSET_ETHERTYPE) + +struct sw_meta { +struct ice_adv_lkup_elem *list; +uint16_t lkups_num; +struct ice_adv_rule_info rule_info; +}; + +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_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 },drivers/net/ice/ice_switch_filter.c
Quoted 10 lines
drivers/net/ice/ice_switch_filter.c +10
-0+ {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},drivers/net/ice/ice_switch_filter.c line 124
Quoted 2 lines
drivers/net/ice/ice_switch_filter.c +2
-0+ {pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp, + ICE_SW_INSET_DIST_VXLAN_IPV4_TCP,
ICE_INSET_NONE},drivers/net/ice/ice_switch_filter.c
Quoted 4 lines
drivers/net/ice/ice_switch_filter.c +4
-0+ {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},drivers/net/ice/ice_switch_filter.c line 130
Quoted 2 lines
drivers/net/ice/ice_switch_filter.c +2
-0+ {pattern_eth_ipv4_nvgre_eth_ipv4_tcp, + ICE_SW_INSET_DIST_NVGRE_IPV4_TCP,
ICE_INSET_NONE},Quoted 21 lines
drivers/net/ice/ice_switch_filter.c +21
-0+ {pattern_eth_pppoed, + ICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE}, + {pattern_eth_vlan_pppoed, + ICE_SW_INSET_MAC_PPPOE, 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}, }; + +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},drivers/net/ice/ice_switch_filter.c
Quoted 10 lines
drivers/net/ice/ice_switch_filter.c +10
-0+ {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},drivers/net/ice/ice_switch_filter.c line 163
Quoted 2 lines
drivers/net/ice/ice_switch_filter.c +2
-0+ {pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp, + ICE_SW_INSET_DIST_VXLAN_IPV4_TCP,
ICE_INSET_NONE},drivers/net/ice/ice_switch_filter.c
Quoted 4 lines
drivers/net/ice/ice_switch_filter.c +4
-0+ {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},drivers/net/ice/ice_switch_filter.c line 169
Quoted 2 lines
drivers/net/ice/ice_switch_filter.c +2
-0+ {pattern_eth_ipv4_nvgre_eth_ipv4_tcp, + ICE_SW_INSET_DIST_NVGRE_IPV4_TCP,
ICE_INSET_NONE}, };Quoted 7 lines
drivers/net/ice/ice_switch_filter.c +7
-0+ +static struct +ice_pattern_match_item ice_switch_pattern_perm[] = { + {pattern_eth_ipv4, +ICE_SW_INSET_MAC_IPV4 ,ICE_INSET_NONE }, + {pattern_eth_ipv4_udp, +ICE_SW_INSET_MAC_IPV4_UDP ,ICE_INSET_NONE },drivers/net/ice/ice_switch_filter.c
Quoted 10 lines
drivers/net/ice/ice_switch_filter.c +10
-0+ {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_PERM_TUNNEL_IPV4,
ICE_INSET_NONE},drivers/net/ice/ice_switch_filter.c line 188
Quoted 2 lines
drivers/net/ice/ice_switch_filter.c +2
-0+ {pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp, + ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP,
ICE_INSET_NONE},drivers/net/ice/ice_switch_filter.c line 190
Quoted 2 lines
drivers/net/ice/ice_switch_filter.c +2
-0+ {pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp, + ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP,
ICE_INSET_NONE},drivers/net/ice/ice_switch_filter.c line 192
Quoted 2 lines
drivers/net/ice/ice_switch_filter.c +2
-0+ {pattern_eth_ipv4_nvgre_eth_ipv4, + ICE_SW_INSET_PERM_TUNNEL_IPV4,
ICE_INSET_NONE},drivers/net/ice/ice_switch_filter.c line 194
Quoted 2 lines
drivers/net/ice/ice_switch_filter.c +2
-0+ {pattern_eth_ipv4_nvgre_eth_ipv4_udp, + ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP,
ICE_INSET_NONE},drivers/net/ice/ice_switch_filter.c line 196
Quoted 2 lines
drivers/net/ice/ice_switch_filter.c +2
-0+ {pattern_eth_ipv4_nvgre_eth_ipv4_tcp, + ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP,
ICE_INSET_NONE}, };Quoted 201 lines
drivers/net/ice/ice_switch_filter.c +145
-0+ +static int +ice_switch_create(struct ice_adapter *ad, + struct rte_flow *flow, + void *meta, + struct rte_flow_error *error) +{ + int ret = 0; + struct ice_pf *pf = &ad->pf; + struct ice_hw *hw = ICE_PF_TO_HW(pf); + struct ice_rule_query_data rule_added = {0}; + struct ice_rule_query_data *filter_ptr; + struct ice_adv_lkup_elem *list = + ((struct sw_meta *)meta)->list; + uint16_t lkups_cnt = + ((struct sw_meta *)meta)->lkups_num; + struct ice_adv_rule_info *rule_info = + &((struct sw_meta *)meta)->rule_info; + + if (lkups_cnt > ICE_MAX_CHAIN_WORDS) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, NULL, + "item number too large for rule"); + goto error; + } + if (!list) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, NULL, + "lookup list should not be NULL"); + goto error; + } + ret = ice_add_adv_rule(hw, list, lkups_cnt, rule_info, &rule_added); + if (!ret) { + filter_ptr = rte_zmalloc("ice_switch_filter", + sizeof(struct ice_rule_query_data), 0); + if (!filter_ptr) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_HANDLE, NULL, + "No memory for ice_switch_filter"); + goto error; + } + flow->rule = filter_ptr; + rte_memcpy(filter_ptr, + &rule_added, + sizeof(struct ice_rule_query_data)); + } else { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_HANDLE, NULL, + "switch filter create flow fail"); + goto error; + } + + rte_free(list); + rte_free(meta); + return 0; + +error: + rte_free(list); + rte_free(meta); + + return -rte_errno; +} + +static int +ice_switch_destroy(struct ice_adapter *ad, + struct rte_flow *flow, + struct rte_flow_error *error) +{ + struct ice_hw *hw = &ad->hw; + int ret; + struct ice_rule_query_data *filter_ptr; + + filter_ptr = (struct ice_rule_query_data *) + flow->rule; + + if (!filter_ptr) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_HANDLE, NULL, + "no such flow" + " create by switch filter"); + return -rte_errno; + } + + ret = ice_rem_adv_rule_by_id(hw, filter_ptr); + if (ret) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_HANDLE, NULL, + "fail to destroy switch filter rule"); + return -rte_errno; + } + + rte_free(filter_ptr); + return ret; +} + +static void +ice_switch_filter_rule_free(struct rte_flow *flow) { + rte_free(flow->rule); +} + +static uint64_t +ice_switch_inset_get(const struct rte_flow_item pattern[], + struct rte_flow_error *error, + struct ice_adv_lkup_elem *list, + uint16_t *lkups_num, + enum ice_sw_tunnel_type tun_type) +{ + const struct rte_flow_item *item = pattern; + enum rte_flow_item_type item_type; + const struct rte_flow_item_eth *eth_spec, *eth_mask; + const struct rte_flow_item_ipv4 *ipv4_spec, *ipv4_mask; + const struct rte_flow_item_ipv6 *ipv6_spec, *ipv6_mask; + const struct rte_flow_item_tcp *tcp_spec, *tcp_mask; + const struct rte_flow_item_udp *udp_spec, *udp_mask; + const struct rte_flow_item_sctp *sctp_spec, *sctp_mask; + const struct rte_flow_item_nvgre *nvgre_spec, *nvgre_mask; + const struct rte_flow_item_vxlan *vxlan_spec, *vxlan_mask; + const struct rte_flow_item_vlan *vlan_spec, *vlan_mask; + const struct rte_flow_item_pppoe *pppoe_spec, *pppoe_mask; + uint8_t ipv6_addr_mask[16] = { + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; + uint64_t input_set = ICE_INSET_NONE; + uint16_t j, t = 0; + uint16_t tunnel_valid = 0; + + + for (item = pattern; item->type != + RTE_FLOW_ITEM_TYPE_END; item++) { + if (item->last) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + item, + "Not support range"); + return 0; + } + item_type = item->type; + + switch (item_type) { + case RTE_FLOW_ITEM_TYPE_ETH: + eth_spec = item->spec; + eth_mask = item->mask; + if (eth_spec && eth_mask) { + if (tunnel_valid && + rte_is_broadcast_ether_addr(ð_mask-src))
drivers/net/ice/ice_switch_filter.c +6
-0+ input_set |=ICE_INSET_TUN_SMAC ; + else if ( + rte_is_broadcast_ether_addr(ð_mask->src)) + input_set |= ICE_INSET_SMAC; +if (tunnel_valid && + rte_is_broadcast_ether_addr(ð_mask-dst))
drivers/net/ice/ice_switch_filter.c +48
-0+ input_set |=ICE_INSET_TUN_DMAC ; + else if ( + rte_is_broadcast_ether_addr(ð_mask->dst)) + input_set |= ICE_INSET_DMAC; +if (eth_mask->type ==RTE_BE16 (0xffff )) + input_set |=ICE_INSET_ETHERTYPE ; + list[t].type = (tunnel_valid ==0 ) ? +ICE_MAC_OFOS :ICE_MAC_IL ; +struct ice_ether_hdr *h; +struct ice_ether_hdr *m; +uint16_t i =0 ; + h = &list[t].h_u.eth_hdr; + m = &list[t].m_u.eth_hdr; +for (j =0 ; j <RTE_ETHER_ADDR_LEN ; j++) { +if (eth_mask->src.addr_bytes[j] == +UINT8_MAX ) { + h->src_addr[j] = + eth_spec->src.addr_bytes[j]; + m->src_addr[j] = + eth_mask->src.addr_bytes[j]; + i =1 ; + } +if (eth_mask->dst.addr_bytes[j] == +UINT8_MAX ) { + h->dst_addr[j] = + eth_spec->dst.addr_bytes[j]; + m->dst_addr[j] = + eth_mask->dst.addr_bytes[j]; + i =1 ; + } + } +if (i) + t++; +if (eth_mask->type ==UINT16_MAX ) { + list[t].type =ICE_ETYPE_OL ; + list[t].h_u.ethertype.ethtype_id = + eth_spec->type; + list[t].m_u.ethertype.ethtype_id = +UINT16_MAX ; + t++; + } + }else if (!eth_spec && !eth_mask) { + list[t].type = (tun_type ==ICE_NON_TUN ) ? +ICE_MAC_OFOS :ICE_MAC_IL ; + } +break ; + +case RTE_FLOW_ITEM_TYPE_IPV4 :drivers/net/ice/ice_switch_filter.c line 414
Quoted 10 lines
drivers/net/ice/ice_switch_filter.c +10
-0+ ipv4_spec = item->spec; + ipv4_mask = item->mask; +if (ipv4_spec && ipv4_mask) { +/* Check IPv4 mask and update input set */ +if (ipv4_mask->hdr.version_ihl || + ipv4_mask->hdr.total_length || + ipv4_mask->hdr.packet_id || + ipv4_mask->hdr.hdr_checksum) { + rte_flow_error_set(error, EINVAL, +
RTE_FLOW_ERROR_TYPE_ITEM,drivers/net/ice/ice_switch_filter.c line 493
Quoted 10 lines
drivers/net/ice/ice_switch_filter.c +10
-0+ item, + "Invalid IPv4 mask."); +return 0 ; + } + +if (tunnel_valid) { +if (ipv4_mask->hdr.type_of_service == +UINT8_MAX ) + input_set |= +ICE_INSET_TUN_IPV4_TOS;drivers/net/ice/ice_switch_filter.c line 493
Quoted 4 lines
drivers/net/ice/ice_switch_filter.c +4
-0+if (ipv4_mask->hdr.src_addr == +UINT32_MAX ) + input_set |= +ICE_INSET_TUN_IPV4_SRC;drivers/net/ice/ice_switch_filter.c line 493
Quoted 4 lines
drivers/net/ice/ice_switch_filter.c +4
-0+if (ipv4_mask->hdr.dst_addr == +UINT32_MAX ) + input_set |= +ICE_INSET_TUN_IPV4_DST;drivers/net/ice/ice_switch_filter.c line 493
Quoted 4 lines
drivers/net/ice/ice_switch_filter.c +4
-0+if (ipv4_mask->hdr.time_to_live == +UINT8_MAX ) + input_set |= +ICE_INSET_TUN_IPV4_TTL;drivers/net/ice/ice_switch_filter.c line 448
Quoted 8 lines
drivers/net/ice/ice_switch_filter.c +8
-0+if (ipv4_mask->hdr.next_proto_id == +UINT8_MAX ) + input_set |= +ICE_INSET_TUN_IPV4_PROTO ; + }else { +if (ipv4_mask->hdr.src_addr == +UINT32_MAX ) + input_set |=
ICE_INSET_IPV4_SRC;drivers/net/ice/ice_switch_filter.c line 426
Quoted 3 lines
drivers/net/ice/ice_switch_filter.c +3
-0+if (ipv4_mask->hdr.dst_addr == +UINT32_MAX ) + input_set |=
ICE_INSET_IPV4_DST;drivers/net/ice/ice_switch_filter.c line 430
Quoted 3 lines
drivers/net/ice/ice_switch_filter.c +3
-0+if (ipv4_mask->hdr.time_to_live == +UINT8_MAX ) + input_set |=
ICE_INSET_IPV4_TTL;Quoted 14 lines
drivers/net/ice/ice_switch_filter.c +14
-0+if (ipv4_mask->hdr.next_proto_id == +UINT8_MAX ) + input_set |= +ICE_INSET_IPV4_PROTO ; +if (ipv4_mask->hdr.type_of_service == +UINT8_MAX ) + input_set |= +ICE_INSET_IPV4_TOS ; + } + list[t].type = (tunnel_valid ==0 ) ? +ICE_IPV4_OFOS :ICE_IPV4_IL ; +if (ipv4_mask->hdr.src_addr ==UINT32_MAX ) { + list[t].h_u.ipv4_hdr.src_addr = + ipv4_spec->hdr.src_addr;drivers/net/ice/ice_switch_filter.c
Quoted 10 lines
drivers/net/ice/ice_switch_filter.c +10
-0+ list[t].m_u.ipv4_hdr.src_addr = +UINT32_MAX ; + } +if (ipv4_mask->hdr.dst_addr ==UINT32_MAX ) { + list[t].h_u.ipv4_hdr.dst_addr = + ipv4_spec->hdr.dst_addr; + list[t].m_u.ipv4_hdr.dst_addr = +UINT32_MAX ; + } +if (ipv4_mask->hdr.time_to_live ==UINT8_MAX ){
drivers/net/ice/ice_switch_filter.c
Quoted 6 lines
drivers/net/ice/ice_switch_filter.c +6
-0+ list[t].h_u.ipv4_hdr.time_to_live = + ipv4_spec->hdr.time_to_live; + list[t].m_u.ipv4_hdr.time_to_live = +UINT8_MAX ; + } + if (ipv4_mask->hdr.next_proto_id ==
UINT8_MAX) {Quoted 27 lines
drivers/net/ice/ice_switch_filter.c +9
-0+ list[t].h_u.ipv4_hdr.protocol = + ipv4_spec->hdr.next_proto_id; + list[t].m_u.ipv4_hdr.protocol = +UINT8_MAX ; + } +if (ipv4_mask->hdr.type_of_service == +UINT8_MAX ) { + list[t].h_u.ipv4_hdr.tos = + ipv4_spec-hdr.type_of_service;
drivers/net/ice/ice_switch_filter.c +17
-0+ list[t].m_u.ipv4_hdr.tos =UINT8_MAX ; + } + t++; + }else if (!ipv4_spec && !ipv4_mask) { + list[t].type = (tunnel_valid ==0 ) ? +ICE_IPV4_OFOS :ICE_IPV4_IL ; + } +break ; + +case RTE_FLOW_ITEM_TYPE_IPV6 : + ipv6_spec = item->spec; + ipv6_mask = item->mask; +if (ipv6_spec && ipv6_mask) { +if (ipv6_mask->hdr.payload_len) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + item,drivers/net/ice/ice_switch_filter.c
Quoted 10 lines
drivers/net/ice/ice_switch_filter.c +10
-0+ "Invalid IPv6 mask"); +return 0 ; + } + +if (tunnel_valid) { +if (!memcmp (ipv6_mask->hdr.src_addr, + ipv6_addr_mask, +RTE_DIM (ipv6_mask->hdr.src_addr))) + input_set |= +ICE_INSET_TUN_IPV6_SRC;drivers/net/ice/ice_switch_filter.c line 603
Quoted 5 lines
drivers/net/ice/ice_switch_filter.c +5
-0+if (!memcmp (ipv6_mask->hdr.dst_addr, + ipv6_addr_mask, +RTE_DIM (ipv6_mask->hdr.dst_addr))) + input_set |= +ICE_INSET_TUN_IPV6_DST;drivers/net/ice/ice_switch_filter.c
Quoted 1 line
drivers/net/ice/ice_switch_filter.c +1
-0+ if (ipv6_mask->hdr.proto ==
UINT8_MAX)drivers/net/ice/ice_switch_filter.c
Quoted 2 lines
drivers/net/ice/ice_switch_filter.c +2
-0+ input_set |= +ICE_INSET_TUN_IPV6_NEXT_HDR;drivers/net/ice/ice_switch_filter.c line 603
Quoted 4 lines
drivers/net/ice/ice_switch_filter.c +4
-0+if (ipv6_mask->hdr.hop_limits == +UINT8_MAX ) + input_set |= +ICE_INSET_TUN_IPV6_HOP_LIMIT;drivers/net/ice/ice_switch_filter.c line 603
Quoted 5 lines
drivers/net/ice/ice_switch_filter.c +5
-0+if ((ipv6_mask->hdr.vtc_flow & +rte_cpu_to_be_32 + (RTE_IPV6_HDR_TC_MASK )) + == rte_cpu_to_be_32 +(RTE_IPV6_HDR_TC_MASK))drivers/net/ice/ice_switch_filter.c
Quoted 2 lines
drivers/net/ice/ice_switch_filter.c +2
-0+ input_set |= +ICE_INSET_TUN_IPV6_TC;drivers/net/ice/ice_switch_filter.c line 541
Quoted 5 lines
drivers/net/ice/ice_switch_filter.c +5
-0+ }else { +if (!memcmp (ipv6_mask->hdr.src_addr, + ipv6_addr_mask, +RTE_DIM (ipv6_mask->hdr.src_addr))) + input_set |=
ICE_INSET_IPV6_SRC;drivers/net/ice/ice_switch_filter.c line 515
Quoted 4 lines
drivers/net/ice/ice_switch_filter.c +4
-0+if (!memcmp (ipv6_mask->hdr.dst_addr, + ipv6_addr_mask, +RTE_DIM (ipv6_mask->hdr.dst_addr))) + input_set |=
ICE_INSET_IPV6_DST;drivers/net/ice/ice_switch_filter.c
Quoted 1 line
drivers/net/ice/ice_switch_filter.c +1
-0+ if (ipv6_mask->hdr.proto ==
UINT8_MAX)drivers/net/ice/ice_switch_filter.c line 603
Quoted 11 lines
drivers/net/ice/ice_switch_filter.c +11
-0+ input_set |= +ICE_INSET_IPV6_NEXT_HDR ; +if (ipv6_mask->hdr.hop_limits == +UINT8_MAX ) + input_set |= +ICE_INSET_IPV6_HOP_LIMIT ; +if ((ipv6_mask->hdr.vtc_flow & +rte_cpu_to_be_32 + (RTE_IPV6_HDR_TC_MASK )) + == rte_cpu_to_be_32 +(RTE_IPV6_HDR_TC_MASK))drivers/net/ice/ice_switch_filter.c
Quoted 1 line
drivers/net/ice/ice_switch_filter.c +1
-0+ input_set |=
ICE_INSET_IPV6_TC;Quoted 31 lines
drivers/net/ice/ice_switch_filter.c +31
-0+ } + list[t].type = (tunnel_valid ==0 ) ? +ICE_IPV6_OFOS :ICE_IPV6_IL ; +struct ice_ipv6_hdr *f; +struct ice_ipv6_hdr *s; + f = &list[t].h_u.ipv6_hdr; + s = &list[t].m_u.ipv6_hdr; +for (j =0 ; j <ICE_IPV6_ADDR_LENGTH ; j++) { +if (ipv6_mask->hdr.src_addr[j] == +UINT8_MAX ) { + f->src_addr[j] = + ipv6_spec->hdr.src_addr[j]; + s->src_addr[j] = + ipv6_mask->hdr.src_addr[j]; + } +if (ipv6_mask->hdr.dst_addr[j] == +UINT8_MAX ) { + f->dst_addr[j] = + ipv6_spec->hdr.dst_addr[j]; + s->dst_addr[j] = + ipv6_mask->hdr.dst_addr[j]; + } + } +if (ipv6_mask->hdr.proto ==UINT8_MAX ) { + f->next_hdr = + ipv6_spec->hdr.proto; + s->next_hdr =UINT8_MAX ; + } +if (ipv6_mask->hdr.hop_limits ==UINT8_MAX ) { + f->hop_limit = + ipv6_spec->hdr.hop_limits;drivers/net/ice/ice_switch_filter.c line 603
Quoted 10 lines
drivers/net/ice/ice_switch_filter.c +10
-0+ s->hop_limit =UINT8_MAX ; + } +if ((ipv6_mask->hdr.vtc_flow & +rte_cpu_to_be_32 + (RTE_IPV6_HDR_TC_MASK )) + ==rte_cpu_to_be_32 + (RTE_IPV6_HDR_TC_MASK )) { + f->tc = (rte_be_to_cpu_32 + (ipv6_spec->hdr.vtc_flow) & +RTE_IPV6_HDR_TC_MASK) >>Quoted 1 line
+
RTE_IPV6_HDR_TC_SHIFT;Quoted 8 lines
drivers/net/ice/ice_switch_filter.c +8
-0+ s->tc =UINT8_MAX ; + } + t++; + }else if (!ipv6_spec && !ipv6_mask) { + list[t].type = (tun_type ==ICE_NON_TUN ) ? +ICE_IPV4_OFOS :ICE_IPV4_IL ; + } +break ;drivers/net/ice/ice_switch_filter.c line 617
Quoted 10 lines
drivers/net/ice/ice_switch_filter.c +10
-0+ +case RTE_FLOW_ITEM_TYPE_UDP : + udp_spec = item->spec; + udp_mask = item->mask; +if (udp_spec && udp_mask) { +/* Check UDP mask and update input set*/ +if (udp_mask->hdr.dgram_len || + udp_mask->hdr.dgram_cksum) { + rte_flow_error_set(error, EINVAL, +
RTE_FLOW_ERROR_TYPE_ITEM,drivers/net/ice/ice_switch_filter.c line 659
Quoted 10 lines
drivers/net/ice/ice_switch_filter.c +10
-0+ item, + "Invalid UDP mask"); +return 0 ; + } + +if (tunnel_valid) { +if (udp_mask->hdr.src_port == +UINT16_MAX ) + input_set |= +ICE_INSET_TUN_UDP_SRC_PORT;drivers/net/ice/ice_switch_filter.c line 659
Quoted 4 lines
drivers/net/ice/ice_switch_filter.c +4
-0+if (udp_mask->hdr.dst_port == +UINT16_MAX ) + input_set |= +ICE_INSET_TUN_UDP_DST_PORT;Quoted 47 lines
drivers/net/ice/ice_switch_filter.c +47
-0+ }else { +if (udp_mask->hdr.src_port == +UINT16_MAX ) + input_set |= +ICE_INSET_UDP_SRC_PORT ; +if (udp_mask->hdr.dst_port == +UINT16_MAX ) + input_set |= +ICE_INSET_UDP_DST_PORT ; + } +if (tun_type ==ICE_SW_TUN_VXLAN && + tunnel_valid ==0 ) + list[t].type =ICE_UDP_OF ; +else + list[t].type =ICE_UDP_ILOS ; +if (udp_mask->hdr.src_port ==UINT16_MAX ) { + list[t].h_u.l4_hdr.src_port = + udp_spec->hdr.src_port; + list[t].m_u.l4_hdr.src_port = + udp_mask->hdr.src_port; + } +if (udp_mask->hdr.dst_port ==UINT16_MAX ) { + list[t].h_u.l4_hdr.dst_port = + udp_spec->hdr.dst_port; + list[t].m_u.l4_hdr.dst_port = + udp_mask->hdr.dst_port; + } + t++; + }else if (!udp_spec && !udp_mask) { + list[t].type =ICE_UDP_ILOS ; + } +break ; + +case RTE_FLOW_ITEM_TYPE_TCP : + tcp_spec = item->spec; + tcp_mask = item->mask; +if (tcp_spec && tcp_mask) { +/* Check TCP mask and update input set */ +if (tcp_mask->hdr.sent_seq || + tcp_mask->hdr.recv_ack || + tcp_mask->hdr.data_off || + tcp_mask->hdr.tcp_flags || + tcp_mask->hdr.rx_win || + tcp_mask->hdr.cksum || + tcp_mask->hdr.tcp_urp) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM,drivers/net/ice/ice_switch_filter.c line 716
Quoted 10 lines
drivers/net/ice/ice_switch_filter.c +10
-0+ item, + "Invalid TCP mask"); +return 0 ; + } + +if (tunnel_valid) { +if (tcp_mask->hdr.src_port == +UINT16_MAX ) + input_set |= +ICE_INSET_TUN_TCP_SRC_PORT;drivers/net/ice/ice_switch_filter.c line 716
Quoted 4 lines
drivers/net/ice/ice_switch_filter.c +4
-0+if (tcp_mask->hdr.dst_port == +UINT16_MAX ) + input_set |= +ICE_INSET_TUN_TCP_DST_PORT;Quoted 37 lines
drivers/net/ice/ice_switch_filter.c +37
-0+ }else { +if (tcp_mask->hdr.src_port == +UINT16_MAX ) + input_set |= +ICE_INSET_TCP_SRC_PORT ; +if (tcp_mask->hdr.dst_port == +UINT16_MAX ) + input_set |= +ICE_INSET_TCP_DST_PORT ; + } + list[t].type =ICE_TCP_IL ; +if (tcp_mask->hdr.src_port ==UINT16_MAX ) { + list[t].h_u.l4_hdr.src_port = + tcp_spec->hdr.src_port; + list[t].m_u.l4_hdr.src_port = + tcp_mask->hdr.src_port; + } +if (tcp_mask->hdr.dst_port ==UINT16_MAX ) { + list[t].h_u.l4_hdr.dst_port = + tcp_spec->hdr.dst_port; + list[t].m_u.l4_hdr.dst_port = + tcp_mask->hdr.dst_port; + } + t++; + }else if (!tcp_spec && !tcp_mask) { + list[t].type =ICE_TCP_IL ; + } +break ; + +case RTE_FLOW_ITEM_TYPE_SCTP : + sctp_spec = item->spec; + sctp_mask = item->mask; +if (sctp_spec && sctp_mask) { +/* Check SCTP mask and update input set */ +if (sctp_mask->hdr.cksum) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM,drivers/net/ice/ice_switch_filter.c line 767
Quoted 10 lines
drivers/net/ice/ice_switch_filter.c +10
-0+ item, + "Invalid SCTP mask"); +return 0 ; + } + +if (tunnel_valid) { +if (sctp_mask->hdr.src_port == +UINT16_MAX ) + input_set |= +ICE_INSET_TUN_SCTP_SRC_PORT;drivers/net/ice/ice_switch_filter.c line 767
Quoted 4 lines
drivers/net/ice/ice_switch_filter.c +4
-0+if (sctp_mask->hdr.dst_port == +UINT16_MAX ) + input_set |= +ICE_INSET_TUN_SCTP_DST_PORT;Quoted 313 lines
drivers/net/ice/ice_switch_filter.c +313
-0+ }else { +if (sctp_mask->hdr.src_port == +UINT16_MAX ) + input_set |= +ICE_INSET_SCTP_SRC_PORT ; +if (sctp_mask->hdr.dst_port == +UINT16_MAX ) + input_set |= +ICE_INSET_SCTP_DST_PORT ; + } + list[t].type =ICE_SCTP_IL ; +if (sctp_mask->hdr.src_port ==UINT16_MAX ) { + list[t].h_u.sctp_hdr.src_port = + sctp_spec->hdr.src_port; + list[t].m_u.sctp_hdr.src_port = + sctp_mask->hdr.src_port; + } +if (sctp_mask->hdr.dst_port ==UINT16_MAX ) { + list[t].h_u.sctp_hdr.dst_port = + sctp_spec->hdr.dst_port; + list[t].m_u.sctp_hdr.dst_port = + sctp_mask->hdr.dst_port; + } + t++; + }else if (!sctp_spec && !sctp_mask) { + list[t].type =ICE_SCTP_IL ; + } +break ; + +case RTE_FLOW_ITEM_TYPE_VXLAN : + vxlan_spec = item->spec; + vxlan_mask = item->mask; +/* Check if VXLAN item is used to describe protocol. +* If yes, both spec and mask should be NULL. +* If no, both spec and mask shouldn't be NULL. +*/ +if ((!vxlan_spec && vxlan_mask) || + (vxlan_spec && !vxlan_mask)) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"Invalid VXLAN item" ); +return 0 ; + } + + tunnel_valid =1 ; +if (vxlan_spec && vxlan_mask) { + list[t].type =ICE_VXLAN ; +if (vxlan_mask->vni[0 ] ==UINT8_MAX && + vxlan_mask->vni[1 ] ==UINT8_MAX && + vxlan_mask->vni[2 ] ==UINT8_MAX ) { + list[t].h_u.tnl_hdr.vni = + (vxlan_spec->vni[2 ] <<16 ) | + (vxlan_spec->vni[1 ] <<8 ) | + vxlan_spec->vni[0 ]; + list[t].m_u.tnl_hdr.vni = +UINT32_MAX ; + input_set |= +ICE_INSET_TUN_VXLAN_VNI ; + } + t++; + }else if (!vxlan_spec && !vxlan_mask) { + list[t].type =ICE_VXLAN ; + } +break ; + +case RTE_FLOW_ITEM_TYPE_NVGRE : + nvgre_spec = item->spec; + nvgre_mask = item->mask; +/* Check if NVGRE item is used to describe protocol. +* If yes, both spec and mask should be NULL. +* If no, both spec and mask shouldn't be NULL. +*/ +if ((!nvgre_spec && nvgre_mask) || + (nvgre_spec && !nvgre_mask)) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"Invalid NVGRE item" ); +return 0 ; + } + tunnel_valid =1 ; +if (nvgre_spec && nvgre_mask) { + list[t].type =ICE_NVGRE ; +if (nvgre_mask->tni[0 ] ==UINT8_MAX && + nvgre_mask->tni[1 ] ==UINT8_MAX && + nvgre_mask->tni[2 ] ==UINT8_MAX ) { + list[t].h_u.nvgre_hdr.tni_flow = + (nvgre_spec->tni[2 ] <<16 ) | + (nvgre_spec->tni[1 ] <<8 ) | + nvgre_spec->tni[0 ]; + list[t].m_u.nvgre_hdr.tni_flow = +UINT32_MAX ; + input_set |= +ICE_INSET_TUN_NVGRE_TNI ; + } + t++; + }else if (!nvgre_spec && !nvgre_mask) { + list[t].type =ICE_NVGRE ; + } +break ; + +case RTE_FLOW_ITEM_TYPE_VLAN : + vlan_spec = item->spec; + vlan_mask = item->mask; +/* Check if VLAN item is used to describe protocol. +* If yes, both spec and mask should be NULL. +* If no, both spec and mask shouldn't be NULL. +*/ +if ((!vlan_spec && vlan_mask) || + (vlan_spec && !vlan_mask)) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"Invalid VLAN item" ); +return 0 ; + } +if (vlan_spec && vlan_mask) { + list[t].type =ICE_VLAN_OFOS ; +if (vlan_mask->tci ==UINT16_MAX ) { + list[t].h_u.vlan_hdr.vlan = + vlan_spec->tci; + list[t].m_u.vlan_hdr.vlan = +UINT16_MAX ; + input_set |=ICE_INSET_VLAN_OUTER ; + } +if (vlan_mask->inner_type ==UINT16_MAX ) { + list[t].h_u.vlan_hdr.type = + vlan_spec->inner_type; + list[t].m_u.vlan_hdr.type = +UINT16_MAX ; + input_set |=ICE_INSET_VLAN_OUTER ; + } + t++; + }else if (!vlan_spec && !vlan_mask) { + list[t].type =ICE_VLAN_OFOS ; + } +break ; + +case RTE_FLOW_ITEM_TYPE_PPPOED : +case RTE_FLOW_ITEM_TYPE_PPPOES : + pppoe_spec = item->spec; + pppoe_mask = item->mask; +/* Check if PPPoE item is used to describe protocol. +* If yes, both spec and mask should be NULL. +*/ +if (pppoe_spec || pppoe_mask) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"Invalid pppoe item" ); +return 0 ; + } +break ; + +case RTE_FLOW_ITEM_TYPE_VOID : +break ; + +default : +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , pattern, +"Invalid pattern item." ); + goto out; + } + } + + *lkups_num = t; + +return input_set; +out: +return 0 ; +} + + +static int +ice_switch_parse_action (struct ice_pf *pf, +const struct rte_flow_action *actions, +struct rte_flow_error *error, +struct ice_adv_rule_info *rule_info) { +struct ice_vsi *vsi = pf->main_vsi; +struct rte_eth_dev *dev = pf->adapter->eth_dev; +const struct rte_flow_action_queue *act_q; +const struct rte_flow_action_rss *act_qgrop; +uint16_t base_queue, i; +const struct rte_flow_action *action; +enum rte_flow_action_type action_type; +uint16_t valid_qgrop_number[MAX_QGRP_NUM_TYPE ] = { +2 ,4 ,8 ,16 ,32 ,64 ,128 }; + + base_queue = pf->base_queue; +for (action = actions; action->type != +RTE_FLOW_ACTION_TYPE_END ; action++) { + action_type = action->type; +switch (action_type) { +case RTE_FLOW_ACTION_TYPE_RSS : + act_qgrop = action->conf; + rule_info->sw_act.fltr_act = +ICE_FWD_TO_QGRP ; + rule_info->sw_act.fwd_id.q_id = + base_queue + act_qgrop->queue[0 ]; +for (i =0 ; i <MAX_QGRP_NUM_TYPE ; i++) { +if (act_qgrop->queue_num == + valid_qgrop_number[i]) +break ; + } +if (i ==MAX_QGRP_NUM_TYPE ) + goto error; +if ((act_qgrop->queue[0 ] + + act_qgrop->queue_num) > + dev->data->nb_rx_queues) + goto error; +for (i =0 ; i < act_qgrop->queue_num -1 ; i++) +if (act_qgrop->queue[i +1 ] != + act_qgrop->queue[i] +1 ) + goto error; + rule_info->sw_act.qgrp_size = + act_qgrop->queue_num; +break ; +case RTE_FLOW_ACTION_TYPE_QUEUE : + act_q = action->conf; +if (act_q->index >= dev->data->nb_rx_queues) + goto error; + rule_info->sw_act.fltr_act = +ICE_FWD_TO_Q ; + rule_info->sw_act.fwd_id.q_id = + base_queue + act_q->index; +break ; + +case RTE_FLOW_ACTION_TYPE_DROP : + rule_info->sw_act.fltr_act = +ICE_DROP_PACKET ; +break ; + +case RTE_FLOW_ACTION_TYPE_VOID : +break ; + +default : + goto error; + } + } + + rule_info->sw_act.vsi_handle = vsi->idx; + rule_info->rx =1 ; + rule_info->sw_act.src = vsi->idx; + rule_info->priority =5 ; + +return 0 ; + +error: +rte_flow_error_set (error, +EINVAL ,RTE_FLOW_ERROR_TYPE_ACTION , + actions, +"Invalid action type or queue number" ); +return -rte_errno; +} + +static int +ice_switch_parse_pattern_action (struct ice_adapter *ad, +struct ice_pattern_match_item *array, +uint32_t array_len, +const struct rte_flow_item pattern[], +const struct rte_flow_action actions[], +void **meta, +struct rte_flow_error *error) +{ +struct ice_pf *pf = &ad->pf; +uint64_t inputset =0 ; +int ret =0 ; +struct sw_meta *sw_meta_ptr =NULL ; +struct ice_adv_rule_info rule_info; +struct ice_adv_lkup_elem *list =NULL ; +uint16_t lkups_num =0 ; +const struct rte_flow_item *item = pattern; +uint16_t item_num =0 ; +enum ice_sw_tunnel_type tun_type =ICE_NON_TUN ; +struct ice_pattern_match_item *pattern_match_item =NULL ; + +for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) { + item_num++; +if (item->type ==RTE_FLOW_ITEM_TYPE_VXLAN ) + tun_type =ICE_SW_TUN_VXLAN ; +if (item->type ==RTE_FLOW_ITEM_TYPE_NVGRE ) + tun_type =ICE_SW_TUN_NVGRE ; +if (item->type ==RTE_FLOW_ITEM_TYPE_PPPOED || + item->type ==RTE_FLOW_ITEM_TYPE_PPPOES ) + tun_type =ICE_SW_TUN_PPPOE ; +if (item->type ==RTE_FLOW_ITEM_TYPE_ETH ) { +const struct rte_flow_item_eth *eth_mask; +if (item->mask) + eth_mask = item->mask; +else +continue ; +if (eth_mask->type ==UINT16_MAX ) + tun_type =ICE_SW_TUN_AND_NON_TUN ; + } +/* reserve one more memory slot for ETH which may +* consume 2 lookup items. +*/ +if (item->type ==RTE_FLOW_ITEM_TYPE_ETH ) + item_num++; + } + + list =rte_zmalloc (NULL , item_num *sizeof (*list),0 ); +if (!list) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , +"No memory for PMD internal items" ); +return -rte_errno; + } + + rule_info.tun_type = tun_type; + + sw_meta_ptr =drivers/net/ice/ice_switch_filter.c
Quoted 10 lines
drivers/net/ice/ice_switch_filter.c +10
-0+rte_zmalloc (NULL ,sizeof (*sw_meta_ptr),0 ); +if (!sw_meta_ptr) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , +"No memory for sw_pattern_meta_ptr" ); + goto error; + } + + pattern_match_item = + ice_search_pattern_match_item(pattern, array, array_len,error);
Quoted 144 lines
drivers/net/ice/ice_switch_filter.c +130
-0+if (!pattern_match_item) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , +"Invalid input pattern" ); + goto error; + } + + inputset =ice_switch_inset_get + (pattern, error, list, &lkups_num, tun_type); +if (!inputset || (inputset & ~pattern_match_item->input_set_mask)) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM_SPEC , + pattern, +"Invalid input set" ); + goto error; + } + + ret =ice_switch_parse_action (pf, actions, error, &rule_info); +if (ret) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , +"Invalid input action" ); + goto error; + } + *meta = sw_meta_ptr; + ((struct sw_meta *)*meta)->list = list; + ((struct sw_meta *)*meta)->lkups_num = lkups_num; + ((struct sw_meta *)*meta)->rule_info = rule_info; +rte_free (pattern_match_item); + +return 0 ; + +error: +rte_free (list); +rte_free (sw_meta_ptr); +rte_free (pattern_match_item); + +return -rte_errno; +} + +static int +ice_switch_query(struct ice_adapter *ad __rte_unused, + struct rte_flow *flow __rte_unused, + struct rte_flow_query_count *count __rte_unused, +struct rte_flow_error *error) +{ +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_HANDLE , +NULL , +"count action not supported by switch filter" ); + +return -rte_errno; +} + +static int +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; + +if (ad->active_pkg_type ==ICE_PKG_TYPE_COMMS ) + dist_parser = &ice_switch_dist_parser_comms; +else + dist_parser = &ice_switch_dist_parser_os; + +if (ad->devargs.pipe_mode_support) + ret =ice_register_parser (perm_parser, ad); +else + ret =ice_register_parser (dist_parser, ad); +return ret; +} + +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; + +if (ad->active_pkg_type ==ICE_PKG_TYPE_COMMS ) + dist_parser = &ice_switch_dist_parser_comms; +else + dist_parser = &ice_switch_dist_parser_os; + +if (ad->devargs.pipe_mode_support) +ice_unregister_parser (perm_parser, ad); +else +ice_unregister_parser (dist_parser, ad); } + +static struct +ice_flow_engine ice_switch_engine = { + .init = ice_switch_init, + .uninit = ice_switch_uninit, + .create = ice_switch_create, + .destroy = ice_switch_destroy, + .query_count = ice_switch_query, + .free = ice_switch_filter_rule_free, + .type =ICE_FLOW_ENGINE_SWITCH , +}; + +static struct +ice_flow_parser ice_switch_dist_parser_os = { + .engine = &ice_switch_engine, + .array = ice_switch_pattern_dist_os, + .array_len =RTE_DIM (ice_switch_pattern_dist_os), + .parse_pattern_action = ice_switch_parse_pattern_action, + .stage =ICE_FLOW_STAGE_DISTRIBUTOR , +}; + +static struct +ice_flow_parser ice_switch_dist_parser_comms = { + .engine = &ice_switch_engine, + .array = ice_switch_pattern_dist_comms, + .array_len =RTE_DIM (ice_switch_pattern_dist_comms), + .parse_pattern_action = ice_switch_parse_pattern_action, + .stage =ICE_FLOW_STAGE_DISTRIBUTOR , +}; + +static struct +ice_flow_parser ice_switch_perm_parser = { + .engine = &ice_switch_engine, + .array = ice_switch_pattern_perm, + .array_len =RTE_DIM (ice_switch_pattern_perm), + .parse_pattern_action = ice_switch_parse_pattern_action, + .stage =ICE_FLOW_STAGE_PERMISSION , +}; + +RTE_INIT (ice_sw_engine_init) +{ +struct ice_flow_engine *engine = &ice_switch_engine; +ice_register_flow_engine (engine); +}drivers/net/ice/ice_switch_filter.h deleted +0
-5@@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2019 Intel Corporation -*/ - --2.15.1
Quoted 37 lines · Ying Wang
patch 1/5 minor code clean
patch 2/5 adds devargs to control pipeline mode patch 3/5 rework for ice generic flow framework patch 4/5 addrte_flowpattern list
patch 5/5 rework switch filter on new frameworkQiming Yang (1):
net/ice: add devargs to control pipeline modeYing Wang (3):
net/ice: minor code clean
net/ice: rework for generic flow enabling net/ice: add pattern manifestwei zhao (1):
net/ice: rework switch filter---
v4: rebase patches to solve merge conflict;
fix patch 2/5 doc typo;v3: rebase patches to solve merge conflict;
redefine inpustet bit field;v2: modify codes according to the comments;
update doc and release note;
add a separate code clean patch;
---doc/guides/nics/ice.rst | 19 + doc/guides/rel_notes/release_19_11.rst | 3 + drivers/net/ice/ice_ethdev.c | 30 +- drivers/net/ice/ice_ethdev.h | 16 +- drivers/net/ice/ice_generic_flow.c | 2072 +++++++++++++++++++++++++------- drivers/net/ice/ice_generic_flow.h | 1042 +++++++--------- drivers/net/ice/ice_switch_filter.c | 927 ++++++++++++-- drivers/net/ice/ice_switch_filter.h | 24 - 8 files changed, 2953 insertions(+), 1180 deletions(-)
Quoted 5 lines
delete mode 100644
drivers/net/ice/ice_switch_filter.hSignature · 1 line
2.15.1
For series:
PATCH v3 2/5 net/ice: add devargs to control pipeline mode
In reply to Ying WangFrom: Qiming Yang <[email protected]>
Added a devarg to control the mode in generic flow API. We use none-pipeline mode by default.
--- doc/guides/nics/ice.rst | 19 +++++++++++++++++++ doc/guides/rel_notes/release_19_11.rst | 2 ++ drivers/net/ice/ice_ethdev.c | 10 +++++++++- drivers/net/ice/ice_ethdev.h | 1 + 4 files changed, 31 insertions(+), 1 deletion(-)
doc/guides/nics/ice.rst +19 -0
@@ -61,6 +61,25 @@ Runtime Config Options NOTE: In Safe mode, only very limited features are available, features like RSS, checksum, fdir, tunneling ... are all disabled. +- ``Generic Flow Pipeline Mode Support`` (default ``0``) + + In pipeline mode, a flow can be set at one specific stage by setting parameter + ``priority``. Currently, we support two stages: priority = 0 or !0. Flows with + priority 0 located at the first pipeline stage which typically be used as a firewall + to drop the packet on a blacklist(we called it permission stage). At this stage, + flow rules are created for the device's exact match engine: switch. Flows with priority + !0 located at the second stage, typically packets are classified here and be steered to + specific queue or queue group (we called it distribution stage), At this stage, flow + rules are created for device's flow director engine. + For none-pipeline mode, ``priority`` is ignored, a flow rule can be created as a flow director + rule or a switch rule depends on its pattern/action and the resource allocation situation, + all flows are virtually at the same pipeline stage. + By default, generic flow API is enabled in none-pipeline mode, user can choose to + use pipeline mode by setting ``devargs`` parameter ``pipeline-mode-support``, + for example:: + + -w 80:00.0,pipleline-mode-support=1 + - ``Protocol extraction for per queue`` Configure the RX queues to do protocol extraction into ``rte_mbuf::udata64``
doc/guides/rel_notes/release_19_11.rst +2 -0
@@ -63,6 +63,8 @@ New Features * Added support for device-specific DDP package loading. * Added support for handling Receive Flex Descriptor. * Added support for protocol extraction on per Rx queue. + * Generic filter enhancement + - Supported pipeline mode. Removed Items -------------
drivers/net/ice/ice_ethdev.c +9 -1
@@ -19,10 +19,12 @@/* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support" +#define ICE_PIPELINE_MODE_SUPPORT_ARG "pipeline-mode-support"#define ICE_PROTO_XTR_ARG "proto_xtr"static const char *const ice_valid_args[] = {ICE_SAFE_MODE_SUPPORT_ARG , +ICE_PIPELINE_MODE_SUPPORT_ARG ,ICE_PROTO_XTR_ARG ,NULL };
@@ -1806,6 +1808,11 @@ static int ice_parse_devargs(struct rte_eth_dev *dev) ret =rte_kvargs_process (kvlist,ICE_SAFE_MODE_SUPPORT_ARG , &parse_bool, &ad->devargs.safe_mode_support); +if (ret) + goto bail; + + ret =rte_kvargs_process (kvlist,ICE_PIPELINE_MODE_SUPPORT_ARG , + &parse_bool, &ad->devargs.pipe_mode_support); bail:rte_kvargs_free (kvlist);
@@ -4271,7 +4278,8 @@ RTE_PMD_REGISTER_PCI_TABLE(net_ice, pci_id_ice_map);RTE_PMD_REGISTER_KMOD_DEP (net_ice,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (net_ice,ICE_PROTO_XTR_ARG "=[queue:]<vlan|ipv4|ipv6|ipv6_flow|tcp>" -ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>" ); +ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>" +ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>" );RTE_INIT (ice_init_log) {
drivers/net/ice/ice_ethdev.h +1 -0
@@ -288,6 +288,7 @@ struct ice_pf {*/ struct ice_devargs {int safe_mode_support; +int pipe_mode_support;uint8_t proto_xtr[ICE_MAX_QUEUE_NUM ]; };
Signature · 1 line
2.15.1
PATCH v3 3/5 net/ice: rework for generic flow enabling
In reply to Ying WangThe patch reworks the generic flow API (rte_flow) implementation. It introduces an abstract layer which provides a unified interface for low-level filter engine (switch, fdir, hash) to register supported patterns and actions and implement flow validate/create/destroy/flush/ query activities.
The patch also removes the existing switch filter implementation to avoid compile error. Switch filter implementation for the new framework will be added in the following patch.
--- drivers/net/ice/ice_ethdev.c | 21 +- drivers/net/ice/ice_ethdev.h | 15 +- drivers/net/ice/ice_generic_flow.c | 746 ++++++++++++++---------------- drivers/net/ice/ice_generic_flow.h | 885 +++++++++++------------------------- drivers/net/ice/ice_switch_filter.c | 512 --------------------- drivers/net/ice/ice_switch_filter.h | 20 - 6 files changed, 633 insertions(+), 1566 deletions(-)
drivers/net/ice/ice_ethdev.c +10 -11
@@ -15,7 +15,7 @@#include "base/ice_dcb.h" #include "ice_ethdev.h" #include "ice_rxtx.h" -#include "ice_switch_filter.h" +#include "ice_generic_flow.h" /* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support"
@@ -1977,7 +1977,11 @@ ice_dev_init(struct rte_eth_dev *dev)/* get base queue pairs index in the device */ ice_base_queue_get (pf); -TAILQ_INIT (&pf->flow_list); + ret =ice_flow_init (ad); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to initialize flow" ); +return ret; + }return 0 ;
@@ -2097,6 +2101,8 @@ ice_dev_close(struct rte_eth_dev *dev) {struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private);struct ice_hw *hw =ICE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct ice_adapter *ad = +ICE_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private);/* Since stop will make link down, then the link event will be * triggered, disable the irq firstly to avoid the port_infoe etc
@@ -2107,6 +2113,8 @@ ice_dev_close(struct rte_eth_dev *dev)ice_dev_stop (dev); +ice_flow_uninit (ad); +/* release all queue resource */ ice_free_queues (dev);
@@ -2125,8 +2133,6 @@ ice_dev_uninit(struct rte_eth_dev *dev) {struct rte_pci_device *pci_dev =RTE_ETH_DEV_TO_PCI (dev);struct rte_intr_handle *intr_handle = &pci_dev->intr_handle; -struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private); -struct rte_flow *p_flow;if (rte_eal_process_type () !=RTE_PROC_PRIMARY )return 0 ;
@@ -2147,13 +2153,6 @@ ice_dev_uninit(struct rte_eth_dev *dev)rte_intr_callback_unregister (intr_handle, ice_interrupt_handler, dev); -/* Remove all flows */ -while ((p_flow =TAILQ_FIRST (&pf->flow_list))) { -TAILQ_REMOVE (&pf->flow_list, p_flow, node); -ice_free_switch_filter_rule (p_flow->rule); -rte_free (p_flow); - } -return 0 ; }
drivers/net/ice/ice_ethdev.h +7 -8
@@ -241,16 +241,12 @@ struct ice_vsi {bool offset_loaded; }; -extern const struct rte_flow_ops ice_flow_ops; - -/* Struct to store flow created. */ -struct rte_flow { -TAILQ_ENTRY (rte_flow) node; -void *rule; -}; - +struct rte_flow ;TAILQ_HEAD (ice_flow_list, rte_flow); +struct ice_flow_parser_node ; +TAILQ_HEAD (ice_parser_list, ice_flow_parser_node); +struct ice_pf {struct ice_adapter *adapter;/* The adapter this PF associate to */ struct ice_vsi *main_vsi;/* pointer to main VSI structure */
@@ -279,6 +275,9 @@ struct ice_pf {bool offset_loaded;bool adapter_stopped;struct ice_flow_list flow_list; +struct ice_parser_list rss_parser_list; +struct ice_parser_list perm_parser_list; +struct ice_parser_list dist_parser_list; };#define ICE_MAX_QUEUE_NUM 2048
drivers/net/ice/ice_generic_flow.c +342 -404
870 lines not on this page · raw message
drivers/net/ice/ice_generic_flow.h +274 -611
889 lines not on this page · raw message
drivers/net/ice/ice_switch_filter.c +0 -512
515 lines not on this page · raw message
drivers/net/ice/ice_switch_filter.h +0 -20
@@ -2,23 +2,3 @@* Copyright(c) 2019 Intel Corporation */ -#ifndef _ICE_SWITCH_FILTER_H_ -#define _ICE_SWITCH_FILTER_H_ - -#include "base/ice_switch.h" -#include "base/ice_type.h" -#include "ice_ethdev.h" - -int -ice_create_switch_filter (struct ice_pf *pf, -const struct rte_flow_item pattern[], -const struct rte_flow_action actions[], -struct rte_flow *flow, -struct rte_flow_error *error); -int -ice_destroy_switch_filter (struct ice_pf *pf, -struct rte_flow *flow, -struct rte_flow_error *error); -void -ice_free_switch_filter_rule (void *rule); -#endif /* _ICE_SWITCH_FILTER_H_ */
Signature · 1 line
2.15.1
PATCH v3 4/5 net/ice: add pattern manifest
In reply to Ying WangThe patch adds a manifest for all patterns which can be selected by low level filter engine to compose their supported list.
--- drivers/net/ice/ice_generic_flow.c | 1287 ++++++++++++++++++++++++++++++++++++ drivers/net/ice/ice_generic_flow.h | 201 ++++++ 2 files changed, 1488 insertions(+)
drivers/net/ice/ice_generic_flow.c +1287 -0
@@ -60,6 +60,1293 @@ const struct rte_flow_ops ice_flow_ops = { .query = ice_flow_query, }; +/* empty */ +enum rte_flow_item_type pattern_empty[] = { +RTE_FLOW_ITEM_TYPE_END , +}; + +/* L2 */ +enum rte_flow_item_type pattern_ethertype[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_ethertype_vlan[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_ethertype_qinq[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* ARP */ +enum rte_flow_item_type pattern_eth_arp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_ARP_ETH_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* non-tunnel IPv4 */ +enum rte_flow_item_type pattern_eth_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* non-tunnel IPv6 */ +enum rte_flow_item_type pattern_eth_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 VXLAN IPv4 */ +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 VXLAN MAC IPv4 */ +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 VXLAN IPv4 */ +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 VXLAN MAC IPv4 */ +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 VXLAN IPv6 */ +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 VXLAN MAC IPv6 */ +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 VXLAN IPv6 */ +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 VXLAN MAC IPv6 */ +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 NVGRE IPv4 */ +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 NVGRE MAC IPv4 */ +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 NVGRE IPv4 */ +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 NVGRE MAC IPv4 */ +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 NVGRE IPv6 */ +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 NVGRE MAC IPv6 */ +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 NVGRE IPv6 */ +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 NVGRE MAC IPv6 */ +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* GTPU */ +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[] = { +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_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_udp[] = { +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_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_tcp[] = { +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_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , + +}; +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_icmp[] = { +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_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* PPPoE */ +enum rte_flow_item_type pattern_eth_pppoed[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOED , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoed[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOED , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoed[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOED , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; +void ice_register_flow_engine (struct ice_flow_engine *engine) {
drivers/net/ice/ice_generic_flow.h +201 -0
207 lines not on this page · raw message
Signature · 1 line
2.15.1
PATCH v3 5/5 net/ice: rework switch filter
In reply to Ying WangFrom: wei zhao <[email protected]>
The patch reworks packet process engine's binary classifier (switch) for the new framework. It also adds support for new packet type like PPPoE for switch filter.
--- doc/guides/rel_notes/release_19_11.rst | 1 + drivers/net/ice/ice_switch_filter.c | 1182 ++++++++++++++++++++++++++++++++ drivers/net/ice/ice_switch_filter.h | 4 - 3 files changed, 1183 insertions(+), 4 deletions(-) delete mode 100644 drivers/net/ice/ice_switch_filter.h
doc/guides/rel_notes/release_19_11.rst +1 -0
@@ -65,6 +65,7 @@ New Features * Added support for protocol extraction on per Rx queue. * Generic filter enhancement - Supported pipeline mode. + - Supported new packet type like PPPoE for switch filter. Removed Items -------------
drivers/net/ice/ice_switch_filter.c +1182 -0
1,185 lines not on this page · raw message
drivers/net/ice/ice_switch_filter.h deleted +0 -4
@@ -1,4 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2019 Intel Corporation -*/ -
Signature · 1 line
2.15.1
Quoted 52 lines
-----Original Message-----
From: Wang, Ying A
Sent: Friday, September 27, 2019 2:55 AM
To: Ye, Xiaolong <[email protected]>; Zhang, Qi Z <[email protected]>
Cc: [email protected]; Yang, Qiming <[email protected]>; Zhao1, Wei <[email protected]>; Wang, Ying A <[email protected]>
Subject: [PATCH v3 0/5] rework for ice generic flow framework and switch filterpatch 1/5 minor code clean
patch 2/5 adds devargs to control pipeline mode patch 3/5 rework for ice generic flow framework patch 4/5 addrte_flowpattern list patch 5/5 rework switch filter on new frameworkThe patchset depend on the following patches in patchwork:
(1) http://patches.dpdk.org/patch/58102/
[v4,1/2] ethdev: add GTP extension header to flow API
(2) http://patches.dpdk.org/patch/58103/
[v4,2/2] ethdev: add PPPoE to flow APIQiming Yang (1):
net/ice: add devargs to control pipeline modeYing Wang (3):
net/ice: minor code clean
net/ice: rework for generic flow enabling
net/ice: add pattern manifestwei zhao (1):
net/ice: rework switch filter---
v3: rebase patches to solve merge conflict;redefine inpustet bit field;v2: modify codes according to the comments;
update doc and release note; add a separate code clean patch;---
doc/guides/nics/ice.rst | 19 + doc/guides/rel_notes/release_19_11.rst | 3 + drivers/net/ice/ice_ethdev.c | 31 +- drivers/net/ice/ice_ethdev.h | 16 +- drivers/net/ice/ice_generic_flow.c | 2072 +++++++++++++++++++++++++------- drivers/net/ice/ice_generic_flow.h | 1042 +++++++--------- drivers/net/ice/ice_switch_filter.c | 918 ++++++++++++-- drivers/net/ice/ice_switch_filter.h | 24 - 8 files changed, 2944 insertions(+), 1181 deletions(-) delete mode 100644
Quoted 4 lines
drivers/net/ice/ice_switch_filter.h--
2.15.1
PATCH v2 2/5 net/ice: add devargs to control pipeline mode
In reply to Ying WangFrom: Qiming Yang <[email protected]>
Added a devarg to control the mode in generic flow API. We use none-pipeline mode by default.
--- doc/guides/nics/ice.rst | 19 +++++++++++++++++++ doc/guides/rel_notes/release_19_11.rst | 2 ++ drivers/net/ice/ice_ethdev.c | 11 ++++++++++- drivers/net/ice/ice_ethdev.h | 1 + 4 files changed, 32 insertions(+), 1 deletion(-)
doc/guides/nics/ice.rst +19 -0
@@ -61,6 +61,25 @@ Runtime Config Options NOTE: In Safe mode, only very limited features are available, features like RSS, checksum, fdir, tunneling ... are all disabled. +- ``Generic Flow Pipeline Mode Support`` (default ``0``) + + In pipeline mode, a flow can be set at one specific stage by setting parameter + ``priority``. Currently, we support two stages: priority = 0 or !0. Flows with + priority 0 located at the first pipeline stage which typically be used as a firewall + to drop the packet on a blacklist(we called it permission stage). At this stage, + flow rules are created for the device's exact match engine: switch. Flows with priority + !0 located at the second stage, typically packets are classified here and be steered to + specific queue or queue group (we called it distribution stage), At this stage, flow + rules are created for device's flow director engine. + For none-pipeline mode, ``priority`` is ignored, a flow rule can be created as a flow director + rule or a switch rule depends on its pattern/action and the resource allocation situation, + all flows are virtually at the same pipeline stage. + By default, generic flow API is enabled in none-pipeline mode, user can choose to + use pipeline mode by setting ``devargs`` parameter ``pipeline-mode-support``, + for example:: + + -w 80:00.0,pipleline-mode-support=1 + Driver compilation and testing ------------------------------
doc/guides/rel_notes/release_19_11.rst +2 -0
@@ -61,6 +61,8 @@ New Features Updated the Intel ice driver with new features and improvements, including: * Supported device-specific DDP package loading. + * Generic filter enhancement + - Supported pipeline mode. Removed Items -------------
drivers/net/ice/ice_ethdev.c +10 -1
@@ -19,9 +19,11 @@/* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support" +#define ICE_PIPELINE_MODE_SUPPORT_ARG "pipeline-mode-support"static const char *const ice_valid_args[] = {ICE_SAFE_MODE_SUPPORT_ARG , +ICE_PIPELINE_MODE_SUPPORT_ARG ,NULL };
@@ -1510,7 +1512,13 @@ static int ice_parse_devargs(struct rte_eth_dev *dev) ret =rte_kvargs_process (kvlist,ICE_SAFE_MODE_SUPPORT_ARG , &parse_bool, &ad->devargs.safe_mode_support); +if (ret) + goto err_devargs; + + ret =rte_kvargs_process (kvlist,ICE_PIPELINE_MODE_SUPPORT_ARG , + &parse_bool, &ad->devargs.pipeline_mode_support); +err_devargs:rte_kvargs_free (kvlist);return ret; }
@@ -3925,7 +3933,8 @@ RTE_PMD_REGISTER_PCI(net_ice, rte_ice_pmd);RTE_PMD_REGISTER_PCI_TABLE (net_ice, pci_id_ice_map);RTE_PMD_REGISTER_KMOD_DEP (net_ice,"* igb_uio | uio_pci_generic | vfio-pci" );RTE_PMD_REGISTER_PARAM_STRING (net_ice, -ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>" ); +ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>" +ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>" );RTE_INIT (ice_init_log) {
drivers/net/ice/ice_ethdev.h +1 -0
@@ -285,6 +285,7 @@ struct ice_pf {*/ struct ice_devargs {int safe_mode_support; +int pipeline_mode_support; };/**
Signature · 1 line
2.15.1
PATCH v2 3/5 net/ice: rework for generic flow enabling
In reply to Ying WangThe patch reworks the generic flow API (rte_flow) implementation. It introduces an abstract layer which provides a unified interface for low-level filter engine (switch, fdir, hash) to register supported patterns and actions and implement flow validate/create/destroy/flush/ query activities.
The patch also removes the existing switch filter implementation to avoid compile error. Switch filter implementation for the new framework will be added in the following patch.
--- drivers/net/ice/ice_ethdev.c | 21 +- drivers/net/ice/ice_ethdev.h | 15 +- drivers/net/ice/ice_generic_flow.c | 747 ++++++++++++++++------------------ drivers/net/ice/ice_generic_flow.h | 785 ++++++++---------------------------- drivers/net/ice/ice_switch_filter.c | 511 ----------------------- drivers/net/ice/ice_switch_filter.h | 18 - 6 files changed, 534 insertions(+), 1563 deletions(-)
drivers/net/ice/ice_ethdev.c +10 -11
@@ -15,7 +15,7 @@#include "base/ice_dcb.h" #include "ice_ethdev.h" #include "ice_rxtx.h" -#include "ice_switch_filter.h" +#include "ice_generic_flow.h" /* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support"
@@ -1672,7 +1672,11 @@ ice_dev_init(struct rte_eth_dev *dev)/* get base queue pairs index in the device */ ice_base_queue_get (pf); -TAILQ_INIT (&pf->flow_list); + ret =ice_flow_init (ad); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to initialize flow" ); +return ret; + }return 0 ;
@@ -1791,6 +1795,8 @@ ice_dev_close(struct rte_eth_dev *dev) {struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private);struct ice_hw *hw =ICE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct ice_adapter *ad = +ICE_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private);/* Since stop will make link down, then the link event will be * triggered, disable the irq firstly to avoid the port_infoe etc
@@ -1801,6 +1807,8 @@ ice_dev_close(struct rte_eth_dev *dev)ice_dev_stop (dev); +ice_flow_uninit (ad); +/* release all queue resource */ ice_free_queues (dev);
@@ -1817,8 +1825,6 @@ ice_dev_uninit(struct rte_eth_dev *dev) {struct rte_pci_device *pci_dev =RTE_ETH_DEV_TO_PCI (dev);struct rte_intr_handle *intr_handle = &pci_dev->intr_handle; -struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private); -struct rte_flow *p_flow;ice_dev_close (dev);
@@ -1836,13 +1842,6 @@ ice_dev_uninit(struct rte_eth_dev *dev)rte_intr_callback_unregister (intr_handle, ice_interrupt_handler, dev); -/* Remove all flows */ -while ((p_flow =TAILQ_FIRST (&pf->flow_list))) { -TAILQ_REMOVE (&pf->flow_list, p_flow, node); -ice_free_switch_filter_rule (p_flow->rule); -rte_free (p_flow); - } -return 0 ; }
drivers/net/ice/ice_ethdev.h +7 -8
@@ -241,16 +241,12 @@ struct ice_vsi {bool offset_loaded; }; -extern const struct rte_flow_ops ice_flow_ops; - -/* Struct to store flow created. */ -struct rte_flow { -TAILQ_ENTRY (rte_flow) node; -void *rule; -}; - +struct rte_flow ;TAILQ_HEAD (ice_flow_list, rte_flow); +struct ice_flow_parser_node ; +TAILQ_HEAD (ice_parser_list, ice_flow_parser_node); +struct ice_pf {struct ice_adapter *adapter;/* The adapter this PF associate to */ struct ice_vsi *main_vsi;/* pointer to main VSI structure */
@@ -278,6 +274,9 @@ struct ice_pf {bool offset_loaded;bool adapter_stopped;struct ice_flow_list flow_list; +struct ice_parser_list rss_parser_list; +struct ice_parser_list perm_parser_list; +struct ice_parser_list dist_parser_list; };/**
drivers/net/ice/ice_generic_flow.c +343 -404
871 lines not on this page · raw message
drivers/net/ice/ice_generic_flow.h +174 -611
789 lines not on this page · raw message
drivers/net/ice/ice_switch_filter.c +0 -511
515 lines not on this page · raw message
drivers/net/ice/ice_switch_filter.h +0 -18
@@ -2,23 +2,5 @@* Copyright(c) 2019 Intel Corporation */ -#ifndef _ICE_SWITCH_FILTER_H_ -#define _ICE_SWITCH_FILTER_H_ -#include "base/ice_switch.h" -#include "base/ice_type.h" -#include "ice_ethdev.h" -int -ice_create_switch_filter (struct ice_pf *pf, -const struct rte_flow_item pattern[], -const struct rte_flow_action actions[], -struct rte_flow *flow, -struct rte_flow_error *error); -int -ice_destroy_switch_filter (struct ice_pf *pf, -struct rte_flow *flow, -struct rte_flow_error *error); -void -ice_free_switch_filter_rule (void *rule); -#endif /* _ICE_SWITCH_FILTER_H_ */
Signature · 1 line
2.15.1
PATCH v2 4/5 net/ice: add pattern manifest
In reply to Ying WangThe patch adds a manifest for all patterns which can be selected by low level filter engine to compose their supported list.
--- drivers/net/ice/ice_generic_flow.c | 1287 ++++++++++++++++++++++++++++++++++++ drivers/net/ice/ice_generic_flow.h | 200 ++++++ 2 files changed, 1487 insertions(+)
drivers/net/ice/ice_generic_flow.c +1287 -0
@@ -61,6 +61,1293 @@ const struct rte_flow_ops ice_flow_ops = { }; +/* empty */ +enum rte_flow_item_type pattern_empty[] = { +RTE_FLOW_ITEM_TYPE_END , +}; + +/* L2 */ +enum rte_flow_item_type pattern_ethertype[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_ethertype_vlan[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_ethertype_qinq[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* ARP */ +enum rte_flow_item_type pattern_eth_arp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_ARP_ETH_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* non-tunnel IPv4 */ +enum rte_flow_item_type pattern_eth_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* non-tunnel IPv6 */ +enum rte_flow_item_type pattern_eth_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 VXLAN IPv4 */ +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 VXLAN MAC IPv4 */ +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 VXLAN IPv4 */ +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 VXLAN MAC IPv4 */ +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 VXLAN IPv6 */ +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 VXLAN MAC IPv6 */ +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_udp_vxlan_eth_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 VXLAN IPv6 */ +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 VXLAN MAC IPv6 */ +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_udp_vxlan_eth_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_VXLAN , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 NVGRE IPv4 */ +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 NVGRE MAC IPv4 */ +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 NVGRE IPv4 */ +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 NVGRE MAC IPv4 */ +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 NVGRE IPv6 */ +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv4 NVGRE MAC IPv6 */ +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_nvgre_eth_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 NVGRE IPv6 */ +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* IPv6 NVGRE MAC IPv6 */ +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv6_nvgre_eth_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_NVGRE , +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* GTPU */ +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4[] = { +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_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_udp[] = { +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_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_tcp[] = { +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_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , + +}; +enum rte_flow_item_type pattern_eth_ipv4_gtpu_ipv4_icmp[] = { +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_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* PPPoE */ +enum rte_flow_item_type pattern_eth_pppoed[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOED , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoed[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOED , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoed[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOED , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv4_icmp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ICMP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6_udp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6_tcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_TCP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6_sctp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_SCTP , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_pppoes_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_vlan_pppoes_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type pattern_eth_qinq_pppoes_ipv6_icmp6[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_VLAN , +RTE_FLOW_ITEM_TYPE_PPPOES , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ICMP6 , +RTE_FLOW_ITEM_TYPE_END , +}; +void ice_register_flow_engine (struct ice_flow_engine *engine) {
drivers/net/ice/ice_generic_flow.h +200 -0
206 lines not on this page · raw message
Signature · 1 line
2.15.1
PATCH v2 5/5 net/ice: rework switch filter
In reply to Ying WangFrom: wei zhao <[email protected]>
The patch reworks packet process engine's binary classifier (switch) for the new framework. It also adds support for new packet type like PPPoE for switch filter.
--- doc/guides/rel_notes/release_19_11.rst | 1 + drivers/net/ice/ice_switch_filter.c | 1146 ++++++++++++++++++++++++++++++++ drivers/net/ice/ice_switch_filter.h | 6 - 3 files changed, 1147 insertions(+), 6 deletions(-) delete mode 100644 drivers/net/ice/ice_switch_filter.h
doc/guides/rel_notes/release_19_11.rst +1 -0
@@ -63,6 +63,7 @@ New Features * Supported device-specific DDP package loading. * Generic filter enhancement - Supported pipeline mode. + - Supported new packet type like PPPoE for switch filter. Removed Items -------------
drivers/net/ice/ice_switch_filter.c +1146 -0
1,150 lines not on this page · raw message
drivers/net/ice/ice_switch_filter.h deleted +0 -6
@@ -1,6 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2019 Intel Corporation -*/ - - -
Signature · 1 line
2.15.1
PATCH 2/4 net/ice: rework for generic flow enabling
In reply to Ying WangThe patch reworks the generic flow API (rte_flow) implementation. It introduces an abstract layer which provides a unified interface for low-level filter engine (switch, fdir, hash) to register supported patterns and actions and implement flow validate/create/destroy/flush/ query activities.
The patch also removes the existing switch filter implementation to avoid compile error. Switch filter implementation for the new framework will be added in the following patch.
--- drivers/net/ice/ice_ethdev.c | 22 +- drivers/net/ice/ice_ethdev.h | 15 +- drivers/net/ice/ice_generic_flow.c | 768 +++++++++++++++-------------------- drivers/net/ice/ice_generic_flow.h | 782 ++++++++---------------------------- drivers/net/ice/ice_switch_filter.c | 511 ----------------------- drivers/net/ice/ice_switch_filter.h | 18 - 6 files changed, 525 insertions(+), 1591 deletions(-)
drivers/net/ice/ice_ethdev.c +10 -12
@@ -15,7 +15,7 @@#include "base/ice_dcb.h" #include "ice_ethdev.h" #include "ice_rxtx.h" -#include "ice_switch_filter.h" +#include "ice_generic_flow.h" /* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support"
@@ -1677,7 +1677,11 @@ ice_dev_init(struct rte_eth_dev *dev)/* get base queue pairs index in the device */ ice_base_queue_get (pf); -TAILQ_INIT (&pf->flow_list); + ret =ice_flow_init (ad); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to initialize flow" ); +return ret; + }return 0 ;
@@ -1796,6 +1800,8 @@ ice_dev_close(struct rte_eth_dev *dev) {struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private);struct ice_hw *hw =ICE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct ice_adapter *ad = +ICE_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private);/* Since stop will make link down, then the link event will be * triggered, disable the irq firstly to avoid the port_infoe etc
@@ -1806,6 +1812,8 @@ ice_dev_close(struct rte_eth_dev *dev)ice_dev_stop (dev); +ice_flow_uninit (ad); +/* release all queue resource */ ice_free_queues (dev);
@@ -1822,8 +1830,6 @@ ice_dev_uninit(struct rte_eth_dev *dev) {struct rte_pci_device *pci_dev =RTE_ETH_DEV_TO_PCI (dev);struct rte_intr_handle *intr_handle = &pci_dev->intr_handle; -struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private); -struct rte_flow *p_flow;ice_dev_close (dev);
@@ -1840,14 +1846,6 @@ ice_dev_uninit(struct rte_eth_dev *dev)/* unregister callback func from eal lib */ rte_intr_callback_unregister (intr_handle, ice_interrupt_handler, dev); - -/* Remove all flows */ -while ((p_flow =TAILQ_FIRST (&pf->flow_list))) { -TAILQ_REMOVE (&pf->flow_list, p_flow, node); -ice_free_switch_filter_rule (p_flow->rule); -rte_free (p_flow); - } -return 0 ; }
drivers/net/ice/ice_ethdev.h +8 -7
@@ -241,16 +241,14 @@ struct ice_vsi {bool offset_loaded; }; -extern const struct rte_flow_ops ice_flow_ops; - -/* Struct to store flow created. */ -struct rte_flow { -TAILQ_ENTRY (rte_flow) node; -void *rule; -}; +struct rte_flow ;TAILQ_HEAD (ice_flow_list, rte_flow); + +struct ice_flow_parser ; +TAILQ_HEAD (ice_parser_list, ice_flow_parser); +struct ice_pf {struct ice_adapter *adapter;/* The adapter this PF associate to */ struct ice_vsi *main_vsi;/* pointer to main VSI structure */
@@ -278,6 +276,9 @@ struct ice_pf {bool offset_loaded;bool adapter_stopped;struct ice_flow_list flow_list; +struct ice_parser_list rss_parser_list; +struct ice_parser_list perm_parser_list; +struct ice_parser_list dist_parser_list; };/**
drivers/net/ice/ice_generic_flow.c +335 -433
915 lines not on this page · raw message
drivers/net/ice/ice_generic_flow.h +172 -610
787 lines not on this page · raw message
drivers/net/ice/ice_switch_filter.c +0 -511
515 lines not on this page · raw message
drivers/net/ice/ice_switch_filter.h +0 -18
@@ -2,23 +2,5 @@* Copyright(c) 2019 Intel Corporation */ -#ifndef _ICE_SWITCH_FILTER_H_ -#define _ICE_SWITCH_FILTER_H_ -#include "base/ice_switch.h" -#include "base/ice_type.h" -#include "ice_ethdev.h" -int -ice_create_switch_filter (struct ice_pf *pf, -const struct rte_flow_item pattern[], -const struct rte_flow_action actions[], -struct rte_flow *flow, -struct rte_flow_error *error); -int -ice_destroy_switch_filter (struct ice_pf *pf, -struct rte_flow *flow, -struct rte_flow_error *error); -void -ice_free_switch_filter_rule (void *rule); -#endif /* _ICE_SWITCH_FILTER_H_ */
Signature · 1 line
2.15.1
Re: [dpdk-dev] [PATCH 2/4] net/ice: rework for generic flow enabling
Quoted 11 lines · Ying Wang
The patch reworks the generic flow API (
rte_flow) implementation. It introduces an abstract layer which provides a unified interface for low-level filter engine (switch, fdir, hash) to register supported patterns and actions and implement flow validate/create/destroy/flush/ query activities.The patch also removes the existing switch filter implementation to avoid compile error. Switch filter implementation for the new framework will be added in the following patch.
Signed-off-by Ying Wang <[email protected]>
Quoted 8 lines
---
drivers/net/ice/ice_ethdev.c | 22 +- drivers/net/ice/ice_ethdev.h | 15 +- drivers/net/ice/ice_generic_flow.c | 768 +++++++++++++++-------------------- drivers/net/ice/ice_generic_flow.h | 782 ++++++++---------------------------- drivers/net/ice/ice_switch_filter.c | 511 ----------------------- drivers/net/ice/ice_switch_filter.h | 18 - 6 files changed, 525 insertions(+), 1591 deletions(-)
Please add update to document and release notes.
Quoted 5 lines
drivers/net/ice/ice_ethdev.c +0
-0
[snip]
Quoted 6 lines
drivers/net/ice/ice_ethdev.c +6
-0+int +ice_flow_init (struct ice_adapter *ad) +{ +int ret =0 ; +struct ice_pf *pf = &ad->pf; +void *temp;
drivers/net/ice/ice_ethdev.c
Quoted 10 lines
drivers/net/ice/ice_ethdev.c +10
-0+struct ice_flow_engine *engine =NULL ; + +TAILQ_INIT (&pf->flow_list); +TAILQ_INIT (&pf->rss_parser_list); +TAILQ_INIT (&pf->perm_parser_list); +TAILQ_INIT (&pf->dist_parser_list); + + TAILQ_FOREACH_SAFE(engine, &engine_list, node, temp) { +if (engine->init ==NULL ) +return -EINVAL ;
I think ENOTSUP is more preferred here.
Quoted 153 lines
drivers/net/ice/ice_ethdev.c +106
-0+ + ret = engine->init (ad); +if (ret) +return ret; + } +return 0 ; +} + +void +ice_flow_uninit (struct ice_adapter *ad) +{ +struct ice_pf *pf = &ad->pf; +struct ice_flow_engine *engine; +struct rte_flow *p_flow; +struct ice_flow_parser *p_parser; +void *temp; + + TAILQ_FOREACH_SAFE(engine, &engine_list, node, temp) { +if (engine->uninit) + engine->uninit (ad); + } + +/* Remove all flows */ +while ((p_flow =TAILQ_FIRST (&pf->flow_list))) { +TAILQ_REMOVE (&pf->flow_list, p_flow, node); +if (p_flow->engine->free) + p_flow->engine->free (p_flow); +rte_free (p_flow); + } + +/* Cleanup parser list */ +while ((p_parser =TAILQ_FIRST (&pf->rss_parser_list))) +TAILQ_REMOVE (&pf->rss_parser_list, p_parser, node); + +while ((p_parser =TAILQ_FIRST (&pf->perm_parser_list))) +TAILQ_REMOVE (&pf->perm_parser_list, p_parser, node); + +while ((p_parser =TAILQ_FIRST (&pf->dist_parser_list))) +TAILQ_REMOVE (&pf->dist_parser_list, p_parser, node); +} + +int +ice_register_parser (struct ice_flow_parser *parser, +struct ice_adapter *ad) +{ +struct ice_parser_list *list =NULL ; +struct ice_pf *pf = &ad->pf; + +switch (parser->stage) { +case ICE_FLOW_STAGE_RSS : + list = &pf->rss_parser_list; +break ; +case ICE_FLOW_STAGE_PERMISSION : + list = &pf->perm_parser_list; +break ; +case ICE_FLOW_STAGE_DISTRIBUTOR : + list = &pf->dist_parser_list; +break ; +default : +return -EINVAL ; + } + +if (ad->devargs.pipeline_mode_support) +TAILQ_INSERT_TAIL (list, parser, node); +else { +if (parser->engine->type ==ICE_FLOW_ENGINE_SWITCH + || parser->engine->type ==ICE_FLOW_ENGINE_HASH ) +TAILQ_INSERT_TAIL (list, parser, node); +else if (parser->engine->type ==ICE_FLOW_ENGINE_FDIR ) +TAILQ_INSERT_HEAD (list, parser, node); +else +return -EINVAL ; + } +return 0 ; +} + +void +ice_unregister_parser (struct ice_flow_parser *parser, +struct ice_adapter *ad) +{ +struct ice_pf *pf = &ad->pf; +struct ice_parser_list *list; +struct ice_flow_parser *p_parser; +void *temp; + +switch (parser->stage) { +case ICE_FLOW_STAGE_RSS : + list = &pf->rss_parser_list; +break ; +case ICE_FLOW_STAGE_PERMISSION : + list = &pf->perm_parser_list; +break ; +case ICE_FLOW_STAGE_DISTRIBUTOR : + list = &pf->dist_parser_list; +break ; +default : +return ; + } + + TAILQ_FOREACH_SAFE(p_parser, list, node, temp) { +if (p_parser->engine->type == parser->engine->type) +TAILQ_REMOVE (list, p_parser, node); + } + +} +static int
drivers/net/ice/ice_ethdev.c +3
-2-ice_flow_valid_attr(const struct rte_flow_attr *attr, - struct rte_flow_error *error) +ice_flow_valid_attr(struct ice_adapter *ad, + const struct rte_flow_attr *attr, + struct rte_flow_error *error){ /* Must be input direction */ if (!attr->ingress) {drivers/net/ice/ice_ethdev.c +18
-8@@ -61,15 +212,25 @@ ice_flow_valid_attr(const struct rte_flow_attr *attr, attr, "Not support egress.");return -rte_errno; } - -/* Not supported */ -if (attr->priority) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY , - attr,"Not support priority." ); -return -rte_errno; +/* Check pipeline mode support to set classification stage */ +if (ad->devargs.pipeline_mode_support) { +if (0 == attr->priority) + ice_pipeline_stage = +ICE_FLOW_CLASSIFY_STAGE_PERMISSION ; +else + ice_pipeline_stage = +ICE_FLOW_CLASSIFY_STAGE_DISTRIBUTOR ; + }else { + ice_pipeline_stage = +ICE_FLOW_CLASSIFY_STAGE_DISTRIBUTOR_ONLY ; +/* Not supported */ +if (attr->priority) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY , + attr,"Not support priority." ); +return -rte_errno; + } } -/* Not supported */ if (attr->group) { rte_flow_error_set(error, EINVAL,@@ -102,7 +263,7 @@ ice_find_first_item(const struct rte_flow_item *item, bool is_void)/* Skip all VOID items of the pattern */ static void
ice_pattern_skip_void_item(structrte_flow_item*items,
drivers/net/ice/ice_ethdev.c
Quoted 2 lines
drivers/net/ice/ice_ethdev.c +1
-1- const struct rte_flow_item *pattern) + const struct rte_flow_item *pattern)
Unnecessary change here, only indentation changes.
drivers/net/ice/ice_ethdev.c ice_pattern_skip_void_item(struct rte_flow_item *items, · line 127
Quoted 8 lines
{ uint32_t cpy_count = 0; const struct rte_flow_item *pb = pattern, *pe = pattern;drivers/net/ice/ice_ethdev.c +0
-1@@ -124,7 +285,6 @@ ice_pattern_skip_void_item(struct rte_flow_item *items, items += cpy_count;if (pe->type ==RTE_FLOW_ITEM_TYPE_END ) { - pb = pe;
seems this is some code cleanup, prefer a separate patch, not a strong opinion though.
Quoted 38 lines
drivers/net/ice/ice_ethdev.c +13
-5break ; }@@ -151,11 +311,15 @@ ice_match_pattern(enum rte_flow_item_type *item_array, item->type == RTE_FLOW_ITEM_TYPE_END); } -static uint64_t ice_flow_valid_pattern (const struct rte_flow_item pattern[], +struct ice_pattern_match_item * +ice_search_pattern_match_item (const struct rte_flow_item pattern[], +struct ice_pattern_match_item *array, +uint32_t array_len,struct rte_flow_error *error) {uint16_t i =0 ; -uint64_t inset; +struct ice_pattern_match_item *pattern_match_item; +/* need free by each filter */ struct rte_flow_item *items;/* used for pattern without VOID items */ uint32_t item_num =0 ;/* non-void item number */ @@ -172,451 +336,149 @@ static uint64_t ice_flow_valid_pattern(const struct rte_flow_item pattern[],if (!items) {rte_flow_error_set (error,ENOMEM ,RTE_FLOW_ERROR_TYPE_ITEM_NUM ,NULL ,"No memory for PMD internal items." ); -return -ENOMEM ; +return NULL ; + } + pattern_match_item =rte_zmalloc ("ice_pattern_match_item" , +sizeof (struct ice_pattern_match_item ),0 ); +if (!pattern_match_item) { +PMD_DRV_LOG (ERR ,"Failed to allocate memory." ); +return NULL ; } -ice_pattern_skip_void_item (items, pattern); -for (i =0 ; i <RTE_DIM (ice_supported_patterns); i++)
[snip]
drivers/net/ice/ice_ethdev.c
Quoted 9 lines
drivers/net/ice/ice_ethdev.c +8
-0+static int +ice_flow_validate (struct rte_eth_dev *dev, +const struct rte_flow_attr *attr, +const struct rte_flow_item pattern[], +const struct rte_flow_action actions[], +struct rte_flow_error *error) +{ +int ret =ICE_ERR_NOT_SUPPORTED ;
Unnecessary initialization.
Quoted 21 lines
drivers/net/ice/ice_ethdev.c +8
-0+void *meta =NULL ; +struct ice_flow_engine *engine =NULL ; + + ret =ice_flow_validate_filter (dev, attr, pattern, actions, + &engine, &meta, error); +return ret; +} +static struct
rte_flow*
ice_flow_create(structrte_eth_dev*dev,drivers/net/ice/ice_ethdev.c +4
-4-const struct rte_flow_attr *attr, - const struct rte_flow_item pattern[], - const struct rte_flow_action actions[], - struct rte_flow_error *error) +const struct rte_flow_attr *attr, + const struct rte_flow_item pattern[], + const struct rte_flow_action actions[], + struct rte_flow_error *error){ struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private); struct rte_flow *flow = NULL;
drivers/net/ice/ice_ethdev.c
Quoted 2 lines
drivers/net/ice/ice_ethdev.c +1
-1-int ret; +int ret =0 ;
Unnecessary initialization.
Quoted 75 lines
drivers/net/ice/ice_ethdev.c +4
-0+struct ice_adapter *ad = +ICE_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private); +struct ice_flow_engine *engine =NULL ; +void *meta =NULL ;flow = rte_zmalloc("ice_flow", sizeof(struct rte_flow), 0); if (!flow) {drivers/net/ice/ice_ethdev.c +7
-2@@ -626,65 +488,105 @@ ice_flow_create(struct rte_eth_dev *dev,return flow; } - ret =ice_flow_validate (dev, attr, pattern, actions, error); + ret =ice_flow_validate_filter (dev, attr, pattern, actions, + &engine, &meta, error);if (ret <0 ) goto free_flow; - ret =ice_create_switch_filter (pf, pattern, actions, flow, error); +if (engine->create ==NULL ) + goto free_flow; + + ret = engine->create (ad, flow, meta, error);if (ret) goto free_flow; + flow->engine = engine;TAILQ_INSERT_TAIL (&pf->flow_list, flow, node);return flow;
free_flow:drivers/net/ice/ice_ethdev.c +1
-3-rte_flow_error_set (error, -ret, -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"Failed to create flow." ); +PMD_DRV_LOG (ERR ,"Failed to create flow" );rte_free(flow); return NULL; }static int
ice_flow_destroy(structrte_eth_dev*dev,drivers/net/ice/ice_ethdev.c +2
-2-struct rte_flow *flow, - struct rte_flow_error *error) +struct rte_flow *flow, + struct rte_flow_error *error){ struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);drivers/net/ice/ice_ethdev.c +2
-0+struct ice_adapter *ad = +ICE_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private);int ret = 0;drivers/net/ice/ice_ethdev.c +7
-2- ret =ice_destroy_switch_filter (pf, flow, error); - +if (!flow || !flow->engine->destroy) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_HANDLE , +NULL ,"NULL flow or NULL destroy" ); +return -rte_errno; + } + ret = flow->engine->destroy (ad, flow, error);if (!ret) { TAILQ_REMOVE(&pf->flow_list, flow, node); rte_free(flow);drivers/net/ice/ice_ethdev.c +2
-5- }else { -rte_flow_error_set (error, -ret, -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"Failed to destroy flow." ); - } + }else +PMD_DRV_LOG (ERR ,"Failed to destroy flow" );return ret; }static int
ice_flow_flush(structrte_eth_dev*dev,
drivers/net/ice/ice_ethdev.c
Quoted 2 lines
drivers/net/ice/ice_ethdev.c +1
-1- struct rte_flow_error *error) + struct rte_flow_error *error)
Unnecessary change.
drivers/net/ice/ice_ethdev.c
Quoted 4 lines
{ struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);drivers/net/ice/ice_ethdev.c +1
-1-struct rte_flow *p_flow; +struct rte_flow *p_flow =NULL ;
Unnecessary initialization.
Quoted 52 lines
void *temp; int ret = 0; TAILQ_FOREACH_SAFE(p_flow, &pf->flow_list, node, temp) { ret = ice_flow_destroy(dev, p_flow, error); if (ret) {drivers/net/ice/ice_ethdev.c +2
-4-rte_flow_error_set (error, -ret, -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"Failed to flush SW flows." ); -return -rte_errno; +PMD_DRV_LOG (ERR ,"Failed to flush flows" ); +return -EINVAL ;} } return ret; }drivers/net/ice/ice_ethdev.c +35
-0+ +static int +ice_flow_query_count (struct rte_eth_dev *dev, +struct rte_flow *flow, +const struct rte_flow_action *actions, +void *data, +struct rte_flow_error *error) +{ +int ret = -EINVAL ; +struct ice_adapter *ad = +ICE_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private); + +if (!flow || !flow->engine->query) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_HANDLE , +NULL ,"NULL flow or NULL query" ); +return -rte_errno; + } + +for (; actions->type !=RTE_FLOW_ACTION_TYPE_END ; actions++) { +switch (actions->type) { +case RTE_FLOW_ACTION_TYPE_VOID : +break ; +case RTE_FLOW_ACTION_TYPE_COUNT : + ret = flow->engine->query (ad, flow, data, error); +break ; +default : +return rte_flow_error_set (error,ENOTSUP , +RTE_FLOW_ERROR_TYPE_ACTION , + actions, +"action not supported" ); + } + } +return ret; +}
[snip]
drivers/net/ice/ice_ethdev.c
Quoted 5 lines
drivers/net/ice/ice_ethdev.c +5
-0+TAILQ_HEAD (ice_engine_list, ice_flow_engine); + +/* Struct to store flow created. */ +struct rte_flow { +TAILQ_ENTRY (rte_flow) node;
Indentation is needed here.
Quoted 580 lines
drivers/net/ice/ice_ethdev.c +27
-0+struct ice_flow_engine *engine; +void *rule; +}; + +/* Struct to store parser created. */ +struct ice_flow_parser { +TAILQ_ENTRY (ice_flow_parser) node; +struct ice_flow_engine *engine; +struct ice_pattern_match_item *array; +uint32_t array_len; +parse_pattern_action_t parse_pattern_action; +enum ice_flow_classification_stage stage; +}; + +void ice_register_flow_engine (struct ice_flow_engine *engine); +int ice_flow_init (struct ice_adapter *ad); +void ice_flow_uninit (struct ice_adapter *ad); +int ice_register_parser (struct ice_flow_parser *parser, +struct ice_adapter *ad); +void ice_unregister_parser (struct ice_flow_parser *parser, +struct ice_adapter *ad); +struct ice_pattern_match_item * +ice_search_pattern_match_item ( +const struct rte_flow_item pattern[], +struct ice_pattern_match_item *array, +uint32_t array_len, +struct rte_flow_error *error);#endif
drivers/net/ice/ice_switch_filter.c +0
-511@@ -2,515 +2,4 @@* Copyright(c) 2019 Intel Corporation */ -#include <sys/queue.h> -#include <stdio.h> -#include <errno.h> -#include <stdint.h> -#include <string.h> -#include <unistd.h> -#include <stdarg.h> -#include <rte_debug.h> -#include <rte_ether.h> -#include <rte_ethdev_driver.h> -#include <rte_log.h> -#include <rte_malloc.h> -#include <rte_eth_ctrl.h> -#include <rte_tailq.h> -#include <rte_flow_driver.h> - -#include "ice_logs.h" -#include "base/ice_type.h" -#include "ice_switch_filter.h" - -static int -ice_parse_switch_filter (const struct rte_flow_item pattern[], -const struct rte_flow_action actions[], -struct rte_flow_error *error, -struct ice_adv_lkup_elem *list, -uint16_t *lkups_num, -enum ice_sw_tunnel_type tun_type) -{ -const struct rte_flow_item *item = pattern; -enum rte_flow_item_type item_type; -const struct rte_flow_item_eth *eth_spec, *eth_mask; -const struct rte_flow_item_ipv4 *ipv4_spec, *ipv4_mask; -const struct rte_flow_item_ipv6 *ipv6_spec, *ipv6_mask; -const struct rte_flow_item_tcp *tcp_spec, *tcp_mask; -const struct rte_flow_item_udp *udp_spec, *udp_mask; -const struct rte_flow_item_sctp *sctp_spec, *sctp_mask; -const struct rte_flow_item_nvgre *nvgre_spec, *nvgre_mask; -const struct rte_flow_item_vxlan *vxlan_spec, *vxlan_mask; -uint16_t j, t =0 ; -uint16_t tunnel_valid =0 ; - -for (item = pattern; item->type != -RTE_FLOW_ITEM_TYPE_END ; item++) { - item_type = item->type; - -switch (item_type) { -case RTE_FLOW_ITEM_TYPE_ETH : - eth_spec = item->spec; - eth_mask = item->mask; -if (eth_spec && eth_mask) { - list[t].type = (tun_type ==ICE_NON_TUN ) ? -ICE_MAC_OFOS :ICE_MAC_IL ; -struct ice_ether_hdr *h; -struct ice_ether_hdr *m; -uint16_t i =0 ; - h = &list[t].h_u.eth_hdr; - m = &list[t].m_u.eth_hdr; -for (j =0 ; j <RTE_ETHER_ADDR_LEN ; j++) { -if (eth_mask->src.addr_bytes[j] == -UINT8_MAX ) { - h->src_addr[j] = - eth_spec->src.addr_bytes[j]; - m->src_addr[j] = - eth_mask->src.addr_bytes[j]; - i =1 ; - } -if (eth_mask->dst.addr_bytes[j] == -UINT8_MAX ) { - h->dst_addr[j] = - eth_spec->dst.addr_bytes[j]; - m->dst_addr[j] = - eth_mask->dst.addr_bytes[j]; - i =1 ; - } - } -if (i) - t++; -if (eth_mask->type ==UINT16_MAX ) { - list[t].type =ICE_ETYPE_OL ; - list[t].h_u.ethertype.ethtype_id = - eth_spec->type; - list[t].m_u.ethertype.ethtype_id = -UINT16_MAX ; - t++; - } - }else if (!eth_spec && !eth_mask) { - list[t].type = (tun_type ==ICE_NON_TUN ) ? -ICE_MAC_OFOS :ICE_MAC_IL ; - } -break ; - -case RTE_FLOW_ITEM_TYPE_IPV4 : - ipv4_spec = item->spec; - ipv4_mask = item->mask; -if (ipv4_spec && ipv4_mask) { - list[t].type = (tun_type ==ICE_NON_TUN ) ? -ICE_IPV4_OFOS :ICE_IPV4_IL ; -if (ipv4_mask->hdr.src_addr ==UINT32_MAX ) { - list[t].h_u.ipv4_hdr.src_addr = - ipv4_spec->hdr.src_addr; - list[t].m_u.ipv4_hdr.src_addr = -UINT32_MAX ; - } -if (ipv4_mask->hdr.dst_addr ==UINT32_MAX ) { - list[t].h_u.ipv4_hdr.dst_addr = - ipv4_spec->hdr.dst_addr; - list[t].m_u.ipv4_hdr.dst_addr = -UINT32_MAX ; - } -if (ipv4_mask->hdr.time_to_live ==UINT8_MAX ) { - list[t].h_u.ipv4_hdr.time_to_live = - ipv4_spec->hdr.time_to_live; - list[t].m_u.ipv4_hdr.time_to_live = -UINT8_MAX ; - } -if (ipv4_mask->hdr.next_proto_id ==UINT8_MAX ) { - list[t].h_u.ipv4_hdr.protocol = - ipv4_spec->hdr.next_proto_id; - list[t].m_u.ipv4_hdr.protocol = -UINT8_MAX ; - } -if (ipv4_mask->hdr.type_of_service == -UINT8_MAX ) { - list[t].h_u.ipv4_hdr.tos = - ipv4_spec->hdr.type_of_service; - list[t].m_u.ipv4_hdr.tos =UINT8_MAX ; - } - t++; - }else if (!ipv4_spec && !ipv4_mask) { - list[t].type = (tun_type ==ICE_NON_TUN ) ? -ICE_IPV4_OFOS :ICE_IPV4_IL ; - } -break ; - -case RTE_FLOW_ITEM_TYPE_IPV6 : - ipv6_spec = item->spec; - ipv6_mask = item->mask; -if (ipv6_spec && ipv6_mask) { - list[t].type = (tun_type ==ICE_NON_TUN ) ? -ICE_IPV6_OFOS :ICE_IPV6_IL ; -struct ice_ipv6_hdr *f; -struct ice_ipv6_hdr *s; - f = &list[t].h_u.ipv6_hdr; - s = &list[t].m_u.ipv6_hdr; -for (j =0 ; j <ICE_IPV6_ADDR_LENGTH ; j++) { -if (ipv6_mask->hdr.src_addr[j] == -UINT8_MAX ) { - f->src_addr[j] = - ipv6_spec->hdr.src_addr[j]; - s->src_addr[j] = - ipv6_mask->hdr.src_addr[j]; - } -if (ipv6_mask->hdr.dst_addr[j] == -UINT8_MAX ) { - f->dst_addr[j] = - ipv6_spec->hdr.dst_addr[j]; - s->dst_addr[j] = - ipv6_mask->hdr.dst_addr[j]; - } - } -if (ipv6_mask->hdr.proto ==UINT8_MAX ) { - f->next_hdr = - ipv6_spec->hdr.proto; - s->next_hdr =UINT8_MAX ; - } -if (ipv6_mask->hdr.hop_limits ==UINT8_MAX ) { - f->hop_limit = - ipv6_spec->hdr.hop_limits; - s->hop_limit =UINT8_MAX ; - } - t++; - }else if (!ipv6_spec && !ipv6_mask) { - list[t].type = (tun_type ==ICE_NON_TUN ) ? -ICE_IPV4_OFOS :ICE_IPV4_IL ; - } -break ; - -case RTE_FLOW_ITEM_TYPE_UDP : - udp_spec = item->spec; - udp_mask = item->mask; -if (udp_spec && udp_mask) { -if (tun_type ==ICE_SW_TUN_VXLAN && - tunnel_valid ==0 ) - list[t].type =ICE_UDP_OF ; -else - list[t].type =ICE_UDP_ILOS ; -if (udp_mask->hdr.src_port ==UINT16_MAX ) { - list[t].h_u.l4_hdr.src_port = - udp_spec->hdr.src_port; - list[t].m_u.l4_hdr.src_port = - udp_mask->hdr.src_port; - } -if (udp_mask->hdr.dst_port ==UINT16_MAX ) { - list[t].h_u.l4_hdr.dst_port = - udp_spec->hdr.dst_port; - list[t].m_u.l4_hdr.dst_port = - udp_mask->hdr.dst_port; - } - t++; - }else if (!udp_spec && !udp_mask) { - list[t].type =ICE_UDP_ILOS ; - } -break ; - -case RTE_FLOW_ITEM_TYPE_TCP : - tcp_spec = item->spec; - tcp_mask = item->mask; -if (tcp_spec && tcp_mask) { - list[t].type =ICE_TCP_IL ; -if (tcp_mask->hdr.src_port ==UINT16_MAX ) { - list[t].h_u.l4_hdr.src_port = - tcp_spec->hdr.src_port; - list[t].m_u.l4_hdr.src_port = - tcp_mask->hdr.src_port; - } -if (tcp_mask->hdr.dst_port ==UINT16_MAX ) { - list[t].h_u.l4_hdr.dst_port = - tcp_spec->hdr.dst_port; - list[t].m_u.l4_hdr.dst_port = - tcp_mask->hdr.dst_port; - } - t++; - }else if (!tcp_spec && !tcp_mask) { - list[t].type =ICE_TCP_IL ; - } -break ; - -case RTE_FLOW_ITEM_TYPE_SCTP : - sctp_spec = item->spec; - sctp_mask = item->mask; -if (sctp_spec && sctp_mask) { - list[t].type =ICE_SCTP_IL ; -if (sctp_mask->hdr.src_port ==UINT16_MAX ) { - list[t].h_u.sctp_hdr.src_port = - sctp_spec->hdr.src_port; - list[t].m_u.sctp_hdr.src_port = - sctp_mask->hdr.src_port; - } -if (sctp_mask->hdr.dst_port ==UINT16_MAX ) { - list[t].h_u.sctp_hdr.dst_port = - sctp_spec->hdr.dst_port; - list[t].m_u.sctp_hdr.dst_port = - sctp_mask->hdr.dst_port; - } - t++; - }else if (!sctp_spec && !sctp_mask) { - list[t].type =ICE_SCTP_IL ; - } -break ; - -case RTE_FLOW_ITEM_TYPE_VXLAN : - vxlan_spec = item->spec; - vxlan_mask = item->mask; - tunnel_valid =1 ; -if (vxlan_spec && vxlan_mask) { - list[t].type =ICE_VXLAN ; -if (vxlan_mask->vni[0 ] ==UINT8_MAX && - vxlan_mask->vni[1 ] ==UINT8_MAX && - vxlan_mask->vni[2 ] ==UINT8_MAX ) { - list[t].h_u.tnl_hdr.vni = - (vxlan_spec->vni[2 ] <<16 ) | - (vxlan_spec->vni[1 ] <<8 ) | - vxlan_spec->vni[0 ]; - list[t].m_u.tnl_hdr.vni = -UINT32_MAX ; - } - t++; - }else if (!vxlan_spec && !vxlan_mask) { - list[t].type =ICE_VXLAN ; - } -break ; - -case RTE_FLOW_ITEM_TYPE_NVGRE : - nvgre_spec = item->spec; - nvgre_mask = item->mask; - tunnel_valid =1 ; -if (nvgre_spec && nvgre_mask) { - list[t].type =ICE_NVGRE ; -if (nvgre_mask->tni[0 ] ==UINT8_MAX && - nvgre_mask->tni[1 ] ==UINT8_MAX && - nvgre_mask->tni[2 ] ==UINT8_MAX ) { - list[t].h_u.nvgre_hdr.tni_flow = - (nvgre_spec->tni[2 ] <<16 ) | - (nvgre_spec->tni[1 ] <<8 ) | - nvgre_spec->tni[0 ]; - list[t].m_u.nvgre_hdr.tni_flow = -UINT32_MAX ; - } - t++; - }else if (!nvgre_spec && !nvgre_mask) { - list[t].type =ICE_NVGRE ; - } -break ; - -case RTE_FLOW_ITEM_TYPE_VOID : -case RTE_FLOW_ITEM_TYPE_END : -break ; - -default : -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , actions, -"Invalid pattern item." ); - goto out; - } - } - - *lkups_num = t; - -return 0 ; -out: -return -rte_errno; -} - -/* By now ice switch filter action code implement only -* supports QUEUE or DROP. -*/ -static int -ice_parse_switch_action (struct ice_pf *pf, -const struct rte_flow_action *actions, -struct rte_flow_error *error, -struct ice_adv_rule_info *rule_info) -{ -struct ice_vsi *vsi = pf->main_vsi; -const struct rte_flow_action_queue *act_q; -uint16_t base_queue; -const struct rte_flow_action *action; -enum rte_flow_action_type action_type; - - base_queue = pf->base_queue; -for (action = actions; action->type != -RTE_FLOW_ACTION_TYPE_END ; action++) { - action_type = action->type; -switch (action_type) { -case RTE_FLOW_ACTION_TYPE_QUEUE : - act_q = action->conf; - rule_info->sw_act.fltr_act = -ICE_FWD_TO_Q ; - rule_info->sw_act.fwd_id.q_id = - base_queue + act_q->index; -break ; - -case RTE_FLOW_ACTION_TYPE_DROP : - rule_info->sw_act.fltr_act = -ICE_DROP_PACKET ; -break ; - -case RTE_FLOW_ACTION_TYPE_VOID : -break ; - -default : -rte_flow_error_set (error, -EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , - actions, -"Invalid action type" ); -return -rte_errno; - } - } - - rule_info->sw_act.vsi_handle = vsi->idx; - rule_info->rx =1 ; - rule_info->sw_act.src = vsi->idx; - rule_info->priority =5 ; - -return 0 ; -} - -static int -ice_switch_rule_set (struct ice_pf *pf, -struct ice_adv_lkup_elem *list, -uint16_t lkups_cnt, -struct ice_adv_rule_info *rule_info, -struct rte_flow *flow, -struct rte_flow_error *error) -{ -struct ice_hw *hw =ICE_PF_TO_HW (pf); -int ret; -struct ice_rule_query_data rule_added = {0 }; -struct ice_rule_query_data *filter_ptr; - -if (lkups_cnt >ICE_MAX_CHAIN_WORDS ) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM ,NULL , -"item number too large for rule" ); -return -rte_errno; - } -if (!list) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM ,NULL , -"lookup list should not be NULL" ); -return -rte_errno; - } - - ret =ice_add_adv_rule (hw, list, lkups_cnt, rule_info, &rule_added); - -if (!ret) { - filter_ptr =rte_zmalloc ("ice_switch_filter" , -sizeof (struct ice_rule_query_data ),0 ); -if (!filter_ptr) { -PMD_DRV_LOG (ERR ,"failed to allocate memory" ); -return -EINVAL ; - } - flow->rule = filter_ptr; -rte_memcpy (filter_ptr, - &rule_added, -sizeof (struct ice_rule_query_data )); - } - -return ret; -} - -int -ice_create_switch_filter (struct ice_pf *pf, -const struct rte_flow_item pattern[], -const struct rte_flow_action actions[], -struct rte_flow *flow, -struct rte_flow_error *error) -{ -int ret =0 ; -struct ice_adv_rule_info rule_info = {0 }; -struct ice_adv_lkup_elem *list =NULL ; -uint16_t lkups_num =0 ; -const struct rte_flow_item *item = pattern; -uint16_t item_num =0 ; -enum ice_sw_tunnel_type tun_type =ICE_NON_TUN ; - -for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) { - item_num++; -if (item->type ==RTE_FLOW_ITEM_TYPE_VXLAN ) - tun_type =ICE_SW_TUN_VXLAN ; -if (item->type ==RTE_FLOW_ITEM_TYPE_NVGRE ) - tun_type =ICE_SW_TUN_NVGRE ; -/* reserve one more memory slot for ETH which may -* consume 2 lookup items. -*/ -if (item->type ==RTE_FLOW_ITEM_TYPE_ETH ) - item_num++; - } - rule_info.tun_type = tun_type; - - list =rte_zmalloc (NULL , item_num *sizeof (*list),0 ); -if (!list) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"No memory for PMD internal items" ); -return -rte_errno; - } - - ret =ice_parse_switch_filter (pattern, actions, error, - list, &lkups_num, tun_type); -if (ret) - goto error; - - ret =ice_parse_switch_action (pf, actions, error, &rule_info); -if (ret) - goto error; - - ret =ice_switch_rule_set (pf, list, lkups_num, &rule_info, flow, error); -if (ret) - goto error; - -rte_free (list); -return 0 ; - -error: -rte_free (list); - -return -rte_errno; -} - -int -ice_destroy_switch_filter (struct ice_pf *pf, -struct rte_flow *flow, -struct rte_flow_error *error) -{ -struct ice_hw *hw =ICE_PF_TO_HW (pf); -int ret; -struct ice_rule_query_data *filter_ptr; - - filter_ptr = (struct ice_rule_query_data *) - flow->rule; - -if (!filter_ptr) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"no such flow" -" create by switch filter" ); -return -rte_errno; - } - - ret =ice_rem_adv_rule_by_id (hw, filter_ptr); -if (ret) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"fail to destroy switch filter rule" ); -return -rte_errno; - } - -rte_free (filter_ptr); -return ret; -} - -void -ice_free_switch_filter_rule (void *rule) -{ -struct ice_rule_query_data *filter_ptr; - - filter_ptr = (struct ice_rule_query_data *)rule; - -rte_free (filter_ptr); -}drivers/net/ice/ice_switch_filter.h +0
-18@@ -2,23 +2,5 @@* Copyright(c) 2019 Intel Corporation */ -#ifndef _ICE_SWITCH_FILTER_H_ -#define _ICE_SWITCH_FILTER_H_ -#include "base/ice_switch.h" -#include "base/ice_type.h" -#include "ice_ethdev.h" -int -ice_create_switch_filter (struct ice_pf *pf, -const struct rte_flow_item pattern[], -const struct rte_flow_action actions[], -struct rte_flow *flow, -struct rte_flow_error *error); -int -ice_destroy_switch_filter (struct ice_pf *pf, -struct rte_flow *flow, -struct rte_flow_error *error); -void -ice_free_switch_filter_rule (void *rule); -#endif /* _ICE_SWITCH_FILTER_H_ */ Signature · 1 line
2.15.1
Re: [dpdk-dev] [PATCH 2/4] net/ice: rework for generic flow enabling
Hi, Xiaolong
Quoted 31 lines
-----Original Message-----
From: Ye, Xiaolong
Sent: Wednesday, September 4, 2019 10:45 PM
To: Wang, Ying A <[email protected]>
Cc: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>; [email protected]; Zhao1, Wei <[email protected]>
Subject: Re: [PATCH 2/4] net/ice: rework for generic flow enablingQuoted 15 lines · Ying Wang
The patch reworks the generic flow API (
rte_flow) implementation. It introduces an abstract layer which provides a unified interface for low-level filter engine (switch, fdir, hash) to register supported patterns and actions and implement flow validate/create/destroy/flush/ query activities.The patch also removes the existing switch filter implementation to avoid compile error. Switch filter implementation for the new framework will be added in the following patch.
Signed-off-by Ying Wang <[email protected]>---
drivers/net/ice/ice_ethdev.c | 22 +- drivers/net/ice/ice_ethdev.h | 15 +- drivers/net/ice/ice_generic_flow.c | 768Quoted 6 lines
+++++++++++++++--------------------
drivers/net/ice/ice_generic_flow.h| 782
++++++++----------------------------drivers/net/ice/ice_switch_filter.c| 511 -----------------------drivers/net/ice/ice_switch_filter.h| 18 -6 files changed, 525 insertions(+), 1591 deletions(-)
Quoted 1 line
Please add update to document and release notes.
OK, will add it in v2.
Quoted 17 lines
Quoted 6 lines
(quoted diff) +0
-0
b/drivers/net/ice/ice_ethdev.cindex4e0645db1..647aca3ed100644drivers/net/ice/ice_ethdev.c +0
-0[snip]
Quoted 10 lines
drivers/net/ice/ice_ethdev.c +10
-0+int +ice_flow_init (struct ice_adapter *ad) +{ +int ret =0 ; +struct ice_pf *pf = &ad->pf; +void *temp; +struct ice_flow_engine *engine =NULL ; + +TAILQ_INIT (&pf->flow_list); +TAILQ_INIT (&pf->rss_parser_list);
Quoted 8 lines
drivers/net/ice/ice_ethdev.c
Quoted 6 lines
drivers/net/ice/ice_ethdev.c +6
-0+TAILQ_INIT (&pf->perm_parser_list); +TAILQ_INIT (&pf->dist_parser_list); + + TAILQ_FOREACH_SAFE(engine, &engine_list, node, temp) { +if (engine->init ==NULL ) +return -EINVAL ;I think ENOTSUP is more preferred here.
OK, will fix it in v2.
Quoted 141 lines
Quoted 130 lines
drivers/net/ice/ice_ethdev.c +104
-0+ + ret = engine->init (ad); +if (ret) +return ret; + } +return 0 ; +} + +void +ice_flow_uninit (struct ice_adapter *ad) { +struct ice_pf *pf = &ad->pf; +struct ice_flow_engine *engine; +struct rte_flow *p_flow; +struct ice_flow_parser *p_parser; +void *temp; + + TAILQ_FOREACH_SAFE(engine, &engine_list, node, temp) { +if (engine->uninit) + engine->uninit (ad); + } + +/* Remove all flows */ +while ((p_flow =TAILQ_FIRST (&pf->flow_list))) { +TAILQ_REMOVE (&pf->flow_list, p_flow, node); +if (p_flow->engine->free) + p_flow->engine->free (p_flow); +rte_free (p_flow); + } + +/* Cleanup parser list */ +while ((p_parser =TAILQ_FIRST (&pf->rss_parser_list))) +TAILQ_REMOVE (&pf->rss_parser_list, p_parser, node); + +while ((p_parser =TAILQ_FIRST (&pf->perm_parser_list))) +TAILQ_REMOVE (&pf->perm_parser_list, p_parser, node); + +while ((p_parser =TAILQ_FIRST (&pf->dist_parser_list))) +TAILQ_REMOVE (&pf->dist_parser_list, p_parser, node); } + +int +ice_register_parser (struct ice_flow_parser *parser, +struct ice_adapter *ad) +{ +struct ice_parser_list *list =NULL ; +struct ice_pf *pf = &ad->pf; + +switch (parser->stage) { +case ICE_FLOW_STAGE_RSS : + list = &pf->rss_parser_list; +break ; +case ICE_FLOW_STAGE_PERMISSION : + list = &pf->perm_parser_list; +break ; +case ICE_FLOW_STAGE_DISTRIBUTOR : + list = &pf->dist_parser_list; +break ; +default : +return -EINVAL ; + } + +if (ad->devargs.pipeline_mode_support) +TAILQ_INSERT_TAIL (list, parser, node); +else { +if (parser->engine->type ==ICE_FLOW_ENGINE_SWITCH + || parser->engine->type ==ICE_FLOW_ENGINE_HASH ) +TAILQ_INSERT_TAIL (list, parser, node); +else if (parser->engine->type ==ICE_FLOW_ENGINE_FDIR ) +TAILQ_INSERT_HEAD (list, parser, node); +else +return -EINVAL ; + } +return 0 ; +} + +void +ice_unregister_parser (struct ice_flow_parser *parser, +struct ice_adapter *ad) +{ +struct ice_pf *pf = &ad->pf; +struct ice_parser_list *list; +struct ice_flow_parser *p_parser; +void *temp; + +switch (parser->stage) { +case ICE_FLOW_STAGE_RSS : + list = &pf->rss_parser_list; +break ; +case ICE_FLOW_STAGE_PERMISSION : + list = &pf->perm_parser_list; +break ; +case ICE_FLOW_STAGE_DISTRIBUTOR : + list = &pf->dist_parser_list; +break ; +default : +return ; + } + + TAILQ_FOREACH_SAFE(p_parser, list, node, temp) { +if (p_parser->engine->type == parser->engine->type) +TAILQ_REMOVE (list, p_parser, node); + } + +} +static int
drivers/net/ice/ice_ethdev.c +3
-2-ice_flow_valid_attr(const struct rte_flow_attr *attr, - struct rte_flow_error *error) +ice_flow_valid_attr(struct ice_adapter *ad, + const struct rte_flow_attr *attr, + struct rte_flow_error *error){ /* Must be input direction */ if (!attr->ingress) {drivers/net/ice/ice_ethdev.c +5
-7@@ -61,15 +212,25 @@ ice_flow_valid_attr(const struct rte_flow_attr *attr, attr, "Not support egress.");return -rte_errno; } - -/* Not supported */ -if (attr->priority) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY , - attr,"Not support priority." ); -return -rte_errno; +/* Check pipeline mode support to set classification stage */ +if (ad->devargs.pipeline_mode_support) { +if (0 == attr->priority) + ice_pipeline_stage = +ICE_FLOW_CLASSIFY_STAGE_PERMISSION ;drivers/net/ice/ice_ethdev.c ice_flow_valid_attr(const struct rte_flow_attr *attr, · line 229
Quoted 10 lines
drivers/net/ice/ice_ethdev.c +10
-0+else + ice_pipeline_stage = +ICE_FLOW_CLASSIFY_STAGE_DISTRIBUTOR ; + }else { + ice_pipeline_stage = +ICE_FLOW_CLASSIFY_STAGE_DISTRIBUTOR_ONLY ; +/* Not supported */ +if (attr->priority) { + rte_flow_error_set(error, EINVAL, +
RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY,
Quoted 16 lines
Quoted 9 lines
drivers/net/ice/ice_ethdev.c +3
-1+ attr, "Not support priority."); +return -rte_errno; + } } -/* Not supported */ if (attr->group) { rte_flow_error_set(error, EINVAL,drivers/net/ice/ice_ethdev.c ice_find_first_item(const struct rte_flow_item · line 266
Quoted 5 lines
drivers/net/ice/ice_ethdev.c +1
-1@@ -102,7 +263,7 @@ ice_find_first_item(const struct rte_flow_item *item, bool is_void)/* Skip all VOID items of the pattern */ static void ice_pattern_skip_void_item (struct rte_flow_item *items, -const struct rte_flow_item *pattern) +const struct rte_flow_item *pattern)Unnecessary change here, only indentation changes.
For the previous indentation is not tab-aligned, I will add a separate code cleanup patch for these changes.
Quoted 7 lines
Quoted 7 lines
drivers/net/ice/ice_ethdev.c +1
-0{uint32_t cpy_count =0 ; const struct rte_flow_item *pb = pattern, *pe = pattern; @@ -124,7 +285,6 @@ ice_pattern_skip_void_item(struct rte_flow_item *items,items += cpy_count;
Quoted 5 lines
drivers/net/ice/ice_ethdev.c
Quoted 2 lines
if (pe->type == RTE_FLOW_ITEM_TYPE_END) {drivers/net/ice/ice_ethdev.c +0
-1- pb = pe;seems this is some code cleanup, prefer a separate patch, not a strong opinion though.
OK, will add a separate patch for code cleanup.
Quoted 44 lines
drivers/net/ice/ice_ethdev.c ice_match_pattern(enum rte_flow_item_type
Quoted 5 lines
break; }drivers/net/ice/ice_ethdev.c +0
-0@@ -151,11 +311,15 @@ ice_match_pattern(enum rte_flow_item_type
*item_array,drivers/net/ice/ice_ethdev.c static uint64_t ice_flow_valid_pattern(const
Quoted 18 lines
drivers/net/ice/ice_ethdev.c +6
-2item->type == RTE_FLOW_ITEM_TYPE_END); } -static uint64_t ice_flow_valid_pattern (const struct rte_flow_item pattern[], +struct ice_pattern_match_item * +ice_search_pattern_match_item (const struct rte_flow_item pattern[], +struct ice_pattern_match_item *array, +uint32_t array_len,struct rte_flow_error *error) {uint16_t i =0 ; -uint64_t inset; +struct ice_pattern_match_item *pattern_match_item; +/* need free by each filter */ struct rte_flow_item *items;/* used for pattern without VOID items */ uint32_t item_num =0 ;/* non-void item number */ @@ -172,451 +336,149 @@ static uint64_t ice_flow_valid_pattern(conststruct
rte_flow_itempattern[],drivers/net/ice/ice_ethdev.c static uint64_t ice_flow_valid_pattern(const · line 337
Quoted 2 lines
drivers/net/ice/ice_ethdev.c +0
-0if (!items) { rte_flow_error_set(error, ENOMEM,
RTE_FLOW_ERROR_TYPE_ITEM_NUM,Quoted 14 lines
drivers/net/ice/ice_ethdev.c +7
-3NULL, "No memory for PMD internal items."); -return -ENOMEM ; +return NULL ; + } + pattern_match_item =rte_zmalloc ("ice_pattern_match_item" , +sizeof (struct ice_pattern_match_item ),0 ); +if (!pattern_match_item) { +PMD_DRV_LOG (ERR ,"Failed to allocate memory." ); +return NULL ; } -ice_pattern_skip_void_item (items, pattern); -for (i =0 ; i <RTE_DIM (ice_supported_patterns); i++)[snip]
Quoted 1 line
Quoted 10 lines
drivers/net/ice/ice_ethdev.c
Quoted 8 lines
drivers/net/ice/ice_ethdev.c +8
-0+static int +ice_flow_validate (struct rte_eth_dev *dev, +const struct rte_flow_attr *attr, +const struct rte_flow_item pattern[], +const struct rte_flow_action actions[], +struct rte_flow_error *error) +{ +int ret =ICE_ERR_NOT_SUPPORTED ;Unnecessary initialization.
OK, will fix it in v2.
Quoted 18 lines
Quoted 18 lines
drivers/net/ice/ice_ethdev.c +8
-0+void *meta =NULL ; +struct ice_flow_engine *engine =NULL ; + + ret =ice_flow_validate_filter (dev, attr, pattern, actions, + &engine, &meta, error); +return ret; +} +static struct
rte_flow*
ice_flow_create(structrte_eth_dev*dev,drivers/net/ice/ice_ethdev.c +3
-4-const struct rte_flow_attr *attr, - const struct rte_flow_item pattern[], - const struct rte_flow_action actions[], - struct rte_flow_error *error) +const struct rte_flow_attr *attr, + const struct rte_flow_item pattern[], + const struct rte_flow_action actions[],
Quoted 8 lines
drivers/net/ice/ice_ethdev.c
Quoted 6 lines
drivers/net/ice/ice_ethdev.c +1
-0+ struct rte_flow_error *error){ struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private); struct rte_flow *flow = NULL;drivers/net/ice/ice_ethdev.c +1
-1-int ret; +int ret =0 ;Unnecessary initialization.
OK, will fix it in v2.
Quoted 74 lines
Quoted 74 lines
drivers/net/ice/ice_ethdev.c +4
-0+struct ice_adapter *ad = +ICE_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private); +struct ice_flow_engine *engine =NULL ; +void *meta =NULL ;flow = rte_zmalloc("ice_flow", sizeof(struct rte_flow), 0); if (!flow) {drivers/net/ice/ice_ethdev.c +7
-2@@ -626,65 +488,105 @@ ice_flow_create(struct rte_eth_dev *dev,return flow; } - ret =ice_flow_validate (dev, attr, pattern, actions, error); + ret =ice_flow_validate_filter (dev, attr, pattern, actions, + &engine, &meta, error);if (ret <0 ) goto free_flow; - ret =ice_create_switch_filter (pf, pattern, actions, flow, error); +if (engine->create ==NULL ) + goto free_flow; + + ret = engine->create (ad, flow, meta, error);if (ret) goto free_flow; + flow->engine = engine;TAILQ_INSERT_TAIL (&pf->flow_list, flow, node);return flow;
free_flow:drivers/net/ice/ice_ethdev.c +1
-3-rte_flow_error_set (error, -ret, -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"Failed to create flow." ); +PMD_DRV_LOG (ERR ,"Failed to create flow" );rte_free(flow); return NULL; }static int
ice_flow_destroy(structrte_eth_dev*dev,drivers/net/ice/ice_ethdev.c +2
-2-struct rte_flow *flow, - struct rte_flow_error *error) +struct rte_flow *flow, + struct rte_flow_error *error){ struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);drivers/net/ice/ice_ethdev.c +2
-0+struct ice_adapter *ad = +ICE_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private);int ret = 0;drivers/net/ice/ice_ethdev.c +7
-2- ret =ice_destroy_switch_filter (pf, flow, error); - +if (!flow || !flow->engine->destroy) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_HANDLE , +NULL ,"NULL flow or NULL destroy" ); +return -rte_errno; + } + ret = flow->engine->destroy (ad, flow, error);if (!ret) { TAILQ_REMOVE(&pf->flow_list, flow, node); rte_free(flow);drivers/net/ice/ice_ethdev.c +2
-5- }else { -rte_flow_error_set (error, -ret, -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"Failed to destroy flow." ); - } + }else +PMD_DRV_LOG (ERR ,"Failed to destroy flow" );return ret; }
Quoted 6 lines
drivers/net/ice/ice_ethdev.c
Quoted 4 lines
static int
ice_flow_flush(structrte_eth_dev*dev,drivers/net/ice/ice_ethdev.c +1
-1- struct rte_flow_error *error) + struct rte_flow_error *error)Unnecessary change.
Will add a separate code cleanup patch for this change, since the previous indentation is not tab-aligned.
Quoted 7 lines
drivers/net/ice/ice_ethdev.c
Quoted 5 lines
{ struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);drivers/net/ice/ice_ethdev.c +1
-1-struct rte_flow *p_flow; +struct rte_flow *p_flow =NULL ;Unnecessary initialization.
OK, will fix it in v2.
Quoted 55 lines
drivers/net/ice/ice_ethdev.c
Quoted 9 lines
void *temp; int ret = 0; TAILQ_FOREACH_SAFE(p_flow, &pf->flow_list, node, temp) { ret = ice_flow_destroy(dev, p_flow, error); if (ret) {drivers/net/ice/ice_ethdev.c +0
-2- rte_flow_error_set(error, -ret, - RTE_FLOW_ERROR_TYPE_HANDLE,NULL,
Quoted 44 lines
drivers/net/ice/ice_ethdev.c +2
-2- "Failed to flush SW flows."); -return -rte_errno; +PMD_DRV_LOG (ERR ,"Failed to flush flows" ); +return -EINVAL ;} } return ret; }drivers/net/ice/ice_ethdev.c +35
-0+ +static int +ice_flow_query_count (struct rte_eth_dev *dev, +struct rte_flow *flow, +const struct rte_flow_action *actions, +void *data, +struct rte_flow_error *error) +{ +int ret = -EINVAL ; +struct ice_adapter *ad = +ICE_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private); + +if (!flow || !flow->engine->query) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_HANDLE , +NULL ,"NULL flow or NULL query" ); +return -rte_errno; + } + +for (; actions->type !=RTE_FLOW_ACTION_TYPE_END ; actions++) { +switch (actions->type) { +case RTE_FLOW_ACTION_TYPE_VOID : +break ; +case RTE_FLOW_ACTION_TYPE_COUNT : + ret = flow->engine->query (ad, flow, data, error); +break ; +default : +return rte_flow_error_set (error,ENOTSUP , +RTE_FLOW_ERROR_TYPE_ACTION , + actions, +"action not supported" ); + } + } +return ret; +}[snip]
Quoted 7 lines
drivers/net/ice/ice_ethdev.c
Quoted 5 lines
drivers/net/ice/ice_ethdev.c +5
-0+TAILQ_HEAD (ice_engine_list, ice_flow_engine); + +/* Struct to store flow created. */ +struct rte_flow { +TAILQ_ENTRY (rte_flow) node;Indentation is needed here.
OK, will fix it in v2.
Quoted 584 lines
Quoted 139 lines
drivers/net/ice/ice_ethdev.c +26
-0+struct ice_flow_engine *engine; +void *rule; +}; + +/* Struct to store parser created. */ +struct ice_flow_parser { +TAILQ_ENTRY (ice_flow_parser) node; +struct ice_flow_engine *engine; +struct ice_pattern_match_item *array; +uint32_t array_len; +parse_pattern_action_t parse_pattern_action; +enum ice_flow_classification_stage stage; }; + +void ice_register_flow_engine (struct ice_flow_engine *engine);int +ice_flow_init (struct ice_adapter *ad);void ice_flow_uninit (struct +ice_adapter *ad);int ice_register_parser (struct ice_flow_parser +*parser, +struct ice_adapter *ad); +void ice_unregister_parser (struct ice_flow_parser *parser, +struct ice_adapter *ad); +struct ice_pattern_match_item * +ice_search_pattern_match_item ( +const struct rte_flow_item pattern[], +struct ice_pattern_match_item *array, +uint32_t array_len, +struct rte_flow_error *error);#endif
drivers/net/ice/ice_switch_filter.c +0
-100@@ -2,515 +2,4 @@* Copyright(c) 2019 Intel Corporation */ -#include <sys/queue.h> -#include <stdio.h> -#include <errno.h> -#include <stdint.h> -#include <string.h> -#include <unistd.h> -#include <stdarg.h> -#include <rte_debug.h> -#include <rte_ether.h> -#include <rte_ethdev_driver.h> -#include <rte_log.h> -#include <rte_malloc.h> -#include <rte_eth_ctrl.h> -#include <rte_tailq.h> -#include <rte_flow_driver.h> - -#include "ice_logs.h" -#include "base/ice_type.h" -#include "ice_switch_filter.h" - -static int -ice_parse_switch_filter (const struct rte_flow_item pattern[], -const struct rte_flow_action actions[], -struct rte_flow_error *error, -struct ice_adv_lkup_elem *list, -uint16_t *lkups_num, -enum ice_sw_tunnel_type tun_type) -{ -const struct rte_flow_item *item = pattern; -enum rte_flow_item_type item_type; -const struct rte_flow_item_eth *eth_spec, *eth_mask; -const struct rte_flow_item_ipv4 *ipv4_spec, *ipv4_mask; -const struct rte_flow_item_ipv6 *ipv6_spec, *ipv6_mask; -const struct rte_flow_item_tcp *tcp_spec, *tcp_mask; -const struct rte_flow_item_udp *udp_spec, *udp_mask; -const struct rte_flow_item_sctp *sctp_spec, *sctp_mask; -const struct rte_flow_item_nvgre *nvgre_spec, *nvgre_mask; -const struct rte_flow_item_vxlan *vxlan_spec, *vxlan_mask; -uint16_t j, t =0 ; -uint16_t tunnel_valid =0 ; - -for (item = pattern; item->type != -RTE_FLOW_ITEM_TYPE_END ; item++) { - item_type = item->type; - -switch (item_type) { -case RTE_FLOW_ITEM_TYPE_ETH : - eth_spec = item->spec; - eth_mask = item->mask; -if (eth_spec && eth_mask) { - list[t].type = (tun_type ==ICE_NON_TUN ) ? -ICE_MAC_OFOS :ICE_MAC_IL ; -struct ice_ether_hdr *h; -struct ice_ether_hdr *m; -uint16_t i =0 ; - h = &list[t].h_u.eth_hdr; - m = &list[t].m_u.eth_hdr; -for (j =0 ; j <RTE_ETHER_ADDR_LEN ; j++) { -if (eth_mask->src.addr_bytes[j] == -UINT8_MAX ) { - h->src_addr[j] = - eth_spec->src.addr_bytes[j]; - m->src_addr[j] = - eth_mask->src.addr_bytes[j]; - i =1 ; - } -if (eth_mask->dst.addr_bytes[j] == -UINT8_MAX ) { - h->dst_addr[j] = - eth_spec->dst.addr_bytes[j]; - m->dst_addr[j] = - eth_mask->dst.addr_bytes[j]; - i =1 ; - } - } -if (i) - t++; -if (eth_mask->type ==UINT16_MAX ) { - list[t].type =ICE_ETYPE_OL ; - list[t].h_u.ethertype.ethtype_id = - eth_spec->type; - list[t].m_u.ethertype.ethtype_id = -UINT16_MAX ; - t++; - } - }else if (!eth_spec && !eth_mask) { - list[t].type = (tun_type ==ICE_NON_TUN ) ? -ICE_MAC_OFOS :ICE_MAC_IL ; - } -break ; - -case RTE_FLOW_ITEM_TYPE_IPV4 : - ipv4_spec = item->spec; - ipv4_mask = item->mask; -if (ipv4_spec && ipv4_mask) { - list[t].type = (tun_type ==ICE_NON_TUN ) ? -ICE_IPV4_OFOS :ICE_IPV4_IL ; -if (ipv4_mask->hdr.src_addr ==UINT32_MAX ) { - list[t].h_u.ipv4_hdr.src_addr = - ipv4_spec->hdr.src_addr;drivers/net/ice/ice_switch_filter.c line 115
Quoted 10 lines
drivers/net/ice/ice_switch_filter.c +0
-10- list[t].m_u.ipv4_hdr.src_addr = -UINT32_MAX ; - } -if (ipv4_mask->hdr.dst_addr ==UINT32_MAX ) { - list[t].h_u.ipv4_hdr.dst_addr = - ipv4_spec->hdr.dst_addr; - list[t].m_u.ipv4_hdr.dst_addr = -UINT32_MAX ; - } -if (ipv4_mask->hdr.time_to_live ==UINT8_MAX ){
drivers/net/ice/ice_switch_filter.c
Quoted 6 lines
drivers/net/ice/ice_switch_filter.c +0
-6- list[t].h_u.ipv4_hdr.time_to_live = - ipv4_spec->hdr.time_to_live; - list[t].m_u.ipv4_hdr.time_to_live = -UINT8_MAX ; - } - if (ipv4_mask->hdr.next_proto_id ==
UINT8_MAX) {Quoted 427 lines
drivers/net/ice/ice_switch_filter.c +0
-9- list[t].h_u.ipv4_hdr.protocol = - ipv4_spec->hdr.next_proto_id; - list[t].m_u.ipv4_hdr.protocol = -UINT8_MAX ; - } -if (ipv4_mask->hdr.type_of_service == -UINT8_MAX ) { - list[t].h_u.ipv4_hdr.tos = - ipv4_spec-hdr.type_of_service;
drivers/net/ice/ice_switch_filter.c +0
-385- list[t].m_u.ipv4_hdr.tos =UINT8_MAX ; - } - t++; - }else if (!ipv4_spec && !ipv4_mask) { - list[t].type = (tun_type ==ICE_NON_TUN ) ? -ICE_IPV4_OFOS :ICE_IPV4_IL ; - } -break ; - -case RTE_FLOW_ITEM_TYPE_IPV6 : - ipv6_spec = item->spec; - ipv6_mask = item->mask; -if (ipv6_spec && ipv6_mask) { - list[t].type = (tun_type ==ICE_NON_TUN ) ? -ICE_IPV6_OFOS :ICE_IPV6_IL ; -struct ice_ipv6_hdr *f; -struct ice_ipv6_hdr *s; - f = &list[t].h_u.ipv6_hdr; - s = &list[t].m_u.ipv6_hdr; -for (j =0 ; j <ICE_IPV6_ADDR_LENGTH ; j++) { -if (ipv6_mask->hdr.src_addr[j] == -UINT8_MAX ) { - f->src_addr[j] = - ipv6_spec->hdr.src_addr[j]; - s->src_addr[j] = - ipv6_mask->hdr.src_addr[j]; - } -if (ipv6_mask->hdr.dst_addr[j] == -UINT8_MAX ) { - f->dst_addr[j] = - ipv6_spec->hdr.dst_addr[j]; - s->dst_addr[j] = - ipv6_mask->hdr.dst_addr[j]; - } - } -if (ipv6_mask->hdr.proto ==UINT8_MAX ) { - f->next_hdr = - ipv6_spec->hdr.proto; - s->next_hdr =UINT8_MAX ; - } -if (ipv6_mask->hdr.hop_limits ==UINT8_MAX ) { - f->hop_limit = - ipv6_spec->hdr.hop_limits; - s->hop_limit =UINT8_MAX ; - } - t++; - }else if (!ipv6_spec && !ipv6_mask) { - list[t].type = (tun_type ==ICE_NON_TUN ) ? -ICE_IPV4_OFOS :ICE_IPV4_IL ; - } -break ; - -case RTE_FLOW_ITEM_TYPE_UDP : - udp_spec = item->spec; - udp_mask = item->mask; -if (udp_spec && udp_mask) { -if (tun_type ==ICE_SW_TUN_VXLAN && - tunnel_valid ==0 ) - list[t].type =ICE_UDP_OF ; -else - list[t].type =ICE_UDP_ILOS ; -if (udp_mask->hdr.src_port ==UINT16_MAX ) { - list[t].h_u.l4_hdr.src_port = - udp_spec->hdr.src_port; - list[t].m_u.l4_hdr.src_port = - udp_mask->hdr.src_port; - } -if (udp_mask->hdr.dst_port ==UINT16_MAX ) { - list[t].h_u.l4_hdr.dst_port = - udp_spec->hdr.dst_port; - list[t].m_u.l4_hdr.dst_port = - udp_mask->hdr.dst_port; - } - t++; - }else if (!udp_spec && !udp_mask) { - list[t].type =ICE_UDP_ILOS ; - } -break ; - -case RTE_FLOW_ITEM_TYPE_TCP : - tcp_spec = item->spec; - tcp_mask = item->mask; -if (tcp_spec && tcp_mask) { - list[t].type =ICE_TCP_IL ; -if (tcp_mask->hdr.src_port ==UINT16_MAX ) { - list[t].h_u.l4_hdr.src_port = - tcp_spec->hdr.src_port; - list[t].m_u.l4_hdr.src_port = - tcp_mask->hdr.src_port; - } -if (tcp_mask->hdr.dst_port ==UINT16_MAX ) { - list[t].h_u.l4_hdr.dst_port = - tcp_spec->hdr.dst_port; - list[t].m_u.l4_hdr.dst_port = - tcp_mask->hdr.dst_port; - } - t++; - }else if (!tcp_spec && !tcp_mask) { - list[t].type =ICE_TCP_IL ; - } -break ; - -case RTE_FLOW_ITEM_TYPE_SCTP : - sctp_spec = item->spec; - sctp_mask = item->mask; -if (sctp_spec && sctp_mask) { - list[t].type =ICE_SCTP_IL ; -if (sctp_mask->hdr.src_port ==UINT16_MAX ) { - list[t].h_u.sctp_hdr.src_port = - sctp_spec->hdr.src_port; - list[t].m_u.sctp_hdr.src_port = - sctp_mask->hdr.src_port; - } -if (sctp_mask->hdr.dst_port ==UINT16_MAX ) { - list[t].h_u.sctp_hdr.dst_port = - sctp_spec->hdr.dst_port; - list[t].m_u.sctp_hdr.dst_port = - sctp_mask->hdr.dst_port; - } - t++; - }else if (!sctp_spec && !sctp_mask) { - list[t].type =ICE_SCTP_IL ; - } -break ; - -case RTE_FLOW_ITEM_TYPE_VXLAN : - vxlan_spec = item->spec; - vxlan_mask = item->mask; - tunnel_valid =1 ; -if (vxlan_spec && vxlan_mask) { - list[t].type =ICE_VXLAN ; -if (vxlan_mask->vni[0 ] ==UINT8_MAX && - vxlan_mask->vni[1 ] ==UINT8_MAX && - vxlan_mask->vni[2 ] ==UINT8_MAX ) { - list[t].h_u.tnl_hdr.vni = - (vxlan_spec->vni[2 ] <<16 ) | - (vxlan_spec->vni[1 ] <<8 ) | - vxlan_spec->vni[0 ]; - list[t].m_u.tnl_hdr.vni = -UINT32_MAX ; - } - t++; - }else if (!vxlan_spec && !vxlan_mask) { - list[t].type =ICE_VXLAN ; - } -break ; - -case RTE_FLOW_ITEM_TYPE_NVGRE : - nvgre_spec = item->spec; - nvgre_mask = item->mask; - tunnel_valid =1 ; -if (nvgre_spec && nvgre_mask) { - list[t].type =ICE_NVGRE ; -if (nvgre_mask->tni[0 ] ==UINT8_MAX && - nvgre_mask->tni[1 ] ==UINT8_MAX && - nvgre_mask->tni[2 ] ==UINT8_MAX ) { - list[t].h_u.nvgre_hdr.tni_flow = - (nvgre_spec->tni[2 ] <<16 ) | - (nvgre_spec->tni[1 ] <<8 ) | - nvgre_spec->tni[0 ]; - list[t].m_u.nvgre_hdr.tni_flow = -UINT32_MAX ; - } - t++; - }else if (!nvgre_spec && !nvgre_mask) { - list[t].type =ICE_NVGRE ; - } -break ; - -case RTE_FLOW_ITEM_TYPE_VOID : -case RTE_FLOW_ITEM_TYPE_END : -break ; - -default : -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , actions, -"Invalid pattern item." ); - goto out; - } - } - - *lkups_num = t; - -return 0 ; -out: -return -rte_errno; -} - -/* By now ice switch filter action code implement only -* supports QUEUE or DROP. -*/ -static int -ice_parse_switch_action (struct ice_pf *pf, -const struct rte_flow_action *actions, -struct rte_flow_error *error, -struct ice_adv_rule_info *rule_info) -{ -struct ice_vsi *vsi = pf->main_vsi; -const struct rte_flow_action_queue *act_q; -uint16_t base_queue; -const struct rte_flow_action *action; -enum rte_flow_action_type action_type; - - base_queue = pf->base_queue; -for (action = actions; action->type != -RTE_FLOW_ACTION_TYPE_END ; action++) { - action_type = action->type; -switch (action_type) { -case RTE_FLOW_ACTION_TYPE_QUEUE : - act_q = action->conf; - rule_info->sw_act.fltr_act = -ICE_FWD_TO_Q ; - rule_info->sw_act.fwd_id.q_id = - base_queue + act_q->index; -break ; - -case RTE_FLOW_ACTION_TYPE_DROP : - rule_info->sw_act.fltr_act = -ICE_DROP_PACKET ; -break ; - -case RTE_FLOW_ACTION_TYPE_VOID : -break ; - -default : -rte_flow_error_set (error, -EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , - actions, -"Invalid action type" ); -return -rte_errno; - } - } - - rule_info->sw_act.vsi_handle = vsi->idx; - rule_info->rx =1 ; - rule_info->sw_act.src = vsi->idx; - rule_info->priority =5 ; - -return 0 ; -} - -static int -ice_switch_rule_set (struct ice_pf *pf, -struct ice_adv_lkup_elem *list, -uint16_t lkups_cnt, -struct ice_adv_rule_info *rule_info, -struct rte_flow *flow, -struct rte_flow_error *error) -{ -struct ice_hw *hw =ICE_PF_TO_HW (pf); -int ret; -struct ice_rule_query_data rule_added = {0 }; -struct ice_rule_query_data *filter_ptr; - -if (lkups_cnt >ICE_MAX_CHAIN_WORDS ) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM ,NULL , -"item number too large for rule" ); -return -rte_errno; - } -if (!list) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM ,NULL , -"lookup list should not be NULL" ); -return -rte_errno; - } - - ret =ice_add_adv_rule (hw, list, lkups_cnt, rule_info, &rule_added); - -if (!ret) { - filter_ptr =rte_zmalloc ("ice_switch_filter" , -sizeof (struct ice_rule_query_data ),0 ); -if (!filter_ptr) { -PMD_DRV_LOG (ERR ,"failed to allocate memory" ); -return -EINVAL ; - } - flow->rule = filter_ptr; -rte_memcpy (filter_ptr, - &rule_added, -sizeof (struct ice_rule_query_data )); - } - -return ret; -} - -int -ice_create_switch_filter (struct ice_pf *pf, -const struct rte_flow_item pattern[], -const struct rte_flow_action actions[], -struct rte_flow *flow, -struct rte_flow_error *error) -{ -int ret =0 ; -struct ice_adv_rule_info rule_info = {0 }; -struct ice_adv_lkup_elem *list =NULL ; -uint16_t lkups_num =0 ; -const struct rte_flow_item *item = pattern; -uint16_t item_num =0 ; -enum ice_sw_tunnel_type tun_type =ICE_NON_TUN ; - -for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) { - item_num++; -if (item->type ==RTE_FLOW_ITEM_TYPE_VXLAN ) - tun_type =ICE_SW_TUN_VXLAN ; -if (item->type ==RTE_FLOW_ITEM_TYPE_NVGRE ) - tun_type =ICE_SW_TUN_NVGRE ; -/* reserve one more memory slot for ETH which may -* consume 2 lookup items. -*/ -if (item->type ==RTE_FLOW_ITEM_TYPE_ETH ) - item_num++; - } - rule_info.tun_type = tun_type; - - list =rte_zmalloc (NULL , item_num *sizeof (*list),0 ); -if (!list) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"No memory for PMD internal items" ); -return -rte_errno; - } - - ret =ice_parse_switch_filter (pattern, actions, error, - list, &lkups_num, tun_type); -if (ret) - goto error; - - ret =ice_parse_switch_action (pf, actions, error, &rule_info); -if (ret) - goto error; - - ret =ice_switch_rule_set (pf, list, lkups_num, &rule_info, flow, error); -if (ret) - goto error; - -rte_free (list); -return 0 ; - -error: -rte_free (list); - -return -rte_errno; -} - -int -ice_destroy_switch_filter (struct ice_pf *pf, -struct rte_flow *flow, -struct rte_flow_error *error) -{ -struct ice_hw *hw =ICE_PF_TO_HW (pf); -int ret; -struct ice_rule_query_data *filter_ptr; - - filter_ptr = (struct ice_rule_query_data *) - flow->rule; - -if (!filter_ptr) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"no such flow" -" create by switch filter" ); -return -rte_errno; - } - - ret =ice_rem_adv_rule_by_id (hw, filter_ptr); -if (ret) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"fail to destroy switch filter rule" ); -return -rte_errno; - } - -rte_free (filter_ptr); -return ret; -} - -void -ice_free_switch_filter_rule(void *rule) -{ -struct ice_rule_query_data *filter_ptr; - - filter_ptr = (struct ice_rule_query_data *)rule; - -rte_free (filter_ptr); -}drivers/net/ice/ice_switch_filter.h +0
-17@@ -2,23 +2,5 @@* Copyright(c) 2019 Intel Corporation */ -#ifndef _ICE_SWITCH_FILTER_H_ -#define _ICE_SWITCH_FILTER_H_ -#include "base/ice_switch.h" -#include "base/ice_type.h" -#include "ice_ethdev.h" -int -ice_create_switch_filter (struct ice_pf *pf, -const struct rte_flow_item pattern[], -const struct rte_flow_action actions[], -struct rte_flow *flow, -struct rte_flow_error *error); -int -ice_destroy_switch_filter (struct ice_pf *pf, -struct rte_flow *flow, -struct rte_flow_error *error); -void -ice_free_switch_filter_rule(void *rule); -#endif /*_ICE_SWITCH_FILTER_H_ */
--
2.15.1
Re: [dpdk-dev] [PATCH 2/4] net/ice: rework for generic flow enabling
Quoted 10 lines · Ying A
For the previous indentation is not tab-aligned, I will add a separate code cleanup patch for these changes.
Quoted 7 lines
Quoted 7 lines
{ uint32_t cpy_count = 0; const struct rte_flow_item *pb = pattern, *pe = pattern; @@ -124,7 +285,6 @@ ice_pattern_skip_void_item(struct rte_flow_item *items, items += cpy_count;
Quoted 7 lines
Quoted 5 lines
drivers/net/ice/ice_generic_flow.c ice_pattern_skip_void_item(struct rte_flow_item *items, · line 127
Quoted 2 lines
if (pe->type == RTE_FLOW_ITEM_TYPE_END) {drivers/net/ice/ice_generic_flow.c +0
-1- pb = pe;seems this is some code cleanup, prefer a separate patch, not a strong opinion though.
OK, will add a separate patch for code cleanup.
Thanks, and please put the cleanup/fix patches at the beginning of your patchset.
Re: [dpdk-dev] [PATCH 2/4] net/ice: rework for generic flow enabling
In reply to Ying WangQuoted 129 lines · Ying Wang
The patch reworks the generic flow API (
rte_flow) implementation. It introduces an abstract layer which provides a unified interface for low-level filter engine (switch, fdir, hash) to register supported patterns and actions and implement flow validate/create/destroy/flush/ query activities.The patch also removes the existing switch filter implementation to avoid compile error. Switch filter implementation for the new framework will be added in the following patch.
Signed-off-by Ying Wang <[email protected]>---
drivers/net/ice/ice_ethdev.c | 22 +- drivers/net/ice/ice_ethdev.h | 15 +- drivers/net/ice/ice_generic_flow.c | 768 +++++++++++++++-------------------- drivers/net/ice/ice_generic_flow.h | 782 ++++++++---------------------------- drivers/net/ice/ice_switch_filter.c | 511 ----------------------- drivers/net/ice/ice_switch_filter.h | 18 - 6 files changed, 525 insertions(+), 1591 deletions(-)drivers/net/ice/ice_ethdev.c +10
-12@@ -15,7 +15,7 @@#include "base/ice_dcb.h" #include "ice_ethdev.h" #include "ice_rxtx.h" -#include "ice_switch_filter.h" +#include "ice_generic_flow.h" /* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support"@@ -1677,7 +1677,11 @@ ice_dev_init(struct rte_eth_dev *dev)/* get base queue pairs index in the device */ ice_base_queue_get (pf); -TAILQ_INIT (&pf->flow_list); + ret =ice_flow_init (ad); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to initialize flow" ); +return ret; + }return 0 ;@@ -1796,6 +1800,8 @@ ice_dev_close(struct rte_eth_dev *dev) {struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private);struct ice_hw *hw =ICE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct ice_adapter *ad = +ICE_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private);/* Since stop will make link down, then the link event will be * triggered, disable the irq firstly to avoid the port_infoe etc @@ -1806,6 +1812,8 @@ ice_dev_close(struct rte_eth_dev *dev)ice_dev_stop (dev); +ice_flow_uninit (ad); +/* release all queue resource */ ice_free_queues (dev);@@ -1822,8 +1830,6 @@ ice_dev_uninit(struct rte_eth_dev *dev) {struct rte_pci_device *pci_dev =RTE_ETH_DEV_TO_PCI (dev);struct rte_intr_handle *intr_handle = &pci_dev->intr_handle; -struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private); -struct rte_flow *p_flow;ice_dev_close (dev);@@ -1840,14 +1846,6 @@ ice_dev_uninit(struct rte_eth_dev *dev)/* unregister callback func from eal lib */ rte_intr_callback_unregister (intr_handle, ice_interrupt_handler, dev); - -/* Remove all flows */ -while ((p_flow =TAILQ_FIRST (&pf->flow_list))) { -TAILQ_REMOVE (&pf->flow_list, p_flow, node); -ice_free_switch_filter_rule (p_flow->rule); -rte_free (p_flow); - } -return 0 ; }drivers/net/ice/ice_ethdev.h +8
-7@@ -241,16 +241,14 @@ struct ice_vsi {bool offset_loaded; }; -extern const struct rte_flow_ops ice_flow_ops; - -/* Struct to store flow created. */ -struct rte_flow { -TAILQ_ENTRY (rte_flow) node; -void *rule; -}; +struct rte_flow ;TAILQ_HEAD (ice_flow_list, rte_flow); + +struct ice_flow_parser ; +TAILQ_HEAD (ice_parser_list, ice_flow_parser); +struct ice_pf {struct ice_adapter *adapter;/* The adapter this PF associate to */ struct ice_vsi *main_vsi;/* pointer to main VSI structure */ @@ -278,6 +276,9 @@ struct ice_pf {bool offset_loaded;bool adapter_stopped;struct ice_flow_list flow_list; +struct ice_parser_list rss_parser_list; +struct ice_parser_list perm_parser_list; +struct ice_parser_list dist_parser_list; };/** drivers/net/ice/ice_generic_flow.c +0
-0
drivers/net/ice/ice_generic_flow.c line 22
Quoted 7 lines
drivers/net/ice/ice_generic_flow.c +3
-1@@ -17,7 +17,22 @@#include "ice_ethdev.h" #include "ice_generic_flow.h" -#include "ice_switch_filter.h" + +/** +* Non-pipeline mode, fdir and swith both used as distributor,
s/swith/switch
Quoted 145 lines
drivers/net/ice/ice_generic_flow.c +130
-0+* fdir used first, switch used as fdir's backup. +*/ +#define ICE_FLOW_CLASSIFY_STAGE_DISTRIBUTOR_ONLY 0 +/*Pipeline mode, switch used at permission stage*/ +#define ICE_FLOW_CLASSIFY_STAGE_PERMISSION 1 +/*Pipeline mode, fdir used at distributor stage*/ +#define ICE_FLOW_CLASSIFY_STAGE_DISTRIBUTOR 2 + +static int ice_pipeline_stage = +ICE_FLOW_CLASSIFY_STAGE_DISTRIBUTOR_ONLY ; + +static struct ice_engine_list engine_list = +TAILQ_HEAD_INITIALIZER (engine_list); static int ice_flow_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,@@ -34,17 +49,153 @@ static int ice_flow_destroy(struct rte_eth_dev *dev, struct rte_flow_error *error);static int ice_flow_flush (struct rte_eth_dev *dev,struct rte_flow_error *error); +static int ice_flow_query_count (struct rte_eth_dev *dev, +struct rte_flow *flow, +const struct rte_flow_action *actions, +void *data, +struct rte_flow_error *error);const struct rte_flow_ops ice_flow_ops = { .validate = ice_flow_validate, .create = ice_flow_create, .destroy = ice_flow_destroy, .flush = ice_flow_flush, + .query = ice_flow_query_count, }; + +void +ice_register_flow_engine (struct ice_flow_engine *engine) +{ +TAILQ_INSERT_TAIL (&engine_list, engine, node); +} + +int +ice_flow_init (struct ice_adapter *ad) +{ +int ret =0 ; +struct ice_pf *pf = &ad->pf; +void *temp; +struct ice_flow_engine *engine =NULL ; + +TAILQ_INIT (&pf->flow_list); +TAILQ_INIT (&pf->rss_parser_list); +TAILQ_INIT (&pf->perm_parser_list); +TAILQ_INIT (&pf->dist_parser_list); + + TAILQ_FOREACH_SAFE(engine, &engine_list, node, temp) { +if (engine->init ==NULL ) +return -EINVAL ; + + ret = engine->init (ad); +if (ret) +return ret; + } +return 0 ; +} + +void +ice_flow_uninit (struct ice_adapter *ad) +{ +struct ice_pf *pf = &ad->pf; +struct ice_flow_engine *engine; +struct rte_flow *p_flow; +struct ice_flow_parser *p_parser; +void *temp; + + TAILQ_FOREACH_SAFE(engine, &engine_list, node, temp) { +if (engine->uninit) + engine->uninit (ad); + } + +/* Remove all flows */ +while ((p_flow =TAILQ_FIRST (&pf->flow_list))) { +TAILQ_REMOVE (&pf->flow_list, p_flow, node); +if (p_flow->engine->free) + p_flow->engine->free (p_flow); +rte_free (p_flow); + } + +/* Cleanup parser list */ +while ((p_parser =TAILQ_FIRST (&pf->rss_parser_list))) +TAILQ_REMOVE (&pf->rss_parser_list, p_parser, node); + +while ((p_parser =TAILQ_FIRST (&pf->perm_parser_list))) +TAILQ_REMOVE (&pf->perm_parser_list, p_parser, node); + +while ((p_parser =TAILQ_FIRST (&pf->dist_parser_list))) +TAILQ_REMOVE (&pf->dist_parser_list, p_parser, node); +} + +int +ice_register_parser (struct ice_flow_parser *parser, +struct ice_adapter *ad) +{ +struct ice_parser_list *list =NULL ; +struct ice_pf *pf = &ad->pf; + +switch (parser->stage) { +case ICE_FLOW_STAGE_RSS : + list = &pf->rss_parser_list; +break ; +case ICE_FLOW_STAGE_PERMISSION : + list = &pf->perm_parser_list; +break ; +case ICE_FLOW_STAGE_DISTRIBUTOR : + list = &pf->dist_parser_list; +break ; +default : +return -EINVAL ; + } + +if (ad->devargs.pipeline_mode_support) +TAILQ_INSERT_TAIL (list, parser, node); +else { +if (parser->engine->type ==ICE_FLOW_ENGINE_SWITCH + || parser->engine->type ==ICE_FLOW_ENGINE_HASH ) +TAILQ_INSERT_TAIL (list, parser, node); +else if (parser->engine->type ==ICE_FLOW_ENGINE_FDIR ) +TAILQ_INSERT_HEAD (list, parser, node); +else +return -EINVAL ; + } +return 0 ; +} + +void +ice_unregister_parser (struct ice_flow_parser *parser, +struct ice_adapter *ad) +{ +struct ice_pf *pf = &ad->pf; +struct ice_parser_list *list; +struct ice_flow_parser *p_parser; +void *temp; + +switch (parser->stage) { +case ICE_FLOW_STAGE_RSS : + list = &pf->rss_parser_list;
drivers/net/ice/ice_generic_flow.c static int ice_flow_destroy(struct rte_eth_dev *dev, · line 186
Quoted 10 lines
drivers/net/ice/ice_generic_flow.c +10
-0+break ; +case ICE_FLOW_STAGE_PERMISSION : + list = &pf->perm_parser_list; +break ; +case ICE_FLOW_STAGE_DISTRIBUTOR : + list = &pf->dist_parser_list; +break ; +default : +return ; + }
The switch blocks in above functions are the same, it's better to use a common function to reduce the duplicated code.
Thanks,
Xiaolong
Re: [dpdk-dev] [PATCH 2/4] net/ice: rework for generic flow enabling
Hi, Xiaolong
Quoted 141 lines
-----Original Message-----
From: Ye, Xiaolong
Sent: Saturday, September 7, 2019 12:13 AM
To: Wang, Ying A <[email protected]>
Cc: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>; [email protected]; Zhao1, Wei <[email protected]>
Subject: Re: [PATCH 2/4] net/ice: rework for generic flow enablingQuoted 132 lines · Ying Wang
The patch reworks the generic flow API (
rte_flow) implementation. It introduces an abstract layer which provides a unified interface for low-level filter engine (switch, fdir, hash) to register supported patterns and actions and implement flow validate/create/destroy/flush/ query activities.The patch also removes the existing switch filter implementation to avoid compile error. Switch filter implementation for the new framework will be added in the following patch.
Signed-off-by Ying Wang <[email protected]>---
drivers/net/ice/ice_ethdev.c | 22 +- drivers/net/ice/ice_ethdev.h | 15 +- drivers/net/ice/ice_generic_flow.c | 768+++++++++++++++--------------------
drivers/net/ice/ice_generic_flow.h| 782
++++++++----------------------------drivers/net/ice/ice_switch_filter.c| 511 -----------------------drivers/net/ice/ice_switch_filter.h| 18 -6 files changed, 525 insertions(+), 1591 deletions(-)(quoted diff) +0
-0
b/drivers/net/ice/ice_ethdev.cindex4e0645db1..647aca3ed100644drivers/net/ice/ice_ethdev.c +8
-3@@ -15,7 +15,7 @@#include "base/ice_dcb.h" #include "ice_ethdev.h" #include "ice_rxtx.h" -#include "ice_switch_filter.h" +#include "ice_generic_flow.h" /* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support"@@ -1677,7 +1677,11 @@ ice_dev_init(struct rte_eth_dev *dev)/* get base queue pairs index in the device */ ice_base_queue_get (pf); -TAILQ_INIT (&pf->flow_list); + ret =ice_flow_init (ad); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to initialize flow" ); +return ret; + }return 0 ;@@ -1796,6 +1800,8 @@ ice_dev_close(struct rte_eth_dev *dev) {struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private);struct ice_hw *hw =ICE_DEV_PRIVATE_TO_HW (dev->data- dev_private); +struct ice_adapter *ad = +ICE_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private);/* Since stop will make link down, then the link event will be * triggered, disable the irq firstly to avoid the port_infoe etc @@ -1806,6 +1812,8 @@ ice_dev_close(struct rte_eth_dev *dev) ice_dev_stop(dev);drivers/net/ice/ice_ethdev.c +2
-0+ice_flow_uninit (ad); +/* release all queue resource */ ice_free_queues(dev);drivers/net/ice/ice_ethdev.c +0
-10@@ -1822,8 +1830,6 @@ ice_dev_uninit(struct rte_eth_dev *dev) {struct rte_pci_device *pci_dev =RTE_ETH_DEV_TO_PCI (dev);struct rte_intr_handle *intr_handle = &pci_dev->intr_handle; -struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private); -struct rte_flow *p_flow;ice_dev_close (dev);@@ -1840,14 +1846,6 @@ ice_dev_uninit(struct rte_eth_dev *dev)/* unregister callback func from eal lib */ rte_intr_callback_unregister (intr_handle, ice_interrupt_handler, dev); - -/* Remove all flows */ -while ((p_flow =TAILQ_FIRST (&pf->flow_list))) { -TAILQ_REMOVE (&pf->flow_list, p_flow, node); -ice_free_switch_filter_rule (p_flow->rule); -rte_free (p_flow); - } -return 0 ; }(quoted diff) +0
-0
b/drivers/net/ice/ice_ethdev.hindex9bf5de08d..d1d07641d100644drivers/net/ice/ice_ethdev.h +5
-8@@ -241,16 +241,14 @@ struct ice_vsi {bool offset_loaded; }; -extern const struct rte_flow_ops ice_flow_ops; - -/* Struct to store flow created. */ -struct rte_flow { -TAILQ_ENTRY (rte_flow) node; -void *rule; -}; +struct rte_flow ;TAILQ_HEAD (ice_flow_list, rte_flow); + +struct ice_flow_parser ; +TAILQ_HEAD (ice_parser_list, ice_flow_parser); +struct ice_pf {struct ice_adapter *adapter;/* The adapter this PF associate to */ struct ice_vsi *main_vsi; /* pointer to main VSI structure */ @@ -278,6 +276,9 @@ struct ice_pf {bool offset_loaded; bool adapter_stopped; struct ice_flow_list flow_list;drivers/net/ice/ice_ethdev.h +3
-0+struct ice_parser_list rss_parser_list; +struct ice_parser_list perm_parser_list; +struct ice_parser_list dist_parser_list;};
/**
drivers/net/ice/ice_generic_flow.c +0
-0@@ -17,7 +17,22 @@
Quoted 8 lines
drivers/net/ice/ice_generic_flow.c line 22
Quoted 6 lines
drivers/net/ice/ice_generic_flow.c +3
-1#include "ice_ethdev.h" #include "ice_generic_flow.h" -#include "ice_switch_filter.h" + +/** +* Non-pipeline mode, fdir and swith both used as distributor, s/swith/switch
OK, will fix it in v2.
Quoted 146 lines
Quoted 146 lines
drivers/net/ice/ice_generic_flow.c +130
-0+* fdir used first, switch used as fdir's backup. +*/ +#define ICE_FLOW_CLASSIFY_STAGE_DISTRIBUTOR_ONLY 0/*Pipeline mode, +switch used at permission stage*/ #define +ICE_FLOW_CLASSIFY_STAGE_PERMISSION 1/*Pipeline mode, fdir used at +distributor stage*/ #define ICE_FLOW_CLASSIFY_STAGE_DISTRIBUTOR 2 + +static int ice_pipeline_stage = +ICE_FLOW_CLASSIFY_STAGE_DISTRIBUTOR_ONLY ; + +static struct ice_engine_list engine_list = +TAILQ_HEAD_INITIALIZER (engine_list); static int ice_flow_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,@@ -34,17 +49,153 @@ static int ice_flow_destroy(struct rte_eth_dev *dev, struct rte_flow_error *error);static int ice_flow_flush (struct rte_eth_dev *dev,struct rte_flow_error *error); +static int ice_flow_query_count (struct rte_eth_dev *dev, +struct rte_flow *flow, +const struct rte_flow_action *actions, +void *data, +struct rte_flow_error *error);const struct rte_flow_ops ice_flow_ops = { .validate = ice_flow_validate, .create = ice_flow_create, .destroy = ice_flow_destroy, .flush = ice_flow_flush, + .query = ice_flow_query_count, }; + +void +ice_register_flow_engine (struct ice_flow_engine *engine) { +TAILQ_INSERT_TAIL (&engine_list, engine, node); } + +int +ice_flow_init (struct ice_adapter *ad) +{ +int ret =0 ; +struct ice_pf *pf = &ad->pf; +void *temp; +struct ice_flow_engine *engine =NULL ; + +TAILQ_INIT (&pf->flow_list); +TAILQ_INIT (&pf->rss_parser_list); +TAILQ_INIT (&pf->perm_parser_list); +TAILQ_INIT (&pf->dist_parser_list); + + TAILQ_FOREACH_SAFE(engine, &engine_list, node, temp) { +if (engine->init ==NULL ) +return -EINVAL ; + + ret = engine->init (ad); +if (ret) +return ret; + } +return 0 ; +} + +void +ice_flow_uninit (struct ice_adapter *ad) { +struct ice_pf *pf = &ad->pf; +struct ice_flow_engine *engine; +struct rte_flow *p_flow; +struct ice_flow_parser *p_parser; +void *temp; + + TAILQ_FOREACH_SAFE(engine, &engine_list, node, temp) { +if (engine->uninit) + engine->uninit (ad); + } + +/* Remove all flows */ +while ((p_flow =TAILQ_FIRST (&pf->flow_list))) { +TAILQ_REMOVE (&pf->flow_list, p_flow, node); +if (p_flow->engine->free) + p_flow->engine->free (p_flow); +rte_free (p_flow); + } + +/* Cleanup parser list */ +while ((p_parser =TAILQ_FIRST (&pf->rss_parser_list))) +TAILQ_REMOVE (&pf->rss_parser_list, p_parser, node); + +while ((p_parser =TAILQ_FIRST (&pf->perm_parser_list))) +TAILQ_REMOVE (&pf->perm_parser_list, p_parser, node); + +while ((p_parser =TAILQ_FIRST (&pf->dist_parser_list))) +TAILQ_REMOVE (&pf->dist_parser_list, p_parser, node); } + +int +ice_register_parser (struct ice_flow_parser *parser, +struct ice_adapter *ad) +{ +struct ice_parser_list *list =NULL ; +struct ice_pf *pf = &ad->pf; + +switch (parser->stage) { +case ICE_FLOW_STAGE_RSS : + list = &pf->rss_parser_list; +break ; +case ICE_FLOW_STAGE_PERMISSION : + list = &pf->perm_parser_list; +break ; +case ICE_FLOW_STAGE_DISTRIBUTOR : + list = &pf->dist_parser_list; +break ; +default : +return -EINVAL ; + } + +if (ad->devargs.pipeline_mode_support) +TAILQ_INSERT_TAIL (list, parser, node); +else { +if (parser->engine->type ==ICE_FLOW_ENGINE_SWITCH + || parser->engine->type ==ICE_FLOW_ENGINE_HASH ) +TAILQ_INSERT_TAIL (list, parser, node); +else if (parser->engine->type ==ICE_FLOW_ENGINE_FDIR ) +TAILQ_INSERT_HEAD (list, parser, node); +else +return -EINVAL ; + } +return 0 ; +} + +void +ice_unregister_parser (struct ice_flow_parser *parser, +struct ice_adapter *ad) +{ +struct ice_pf *pf = &ad->pf; +struct ice_parser_list *list; +struct ice_flow_parser *p_parser; +void *temp; + +switch (parser->stage) { +case ICE_FLOW_STAGE_RSS : + list = &pf->rss_parser_list; +break ; +case ICE_FLOW_STAGE_PERMISSION : + list = &pf->perm_parser_list; +break ; +case ICE_FLOW_STAGE_DISTRIBUTOR :
Quoted 8 lines
drivers/net/ice/ice_generic_flow.c static int ice_flow_destroy(struct rte_eth_dev *dev, · line 186
Quoted 5 lines
drivers/net/ice/ice_generic_flow.c +5
-0+ list = &pf->dist_parser_list; +break ; +default : +return ; + }The switch blocks in above functions are the same, it's better to use a common function to reduce the duplicated code.
The switch blocks in the above two functions have little difference in the default behavior, one is return -EINVAL, the other is just return, for register/unregister funcs have different return value types. So, Can I just keep this format?
Quoted 3 lines
Thanks,
Xiaolong
Thanks,
Ying
Re: [dpdk-dev] [PATCH 2/4] net/ice: rework for generic flow enabling
Quoted 25 lines · Ying A
Quoted 16 lines
Quoted 16 lines
drivers/net/ice/ice_generic_flow.c +16
-0+ice_unregister_parser(struct ice_flow_parser *parser, + struct ice_adapter *ad) +{ + struct ice_pf *pf = &ad->pf; +struct ice_parser_list *list; +struct ice_flow_parser *p_parser; +void *temp; + +switch (parser->stage) { +case ICE_FLOW_STAGE_RSS : + list = &pf->rss_parser_list; +break ; +case ICE_FLOW_STAGE_PERMISSION : + list = &pf->perm_parser_list; +break ; +case ICE_FLOW_STAGE_DISTRIBUTOR :Quoted 8 lines
drivers/net/ice/ice_generic_flow.c static int ice_flow_destroy(struct rte_eth_dev *dev, · line 186
Quoted 5 lines
drivers/net/ice/ice_generic_flow.c +5
-0+ list = &pf->dist_parser_list; +break ; +default : +return ; + }The switch blocks in above functions are the same, it's better to use a common function to reduce the duplicated code.
Quoted 2 lines
The switch blocks in the above two functions have little difference in the default behavior, one is return
-EINVAL, the other is just return, for register/unregister funcs have different return value types. So, Can I just keep this format?
Duplication is bad and I think it should be easy to deal with the return type difference,
struct ice_prase_list * ice_get_parser_list(struct ice_flow_parser *parser,
struct ice_adapter *ad)
{
struct ice_parser_list *list = NULL;
struct ice_pf *pf = &ad->pf;
switch (parser->stage) {
case ICE_FLOW_STAGE_RSS:
list = &pf->rss_parser_list;
break;
case ICE_FLOW_STAGE_PERMISSION:
list = &pf->perm_parser_list;
break;
case ICE_FLOW_STAGE_DISTRIBUTOR:
list = &pf->dist_parser_list;
break;
default:
break;
}
return list;
}Then you just need to check its return value, if it's NULL, simply return -EINVAL on register and directly return on unregister.
Thanks,
Xiaolong
Re: [dpdk-dev] [PATCH 2/4] net/ice: rework for generic flow enabling
Quoted 69 lines
-----Original Message-----
From: Ye, Xiaolong
Sent: Monday, September 9, 2019 5:54 PM
To: Wang, Ying A <[email protected]>
Cc: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>; [email protected]; Zhao1, Wei <[email protected]>
Subject: Re: [PATCH 2/4] net/ice: rework for generic flow enablingQuoted 25 lines · Ying A
Quoted 16 lines
Quoted 16 lines
drivers/net/ice/ice_generic_flow.c +16
-0+ice_unregister_parser(struct ice_flow_parser *parser, + struct ice_adapter *ad) +{ + struct ice_pf *pf = &ad->pf; +struct ice_parser_list *list; +struct ice_flow_parser *p_parser; +void *temp; + +switch (parser->stage) { +case ICE_FLOW_STAGE_RSS : + list = &pf->rss_parser_list; +break ; +case ICE_FLOW_STAGE_PERMISSION : + list = &pf->perm_parser_list; +break ; +case ICE_FLOW_STAGE_DISTRIBUTOR :Quoted 8 lines
drivers/net/ice/ice_generic_flow.c static int ice_flow_destroy(struct rte_eth_dev *dev, · line 186
Quoted 5 lines
drivers/net/ice/ice_generic_flow.c +5
-0+ list = &pf->dist_parser_list; +break ; +default : +return ; + }The switch blocks in above functions are the same, it's better to use a common function to reduce the duplicated code.
Quoted 1 line
The switch blocks in the above two functions have little difference in the
default behavior, one is return
-EINVAL, the other is just return, for register/unregister funcs have different return value types. So, Can I just keep this format?Quoted 1 line
Duplication is bad and I think it should be easy to deal with the return type difference,
struct
ice_prase_list* ice_get_parser_list(structice_flow_parser*parser,
structice_adapter*ad){ struct ice_parser_list *list = NULL; struct ice_pf *pf = &ad->pf; switch (parser->stage) { case ICE_FLOW_STAGE_RSS: list = &pf->rss_parser_list; break; case ICE_FLOW_STAGE_PERMISSION: list = &pf->perm_parser_list; break; case ICE_FLOW_STAGE_DISTRIBUTOR: list = &pf->dist_parser_list; break; default: break; } return list; }
Quoted 2 lines
Then you just need to check its return value, if it's NULL, simply return
-EINVALon register and directly return on unregister.
OK, thanks for your guidance. I will fix it in v2.
Quoted 3 lines
Thanks,
Xiaolong
Re: [dpdk-dev] [PATCH 2/4] net/ice: rework for generic flow enabling
In reply to Ying WangQuoted 182 lines · Ying Wang
The patch reworks the generic flow API (
rte_flow) implementation. It introduces an abstract layer which provides a unified interface for low-level filter engine (switch, fdir, hash) to register supported patterns and actions and implement flow validate/create/destroy/flush/ query activities.The patch also removes the existing switch filter implementation to avoid compile error. Switch filter implementation for the new framework will be added in the following patch.
Signed-off-by Ying Wang <[email protected]>---
drivers/net/ice/ice_ethdev.c | 22 +- drivers/net/ice/ice_ethdev.h | 15 +- drivers/net/ice/ice_generic_flow.c | 768 +++++++++++++++-------------------- drivers/net/ice/ice_generic_flow.h | 782 ++++++++---------------------------- drivers/net/ice/ice_switch_filter.c | 511 ----------------------- drivers/net/ice/ice_switch_filter.h | 18 - 6 files changed, 525 insertions(+), 1591 deletions(-)drivers/net/ice/ice_ethdev.c +10
-12@@ -15,7 +15,7 @@#include "base/ice_dcb.h" #include "ice_ethdev.h" #include "ice_rxtx.h" -#include "ice_switch_filter.h" +#include "ice_generic_flow.h" /* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support"@@ -1677,7 +1677,11 @@ ice_dev_init(struct rte_eth_dev *dev)/* get base queue pairs index in the device */ ice_base_queue_get (pf); -TAILQ_INIT (&pf->flow_list); + ret =ice_flow_init (ad); +if (ret) { +PMD_INIT_LOG (ERR ,"Failed to initialize flow" ); +return ret; + }return 0 ;@@ -1796,6 +1800,8 @@ ice_dev_close(struct rte_eth_dev *dev) {struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private);struct ice_hw *hw =ICE_DEV_PRIVATE_TO_HW (dev->data->dev_private); +struct ice_adapter *ad = +ICE_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private);/* Since stop will make link down, then the link event will be * triggered, disable the irq firstly to avoid the port_infoe etc @@ -1806,6 +1812,8 @@ ice_dev_close(struct rte_eth_dev *dev)ice_dev_stop (dev); +ice_flow_uninit (ad); +/* release all queue resource */ ice_free_queues (dev);@@ -1822,8 +1830,6 @@ ice_dev_uninit(struct rte_eth_dev *dev) {struct rte_pci_device *pci_dev =RTE_ETH_DEV_TO_PCI (dev);struct rte_intr_handle *intr_handle = &pci_dev->intr_handle; -struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private); -struct rte_flow *p_flow;ice_dev_close (dev);@@ -1840,14 +1846,6 @@ ice_dev_uninit(struct rte_eth_dev *dev)/* unregister callback func from eal lib */ rte_intr_callback_unregister (intr_handle, ice_interrupt_handler, dev); - -/* Remove all flows */ -while ((p_flow =TAILQ_FIRST (&pf->flow_list))) { -TAILQ_REMOVE (&pf->flow_list, p_flow, node); -ice_free_switch_filter_rule (p_flow->rule); -rte_free (p_flow); - } -return 0 ; }drivers/net/ice/ice_ethdev.h +8
-7@@ -241,16 +241,14 @@ struct ice_vsi {bool offset_loaded; }; -extern const struct rte_flow_ops ice_flow_ops; - -/* Struct to store flow created. */ -struct rte_flow { -TAILQ_ENTRY (rte_flow) node; -void *rule; -}; +struct rte_flow ;TAILQ_HEAD (ice_flow_list, rte_flow); + +struct ice_flow_parser ; +TAILQ_HEAD (ice_parser_list, ice_flow_parser); +struct ice_pf {struct ice_adapter *adapter;/* The adapter this PF associate to */ struct ice_vsi *main_vsi;/* pointer to main VSI structure */ @@ -278,6 +276,9 @@ struct ice_pf {bool offset_loaded;bool adapter_stopped;struct ice_flow_list flow_list; +struct ice_parser_list rss_parser_list; +struct ice_parser_list perm_parser_list; +struct ice_parser_list dist_parser_list; };/** drivers/net/ice/ice_generic_flow.c +34
-1@@ -17,7 +17,22 @@#include "ice_ethdev.h" #include "ice_generic_flow.h" -#include "ice_switch_filter.h" + +/** +* Non-pipeline mode, fdir and swith both used as distributor, +* fdir used first, switch used as fdir's backup. +*/ +#define ICE_FLOW_CLASSIFY_STAGE_DISTRIBUTOR_ONLY 0 +/*Pipeline mode, switch used at permission stage*/ +#define ICE_FLOW_CLASSIFY_STAGE_PERMISSION 1 +/*Pipeline mode, fdir used at distributor stage*/ +#define ICE_FLOW_CLASSIFY_STAGE_DISTRIBUTOR 2 + +static int ice_pipeline_stage = +ICE_FLOW_CLASSIFY_STAGE_DISTRIBUTOR_ONLY ; + +static struct ice_engine_list engine_list = +TAILQ_HEAD_INITIALIZER (engine_list); static int ice_flow_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,@@ -34,17 +49,153 @@ static int ice_flow_destroy(struct rte_eth_dev *dev, struct rte_flow_error *error);static int ice_flow_flush (struct rte_eth_dev *dev,struct rte_flow_error *error); +static int ice_flow_query_count (struct rte_eth_dev *dev, +struct rte_flow *flow, +const struct rte_flow_action *actions, +void *data, +struct rte_flow_error *error);const struct rte_flow_ops ice_flow_ops = { .validate = ice_flow_validate, .create = ice_flow_create, .destroy = ice_flow_destroy, .flush = ice_flow_flush, + .query = ice_flow_query_count, }; + +void +ice_register_flow_engine (struct ice_flow_engine *engine) +{ +TAILQ_INSERT_TAIL (&engine_list, engine, node); +} + +int +ice_flow_init (struct ice_adapter *ad) +{ +int ret =0 ; +struct ice_pf *pf = &ad->pf;
drivers/net/ice/ice_generic_flow.c static int ice_flow_destroy(struct rte_eth_dev *dev, · line 87
Quoted 10 lines
drivers/net/ice/ice_generic_flow.c +10
-0+void *temp; +struct ice_flow_engine *engine =NULL ; + +TAILQ_INIT (&pf->flow_list); +TAILQ_INIT (&pf->rss_parser_list); +TAILQ_INIT (&pf->perm_parser_list); +TAILQ_INIT (&pf->dist_parser_list); + + TAILQ_FOREACH_SAFE(engine, &engine_list, node, temp) { +if (engine->init ==NULL )
What about provide some debug log info here? Adding one engine name member to struct ice_flow_engine may help.
Quoted 128 lines
drivers/net/ice/ice_generic_flow.c +107
-0+return -EINVAL ; + + ret = engine->init (ad); +if (ret) +return ret; + } +return 0 ; +} + +void +ice_flow_uninit (struct ice_adapter *ad) +{ +struct ice_pf *pf = &ad->pf; +struct ice_flow_engine *engine; +struct rte_flow *p_flow; +struct ice_flow_parser *p_parser; +void *temp; + + TAILQ_FOREACH_SAFE(engine, &engine_list, node, temp) { +if (engine->uninit) + engine->uninit (ad); + } + +/* Remove all flows */ +while ((p_flow =TAILQ_FIRST (&pf->flow_list))) { +TAILQ_REMOVE (&pf->flow_list, p_flow, node); +if (p_flow->engine->free) + p_flow->engine->free (p_flow); +rte_free (p_flow); + } + +/* Cleanup parser list */ +while ((p_parser =TAILQ_FIRST (&pf->rss_parser_list))) +TAILQ_REMOVE (&pf->rss_parser_list, p_parser, node); + +while ((p_parser =TAILQ_FIRST (&pf->perm_parser_list))) +TAILQ_REMOVE (&pf->perm_parser_list, p_parser, node); + +while ((p_parser =TAILQ_FIRST (&pf->dist_parser_list))) +TAILQ_REMOVE (&pf->dist_parser_list, p_parser, node); +} + +int +ice_register_parser (struct ice_flow_parser *parser, +struct ice_adapter *ad) +{ +struct ice_parser_list *list =NULL ; +struct ice_pf *pf = &ad->pf; + +switch (parser->stage) { +case ICE_FLOW_STAGE_RSS : + list = &pf->rss_parser_list; +break ; +case ICE_FLOW_STAGE_PERMISSION : + list = &pf->perm_parser_list; +break ; +case ICE_FLOW_STAGE_DISTRIBUTOR : + list = &pf->dist_parser_list; +break ; +default : +return -EINVAL ; + } + +if (ad->devargs.pipeline_mode_support) +TAILQ_INSERT_TAIL (list, parser, node); +else { +if (parser->engine->type ==ICE_FLOW_ENGINE_SWITCH + || parser->engine->type ==ICE_FLOW_ENGINE_HASH ) +TAILQ_INSERT_TAIL (list, parser, node); +else if (parser->engine->type ==ICE_FLOW_ENGINE_FDIR ) +TAILQ_INSERT_HEAD (list, parser, node); +else +return -EINVAL ; + } +return 0 ; +} + +void +ice_unregister_parser (struct ice_flow_parser *parser, +struct ice_adapter *ad) +{ +struct ice_pf *pf = &ad->pf; +struct ice_parser_list *list; +struct ice_flow_parser *p_parser; +void *temp; + +switch (parser->stage) { +case ICE_FLOW_STAGE_RSS : + list = &pf->rss_parser_list; +break ; +case ICE_FLOW_STAGE_PERMISSION : + list = &pf->perm_parser_list; +break ; +case ICE_FLOW_STAGE_DISTRIBUTOR : + list = &pf->dist_parser_list; +break ; +default : +return ; + } + + TAILQ_FOREACH_SAFE(p_parser, list, node, temp) { +if (p_parser->engine->type == parser->engine->type) +TAILQ_REMOVE (list, p_parser, node); + } + +} +static int
drivers/net/ice/ice_generic_flow.c +3
-2-ice_flow_valid_attr(const struct rte_flow_attr *attr, - struct rte_flow_error *error) +ice_flow_valid_attr(struct ice_adapter *ad, + const struct rte_flow_attr *attr, + struct rte_flow_error *error){ /* Must be input direction */ if (!attr->ingress) {drivers/net/ice/ice_generic_flow.c +1
-7@@ -61,15 +212,25 @@ ice_flow_valid_attr(const struct rte_flow_attr *attr, attr, "Not support egress.");return -rte_errno; } - -/* Not supported */ -if (attr->priority) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY , - attr,"Not support priority." ); -return -rte_errno; +/* Check pipeline mode support to set classification stage */
drivers/net/ice/ice_generic_flow.c ice_flow_valid_attr(const struct rte_flow_attr *attr, · line 225
Quoted 10 lines
drivers/net/ice/ice_generic_flow.c +10
-0+if (ad->devargs.pipeline_mode_support) { +if (0 == attr->priority) + ice_pipeline_stage = +ICE_FLOW_CLASSIFY_STAGE_PERMISSION ; +else + ice_pipeline_stage = +ICE_FLOW_CLASSIFY_STAGE_DISTRIBUTOR ; + }else { + ice_pipeline_stage = +ICE_FLOW_CLASSIFY_STAGE_DISTRIBUTOR_ONLY ;
Do we really this assignment?
drivers/net/ice/ice_generic_flow.c ice_flow_valid_attr(const struct rte_flow_attr *attr, · line 72
Quoted 9 lines
drivers/net/ice/ice_generic_flow.c +7
-1+/* Not supported */ +if (attr->priority) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY , + attr,"Not support priority." ); +return -rte_errno; + } } -
Unrelated change.
Quoted 39 lines
drivers/net/ice/ice_generic_flow.c +0
-0/* Not supported */ if (attr->group) { rte_flow_error_set(error, EINVAL,@@ -102,7 +263,7 @@ ice_find_first_item(const struct rte_flow_item *item, bool is_void)/* Skip all VOID items of the pattern */ static void
ice_pattern_skip_void_item(structrte_flow_item*items,drivers/net/ice/ice_generic_flow.c +1
-1- const struct rte_flow_item *pattern) + const struct rte_flow_item *pattern){ uint32_t cpy_count = 0; const struct rte_flow_item *pb = pattern, *pe = pattern;drivers/net/ice/ice_generic_flow.c +6
-3@@ -124,7 +285,6 @@ ice_pattern_skip_void_item(struct rte_flow_item *items, items += cpy_count;if (pe->type ==RTE_FLOW_ITEM_TYPE_END ) { - pb = pe;break ; }@@ -151,11 +311,15 @@ ice_match_pattern(enum rte_flow_item_type *item_array, item->type == RTE_FLOW_ITEM_TYPE_END); } -static uint64_t ice_flow_valid_pattern (const struct rte_flow_item pattern[], +struct ice_pattern_match_item * +ice_search_pattern_match_item (const struct rte_flow_item pattern[], +struct ice_pattern_match_item *array, +uint32_t array_len,struct rte_flow_error *error) {uint16_t i =0 ; -uint64_t inset; +struct ice_pattern_match_item *pattern_match_item; +/* need free by each filter */ struct rte_flow_item *items;/* used for pattern without VOID items */ uint32_t item_num =0 ;/* non-void item number */
drivers/net/ice/ice_generic_flow.c static uint64_t ice_flow_valid_pattern(const struct rte_flow_item pattern[], · line 344
Quoted 10 lines
drivers/net/ice/ice_generic_flow.c +6
-1@@ -172,451 +336,149 @@ static uint64_t ice_flow_valid_pattern(const struct rte_flow_item pattern[],if (!items) {rte_flow_error_set (error,ENOMEM ,RTE_FLOW_ERROR_TYPE_ITEM_NUM ,NULL ,"No memory for PMD internal items." ); -return -ENOMEM ; +return NULL ; + } + pattern_match_item =rte_zmalloc ("ice_pattern_match_item" , +sizeof (struct ice_pattern_match_item ),0 ); +if (!pattern_match_item) { +PMD_DRV_LOG (ERR ,"Failed to allocate memory." );
Use rte_flow_error_set to align with others.
Quoted 560 lines
drivers/net/ice/ice_generic_flow.c +29
-369+return NULL ; } -ice_pattern_skip_void_item (items, pattern); -for (i =0 ; i <RTE_DIM (ice_supported_patterns); i++) -if (ice_match_pattern (ice_supported_patterns[i].items, +for (i =0 ; i < array_len; i++) +if (ice_match_pattern (array[i].pattern_list, items)) { - inset = ice_supported_patterns[i].sw_fields; + pattern_match_item->input_set_mask = + array[i].input_set_mask; + pattern_match_item->pattern_list = + array[i].pattern_list; + pattern_match_item->meta = array[i].meta;rte_free (items); -return inset; +return pattern_match_item; }rte_flow_error_set (error,EINVAL ,RTE_FLOW_ERROR_TYPE_ITEM , pattern,"Unsupported pattern" );rte_free (items); -return 0 ; -} - -static uint64_t ice_get_flow_field (const struct rte_flow_item pattern[], -struct rte_flow_error *error) -{ -const struct rte_flow_item *item = pattern; -const struct rte_flow_item_eth *eth_spec, *eth_mask; -const struct rte_flow_item_ipv4 *ipv4_spec, *ipv4_mask; -const struct rte_flow_item_ipv6 *ipv6_spec, *ipv6_mask; -const struct rte_flow_item_tcp *tcp_spec, *tcp_mask; -const struct rte_flow_item_udp *udp_spec, *udp_mask; -const struct rte_flow_item_sctp *sctp_spec, *sctp_mask; -const struct rte_flow_item_icmp *icmp_mask; -const struct rte_flow_item_icmp6 *icmp6_mask; -const struct rte_flow_item_vxlan *vxlan_spec, *vxlan_mask; -const struct rte_flow_item_nvgre *nvgre_spec, *nvgre_mask; -enum rte_flow_item_type item_type; -uint8_t ipv6_addr_mask[16 ] = { -0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF , -0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF }; -uint64_t input_set =ICE_INSET_NONE ; -bool is_tunnel = false; - -for (; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) { -if (item->last) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , - item, -"Not support range" ); -return 0 ; - } - item_type = item->type; -switch (item_type) { -case RTE_FLOW_ITEM_TYPE_ETH : - eth_spec = item->spec; - eth_mask = item->mask; - -if (eth_spec && eth_mask) { -if (rte_is_broadcast_ether_addr (ð_mask->src)) - input_set |=ICE_INSET_SMAC ; -if (rte_is_broadcast_ether_addr (ð_mask->dst)) - input_set |=ICE_INSET_DMAC ; -if (eth_mask->type ==RTE_BE16 (0xffff )) - input_set |=ICE_INSET_ETHERTYPE ; - } -break ; -case RTE_FLOW_ITEM_TYPE_IPV4 : - ipv4_spec = item->spec; - ipv4_mask = item->mask; - -if (!(ipv4_spec && ipv4_mask)) -break ; - -/* Check IPv4 mask and update input set */ -if (ipv4_mask->hdr.version_ihl || - ipv4_mask->hdr.total_length || - ipv4_mask->hdr.packet_id || - ipv4_mask->hdr.hdr_checksum) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , - item, -"Invalid IPv4 mask." ); -return 0 ; - } - -if (is_tunnel) { -if (ipv4_mask->hdr.src_addr ==UINT32_MAX ) - input_set |=ICE_INSET_TUN_IPV4_SRC ; -if (ipv4_mask->hdr.dst_addr ==UINT32_MAX ) - input_set |=ICE_INSET_TUN_IPV4_DST ; -if (ipv4_mask->hdr.time_to_live ==UINT8_MAX ) - input_set |=ICE_INSET_TUN_IPV4_TTL ; -if (ipv4_mask->hdr.next_proto_id ==UINT8_MAX ) - input_set |=ICE_INSET_TUN_IPV4_PROTO ; - }else { -if (ipv4_mask->hdr.src_addr ==UINT32_MAX ) - input_set |=ICE_INSET_IPV4_SRC ; -if (ipv4_mask->hdr.dst_addr ==UINT32_MAX ) - input_set |=ICE_INSET_IPV4_DST ; -if (ipv4_mask->hdr.time_to_live ==UINT8_MAX ) - input_set |=ICE_INSET_IPV4_TTL ; -if (ipv4_mask->hdr.next_proto_id ==UINT8_MAX ) - input_set |=ICE_INSET_IPV4_PROTO ; -if (ipv4_mask->hdr.type_of_service ==UINT8_MAX ) - input_set |=ICE_INSET_IPV4_TOS ; - } -break ; -case RTE_FLOW_ITEM_TYPE_IPV6 : - ipv6_spec = item->spec; - ipv6_mask = item->mask; - -if (!(ipv6_spec && ipv6_mask)) -break ; - -if (ipv6_mask->hdr.payload_len) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , - item, -"Invalid IPv6 mask" ); -return 0 ; - } - -if (is_tunnel) { -if (!memcmp (ipv6_mask->hdr.src_addr, - ipv6_addr_mask, -RTE_DIM (ipv6_mask->hdr.src_addr))) - input_set |=ICE_INSET_TUN_IPV6_SRC ; -if (!memcmp (ipv6_mask->hdr.dst_addr, - ipv6_addr_mask, -RTE_DIM (ipv6_mask->hdr.dst_addr))) - input_set |=ICE_INSET_TUN_IPV6_DST ; -if (ipv6_mask->hdr.proto ==UINT8_MAX ) - input_set |=ICE_INSET_TUN_IPV6_PROTO ; -if (ipv6_mask->hdr.hop_limits ==UINT8_MAX ) - input_set |=ICE_INSET_TUN_IPV6_TTL ; - }else { -if (!memcmp (ipv6_mask->hdr.src_addr, - ipv6_addr_mask, -RTE_DIM (ipv6_mask->hdr.src_addr))) - input_set |=ICE_INSET_IPV6_SRC ; -if (!memcmp (ipv6_mask->hdr.dst_addr, - ipv6_addr_mask, -RTE_DIM (ipv6_mask->hdr.dst_addr))) - input_set |=ICE_INSET_IPV6_DST ; -if (ipv6_mask->hdr.proto ==UINT8_MAX ) - input_set |=ICE_INSET_IPV6_PROTO ; -if (ipv6_mask->hdr.hop_limits ==UINT8_MAX ) - input_set |=ICE_INSET_IPV6_HOP_LIMIT ; -if ((ipv6_mask->hdr.vtc_flow & -rte_cpu_to_be_32 (RTE_IPV6_HDR_TC_MASK )) - ==rte_cpu_to_be_32 - (RTE_IPV6_HDR_TC_MASK )) - input_set |=ICE_INSET_IPV6_TOS ; - } - -break ; -case RTE_FLOW_ITEM_TYPE_UDP : - udp_spec = item->spec; - udp_mask = item->mask; - -if (!(udp_spec && udp_mask)) -break ; - -/* Check UDP mask and update input set*/ -if (udp_mask->hdr.dgram_len || - udp_mask->hdr.dgram_cksum) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , - item, -"Invalid UDP mask" ); -return 0 ; - } - -if (is_tunnel) { -if (udp_mask->hdr.src_port ==UINT16_MAX ) - input_set |=ICE_INSET_TUN_SRC_PORT ; -if (udp_mask->hdr.dst_port ==UINT16_MAX ) - input_set |=ICE_INSET_TUN_DST_PORT ; - }else { -if (udp_mask->hdr.src_port ==UINT16_MAX ) - input_set |=ICE_INSET_SRC_PORT ; -if (udp_mask->hdr.dst_port ==UINT16_MAX ) - input_set |=ICE_INSET_DST_PORT ; - } - -break ; -case RTE_FLOW_ITEM_TYPE_TCP : - tcp_spec = item->spec; - tcp_mask = item->mask; - -if (!(tcp_spec && tcp_mask)) -break ; - -/* Check TCP mask and update input set */ -if (tcp_mask->hdr.sent_seq || - tcp_mask->hdr.recv_ack || - tcp_mask->hdr.data_off || - tcp_mask->hdr.tcp_flags || - tcp_mask->hdr.rx_win || - tcp_mask->hdr.cksum || - tcp_mask->hdr.tcp_urp) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , - item, -"Invalid TCP mask" ); -return 0 ; - } - -if (is_tunnel) { -if (tcp_mask->hdr.src_port ==UINT16_MAX ) - input_set |=ICE_INSET_TUN_SRC_PORT ; -if (tcp_mask->hdr.dst_port ==UINT16_MAX ) - input_set |=ICE_INSET_TUN_DST_PORT ; - }else { -if (tcp_mask->hdr.src_port ==UINT16_MAX ) - input_set |=ICE_INSET_SRC_PORT ; -if (tcp_mask->hdr.dst_port ==UINT16_MAX ) - input_set |=ICE_INSET_DST_PORT ; - } - -break ; -case RTE_FLOW_ITEM_TYPE_SCTP : - sctp_spec = item->spec; - sctp_mask = item->mask; - -if (!(sctp_spec && sctp_mask)) -break ; - -/* Check SCTP mask and update input set */ -if (sctp_mask->hdr.cksum) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , - item, -"Invalid SCTP mask" ); -return 0 ; - } - -if (is_tunnel) { -if (sctp_mask->hdr.src_port ==UINT16_MAX ) - input_set |=ICE_INSET_TUN_SRC_PORT ; -if (sctp_mask->hdr.dst_port ==UINT16_MAX ) - input_set |=ICE_INSET_TUN_DST_PORT ; - }else { -if (sctp_mask->hdr.src_port ==UINT16_MAX ) - input_set |=ICE_INSET_SRC_PORT ; -if (sctp_mask->hdr.dst_port ==UINT16_MAX ) - input_set |=ICE_INSET_DST_PORT ; - } - -break ; -case RTE_FLOW_ITEM_TYPE_ICMP : - icmp_mask = item->mask; -if (icmp_mask->hdr.icmp_code || - icmp_mask->hdr.icmp_cksum || - icmp_mask->hdr.icmp_ident || - icmp_mask->hdr.icmp_seq_nb) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , - item, -"Invalid ICMP mask" ); -return 0 ; - } - -if (icmp_mask->hdr.icmp_type ==UINT8_MAX ) - input_set |=ICE_INSET_ICMP ; -break ; -case RTE_FLOW_ITEM_TYPE_ICMP6 : - icmp6_mask = item->mask; -if (icmp6_mask->code || - icmp6_mask->checksum) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , - item, -"Invalid ICMP6 mask" ); -return 0 ; - } - -if (icmp6_mask->type ==UINT8_MAX ) - input_set |=ICE_INSET_ICMP6 ; -break ; -case RTE_FLOW_ITEM_TYPE_VXLAN : - vxlan_spec = item->spec; - vxlan_mask = item->mask; -/* Check if VXLAN item is used to describe protocol. -* If yes, both spec and mask should be NULL. -* If no, both spec and mask shouldn't be NULL. -*/ -if ((!vxlan_spec && vxlan_mask) || - (vxlan_spec && !vxlan_mask)) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , - item, -"Invalid VXLAN item" ); -return 0 ; - } -if (vxlan_mask && vxlan_mask->vni[0 ] ==UINT8_MAX && - vxlan_mask->vni[1 ] ==UINT8_MAX && - vxlan_mask->vni[2 ] ==UINT8_MAX ) - input_set |=ICE_INSET_TUN_ID ; - is_tunnel =1 ; - -break ; -case RTE_FLOW_ITEM_TYPE_NVGRE : - nvgre_spec = item->spec; - nvgre_mask = item->mask; -/* Check if NVGRE item is used to describe protocol. -* If yes, both spec and mask should be NULL. -* If no, both spec and mask shouldn't be NULL. -*/ -if ((!nvgre_spec && nvgre_mask) || - (nvgre_spec && !nvgre_mask)) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , - item, -"Invalid NVGRE item" ); -return 0 ; - } -if (nvgre_mask && nvgre_mask->tni[0 ] ==UINT8_MAX && - nvgre_mask->tni[1 ] ==UINT8_MAX && - nvgre_mask->tni[2 ] ==UINT8_MAX ) - input_set |=ICE_INSET_TUN_ID ; - is_tunnel =1 ; - -break ; -case RTE_FLOW_ITEM_TYPE_VOID : -break ; -default : -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , - item, -"Invalid pattern" ); -break ; - } - } -return input_set; -} - -static int ice_flow_valid_inset (const struct rte_flow_item pattern[], -uint64_t inset,struct rte_flow_error *error) -{ -uint64_t fields; - -/* get valid field */ - fields =ice_get_flow_field (pattern, error); -if (!fields || fields & (~inset)) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM_SPEC , - pattern, -"Invalid input set" ); -return -rte_errno; - } - -return 0 ; +rte_free (pattern_match_item); +return NULL ; } -static int ice_flow_valid_action (struct rte_eth_dev *dev, -const struct rte_flow_action *actions, -struct rte_flow_error *error) +static struct ice_flow_engine * +ice_parse_engine (struct ice_adapter *ad, +struct ice_parser_list *parser_list, +const struct rte_flow_item pattern[], +const struct rte_flow_action actions[], +void **meta, +struct rte_flow_error *error) { -const struct rte_flow_action_queue *act_q; -uint16_t queue; -const struct rte_flow_action *action; -for (action = actions; action->type != -RTE_FLOW_ACTION_TYPE_END ; action++) { -switch (action->type) { -case RTE_FLOW_ACTION_TYPE_QUEUE : - act_q = action->conf; - queue = act_q->index; -if (queue >= dev->data->nb_rx_queues) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ACTION , - actions,"Invalid queue ID for" -" switch filter." ); -return -rte_errno; - } -break ; -case RTE_FLOW_ACTION_TYPE_DROP : -case RTE_FLOW_ACTION_TYPE_VOID : -break ; -default : -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ACTION , actions, -"Invalid action." ); -return -rte_errno; - } +struct ice_flow_engine *engine =NULL ; +struct ice_flow_parser *parser =NULL ; +void *temp; + TAILQ_FOREACH_SAFE(parser, parser_list, node, temp) { +if (parser->parse_pattern_action (ad, parser->array, + parser->array_len, pattern, actions, + meta, error) <0 ) +continue ; + engine = parser->engine; +break ; } -return 0 ; +return engine; }static int
drivers/net/ice/ice_generic_flow.c +7
-5-ice_flow_validate(struct rte_eth_dev *dev, - const struct rte_flow_attr *attr, - const struct rte_flow_item pattern[], - const struct rte_flow_action actions[], - struct rte_flow_error *error) +ice_flow_validate_filter(struct rte_eth_dev *dev, + const struct rte_flow_attr *attr, + const struct rte_flow_item pattern[], + const struct rte_flow_action actions[], + struct ice_flow_engine **engine, + void **meta, + struct rte_flow_error *error){
drivers/net/ice/ice_generic_flow.c +0
-1-uint64_t inset =0 ;int ret = ICE_ERR_NOT_SUPPORTED;drivers/net/ice/ice_generic_flow.c +3
-0+struct ice_adapter *ad = +ICE_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private); +struct ice_pf *pf =ICE_DEV_PRIVATE_TO_PF (dev->data->dev_private);if (!pattern) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM_NUM,drivers/net/ice/ice_generic_flow.c +1
-1- NULL, "NULL pattern."); + NULL, "NULL pattern.");return -rte_errno; } if (!actions) { rte_flow_error_set(error, EINVAL,drivers/net/ice/ice_generic_flow.c +2
-2-RTE_FLOW_ERROR_TYPE_ACTION_NUM , - NULL, "NULL action."); +RTE_FLOW_ERROR_TYPE_ACTION_NUM , + NULL, "NULL action.");return -rte_errno; } - if (!attr) { rte_flow_error_set(error, EINVAL,drivers/net/ice/ice_generic_flow.c +2
-2-RTE_FLOW_ERROR_TYPE_ATTR , - NULL, "NULL attribute."); +RTE_FLOW_ERROR_TYPE_ATTR , + NULL, "NULL attribute.");return -rte_errno; }drivers/net/ice/ice_generic_flow.c +1
-1- ret =ice_flow_valid_attr (attr, error); + ret =ice_flow_valid_attr (ad, attr, error);if (ret) return ret;drivers/net/ice/ice_generic_flow.c +20
-10- inset =ice_flow_valid_pattern (pattern, error); -if (!inset) -return -rte_errno; - - ret =ice_flow_valid_inset (pattern, inset, error); -if (ret) -return ret; + *engine =ice_parse_engine (ad, &pf->rss_parser_list, pattern, actions, + meta, error); +if (*engine !=NULL ) +return 0 ; + +switch (ice_pipeline_stage) { +case ICE_FLOW_CLASSIFY_STAGE_DISTRIBUTOR_ONLY : +case ICE_FLOW_CLASSIFY_STAGE_DISTRIBUTOR : + *engine =ice_parse_engine (ad, &pf->dist_parser_list, pattern, + actions, meta, error); +break ; +case ICE_FLOW_CLASSIFY_STAGE_PERMISSION : + *engine =ice_parse_engine (ad, &pf->perm_parser_list, pattern, + actions, meta, error); +break ; +default : +return -EINVAL ; + } - ret =ice_flow_valid_action (dev, actions, error); -if (ret) -return ret; +if (*engine ==NULL ) +return -EINVAL ;return 0; }drivers/net/ice/ice_generic_flow.c +16
-0+static int +ice_flow_validate (struct rte_eth_dev *dev, +const struct rte_flow_attr *attr, +const struct rte_flow_item pattern[], +const struct rte_flow_action actions[], +struct rte_flow_error *error) +{ +int ret =ICE_ERR_NOT_SUPPORTED ; +void *meta =NULL ; +struct ice_flow_engine *engine =NULL ; + + ret =ice_flow_validate_filter (dev, attr, pattern, actions, + &engine, &meta, error); +return ret; +} +static struct
rte_flow*
ice_flow_create(structrte_eth_dev*dev,drivers/net/ice/ice_generic_flow.c +4
-4-const struct rte_flow_attr *attr, - const struct rte_flow_item pattern[], - const struct rte_flow_action actions[], - struct rte_flow_error *error) +const struct rte_flow_attr *attr, + const struct rte_flow_item pattern[], + const struct rte_flow_action actions[], + struct rte_flow_error *error){ struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private); struct rte_flow *flow = NULL;drivers/net/ice/ice_generic_flow.c +5
-1-int ret; +int ret =0 ; +struct ice_adapter *ad = +ICE_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private); +struct ice_flow_engine *engine =NULL ; +void *meta =NULL ;flow = rte_zmalloc("ice_flow", sizeof(struct rte_flow), 0); if (!flow) {drivers/net/ice/ice_generic_flow.c +7
-2@@ -626,65 +488,105 @@ ice_flow_create(struct rte_eth_dev *dev,return flow; } - ret =ice_flow_validate (dev, attr, pattern, actions, error); + ret =ice_flow_validate_filter (dev, attr, pattern, actions, + &engine, &meta, error);if (ret <0 ) goto free_flow; - ret =ice_create_switch_filter (pf, pattern, actions, flow, error); +if (engine->create ==NULL ) + goto free_flow; + + ret = engine->create (ad, flow, meta, error);if (ret) goto free_flow; + flow->engine = engine;TAILQ_INSERT_TAIL (&pf->flow_list, flow, node);return flow;
free_flow:
drivers/net/ice/ice_generic_flow.c ice_flow_create(struct rte_eth_dev *dev, · line 508
Quoted 4 lines
drivers/net/ice/ice_generic_flow.c +1
-3-rte_flow_error_set (error, -ret, -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"Failed to create flow." ); +PMD_DRV_LOG (ERR ,"Failed to create flow" );
Why is this change?
Quoted 28 lines
rte_free(flow); return NULL; }static int
ice_flow_destroy(structrte_eth_dev*dev,drivers/net/ice/ice_generic_flow.c +2
-2-struct rte_flow *flow, - struct rte_flow_error *error) +struct rte_flow *flow, + struct rte_flow_error *error){ struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);drivers/net/ice/ice_generic_flow.c +2
-0+struct ice_adapter *ad = +ICE_DEV_PRIVATE_TO_ADAPTER (dev->data->dev_private);int ret = 0;drivers/net/ice/ice_generic_flow.c +7
-2- ret =ice_destroy_switch_filter (pf, flow, error); - +if (!flow || !flow->engine->destroy) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_HANDLE , +NULL ,"NULL flow or NULL destroy" ); +return -rte_errno; + } + ret = flow->engine->destroy (ad, flow, error);if (!ret) { TAILQ_REMOVE(&pf->flow_list, flow, node); rte_free(flow);
drivers/net/ice/ice_generic_flow.c ice_flow_create(struct rte_eth_dev *dev, · line 534
Quoted 7 lines
drivers/net/ice/ice_generic_flow.c +2
-5- }else { -rte_flow_error_set (error, -ret, -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"Failed to destroy flow." ); - } + }else +PMD_DRV_LOG (ERR ,"Failed to destroy flow" );
Ditto.
Quoted 18 lines
return ret; }static int
ice_flow_flush(structrte_eth_dev*dev,drivers/net/ice/ice_generic_flow.c +1
-1- struct rte_flow_error *error) + struct rte_flow_error *error){ struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);drivers/net/ice/ice_generic_flow.c +1
-1-struct rte_flow *p_flow; +struct rte_flow *p_flow =NULL ;void *temp; int ret = 0; TAILQ_FOREACH_SAFE(p_flow, &pf->flow_list, node, temp) { ret = ice_flow_destroy(dev, p_flow, error); if (ret) {
drivers/net/ice/ice_generic_flow.c ice_flow_create(struct rte_eth_dev *dev, · line 551
Quoted 5 lines
drivers/net/ice/ice_generic_flow.c +1
-4-rte_flow_error_set (error, -ret, -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"Failed to flush SW flows." ); -return -rte_errno; +PMD_DRV_LOG (ERR ,"Failed to flush flows" );
Ditto.
Thanks,
Xiaolong