add generic filter support for iavf
Subsystems (2)
cover add generic filter support for iavf
This patch set added generic flow APIs and supported patterns includes:
/* L2 */
/* ARP */
/* IPv4 */
/* IPv6 */
/* GTPU */
/* ESP */
/* AH */
/* L2TPV3 */
/* PFCP */
Qiming Yang (2):
net/iavf: support generic flow
net/iavf: support more patterns
doc/guides/rel_notes/release_20_05.rst | 5 + drivers/net/iavf/Makefile | 1 + drivers/net/iavf/iavf.h | 9 + drivers/net/iavf/iavf_ethdev.c | 46 ++ drivers/net/iavf/iavf_generic_flow.c | 1023 ++++++++++++++++++++++++++++++++ drivers/net/iavf/iavf_generic_flow.h | 318 ++++++++++ drivers/net/iavf/meson.build | 1 + 7 files changed, 1403 insertions(+) create mode 100644 drivers/net/iavf/iavf_generic_flow.c create mode 100644 drivers/net/iavf/iavf_generic_flow.h
Signature · 1 line
2.9.5
PATCH 1/2 net/iavf: support generic flow
This patch added iavf_flow_create, iavf_flow_destroy, iavf_flow_flush and iavf_flow_validate support, these are used to handle all the generic filters.
This patch supported basic L2, L3, L4 and GTPU patterns.
--- doc/guides/rel_notes/release_20_05.rst | 5 + drivers/net/iavf/Makefile | 1 + drivers/net/iavf/iavf.h | 9 + drivers/net/iavf/iavf_ethdev.c | 46 ++ drivers/net/iavf/iavf_generic_flow.c | 928 +++++++++++++++++++++++++++++++++ drivers/net/iavf/iavf_generic_flow.h | 279 ++++++++++ drivers/net/iavf/meson.build | 1 + 7 files changed, 1269 insertions(+) create mode 100644 drivers/net/iavf/iavf_generic_flow.c create mode 100644 drivers/net/iavf/iavf_generic_flow.h
doc/guides/rel_notes/release_20_05.rst +5 -0
@@ -56,6 +56,11 @@ New Features Also, make sure to start the actual text at the margin. ========================================================= +* **Updated the Intel ice driver.** + + Updated the Intel ice driver with new features and improvements, including: + + * Added support for DCF (Device Config Function) feature. Removed Items -------------
drivers/net/iavf/Makefile +1 -0
@@ -23,6 +23,7 @@ EXPORT_MAP := rte_pmd_iavf_version.map SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_ethdev.c SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_vchnl.c SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_rxtx.c +SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_generic_flow.c ifeq ($(CONFIG_RTE_ARCH_X86), y) SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_rxtx_vec_sse.c endif
drivers/net/iavf/iavf.h +9 -0
@@ -83,6 +83,12 @@ struct iavf_vsi {struct virtchnl_eth_stats eth_stats_offset; }; +struct rte_flow ; +TAILQ_HEAD (iavf_flow_list, rte_flow); + +struct iavf_flow_parser_node ; +TAILQ_HEAD (iavf_parser_list, iavf_flow_parser_node); +/* TODO: is that correct to assume the max number to be 16 ?*/ #define IAVF_MAX_MSIX_VECTORS 16
@@ -117,6 +123,9 @@ struct iavf_info {uint16_t msix_base;/* msix vector base from */ /* queue bitmask for each vector */ uint16_t rxq_map[IAVF_MAX_MSIX_VECTORS ]; +struct iavf_flow_list flow_list; +struct iavf_parser_list rss_parser_list; +struct iavf_parser_list dist_parser_list; };#define IAVF_MAX_PKT_TYPE 256
drivers/net/iavf/iavf_ethdev.c +46 -0
94 lines not on this page · raw message
drivers/net/iavf/iavf_generic_flow.c new file +928 -0
928 lines not on this page · raw message
drivers/net/iavf/iavf_generic_flow.h new file +279 -0
279 lines not on this page · raw message
drivers/net/iavf/meson.build +1 -0
@@ -12,6 +12,7 @@ sources = files( 'iavf_ethdev.c', 'iavf_rxtx.c', 'iavf_vchnl.c', + 'iavf_generic_flow.c', ) if arch_subdir == 'x86'
Signature · 1 line
2.9.5
Re: [dpdk-dev] [PATCH 1/2] net/iavf: support generic flow
Quoted 42 lines
-----Original Message-----
From: dev <[email protected]> On Behalf Of Qiming Yang
Sent: Tuesday, March 17, 2020 4:18 PM
To: [email protected]
Cc: Yang, Qiming <[email protected]>
Subject: [dpdk-dev] [PATCH 1/2] net/iavf: support generic flowThis patch added
iavf_flow_create,iavf_flow_destroy,iavf_flow_flushandiavf_flow_validatesupport, these are used to handle all the generic filters.This patch supported basic L2, L3, L4 and GTPU patterns.
Signed-off-by Qiming Yang <[email protected]>--- doc/guides/rel_notes/release_20_05.rst | 5 + drivers/net/iavf/Makefile | 1 + drivers/net/iavf/iavf.h | 9 + drivers/net/iavf/iavf_ethdev.c | 46 ++ drivers/net/iavf/iavf_generic_flow.c | 928 +++++++++++++++++++++++++++++++++ drivers/net/iavf/iavf_generic_flow.h | 279 ++++++++++ drivers/net/iavf/meson.build | 1 + 7 files changed, 1269 insertions(+) create mode 100644 drivers/net/iavf/iavf_generic_flow.c create mode 100644 drivers/net/iavf/iavf_generic_flow.hdoc/guides/rel_notes/release_20_05.rst +0
-0@@ -56,6 +56,11 @@ New Features Also, make sure to start the actual text at the margin.=========================================================
doc/guides/rel_notes/release_20_05.rst +3
-0+* **Updated the Intel ice driver.** + + Updated the Intel ice driver with new features and improvements,including:
doc/guides/rel_notes/release_20_05.rst
Quoted 2 lines
doc/guides/rel_notes/release_20_05.rst +2
-0+ + * Added support for DCF (Device Config Function) feature.
Above comment is not related with this patch, right?
Quoted 3 lines
Removed Items
-------------
....
Quoted 18 lines
doc/guides/rel_notes/release_20_05.rst +18
-0+ +static struct iavf_flow_engine * +iavf_parse_engine_create(struct iavf_adapter *ad, + struct rte_flow *flow, + struct iavf_parser_list *parser_list, + const struct rte_flow_item pattern[], + const struct rte_flow_action actions[], + struct rte_flow_error *error) +{ + struct iavf_flow_engine *engine = NULL; + struct iavf_flow_parser_node *parser_node; + void *temp; + void *meta = NULL; + + TAILQ_FOREACH_SAFE(parser_node, parser_list, node, temp) { + if (parser_node->parser->parse_pattern_action(ad, + parser_node->parser->array, + parser_node->parser->array_len,
doc/guides/rel_notes/release_20_05.rst
Quoted 10 lines
doc/guides/rel_notes/release_20_05.rst +10
-0+ pattern, actions, &meta, error) < 0) + continue; + + engine = parser_node->parser->engine; + if (engine->create == NULL) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_HANDLE, + NULL, "Invalid engine"); + continue; + }
Please sync with below fix for ice
https://patchwork.dpdk.org/patch/66232/
Quoted 17 lines
doc/guides/rel_notes/release_20_05.rst +17
-0+ + if (!(engine->create(ad, flow, meta, error))) + return engine; + } + return NULL; +} + +static struct iavf_flow_engine * +iavf_parse_engine_validate(struct iavf_adapter *ad, + struct rte_flow *flow, + struct iavf_parser_list *parser_list, + const struct rte_flow_item pattern[], + const struct rte_flow_action actions[], + struct rte_flow_error *error) +{ + struct iavf_flow_engine *engine = NULL; + struct iavf_flow_parser_node *parser_node;
doc/guides/rel_notes/release_20_05.rst
Quoted 10 lines
doc/guides/rel_notes/release_20_05.rst +10
-0+ void *temp; + void *meta = NULL; + + TAILQ_FOREACH_SAFE(parser_node, parser_list, node, temp) { + if (parser_node->parser->parse_pattern_action(ad, + parser_node->parser->array, + parser_node->parser->array_len, + pattern, actions, &meta, error) < 0) + continue; +
Please sync with below fix for ice
https://patchwork.dpdk.org/patch/66232/
Quoted 7 lines
doc/guides/rel_notes/release_20_05.rst +7
-0+ engine = parser_node->parser->engine; + if (engine->validation == NULL) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_HANDLE, + NULL, "Validation not support"); + continue; + }
Re: [dpdk-dev] [PATCH 1/2] net/iavf: support generic flow
Thanks, I'll fix them in v2
Quoted 131 lines
-----Original Message-----
From: Zhang, Qi Z <[email protected]>
Sent: 2020年3月19日 10:01
To: Yang, Qiming <[email protected]>; [email protected]
Cc: Yang, Qiming <[email protected]>
Subject: RE: [dpdk-dev] [PATCH 1/2] net/iavf: support generic flowQuoted 9 lines
-----Original Message-----
From: dev <[email protected]> On Behalf Of Qiming Yang
Sent: Tuesday, March 17, 2020 4:18 PM
To: [email protected]
Cc: Yang, Qiming <[email protected]>
Subject: [dpdk-dev] [PATCH 1/2] net/iavf: support generic flowThis patch added
iavf_flow_create,iavf_flow_destroy,iavf_flow_flushandiavf_flow_validatesupport, these are used to handle all the genericfilters.
Quoted 31 lines
This patch supported basic L2, L3, L4 and GTPU patterns.
Signed-off-by Qiming Yang <[email protected]>--- doc/guides/rel_notes/release_20_05.rst | 5 + drivers/net/iavf/Makefile | 1 + drivers/net/iavf/iavf.h | 9 + drivers/net/iavf/iavf_ethdev.c | 46 ++ drivers/net/iavf/iavf_generic_flow.c | 928 +++++++++++++++++++++++++++++++++ drivers/net/iavf/iavf_generic_flow.h | 279 ++++++++++ drivers/net/iavf/meson.build | 1 + 7 files changed, 1269 insertions(+) create mode 100644 drivers/net/iavf/iavf_generic_flow.c create mode 100644 drivers/net/iavf/iavf_generic_flow.hdoc/guides/rel_notes/release_20_05.rst +0
-0@@ -56,6 +56,11 @@ New Features Also, make sure to start the actual text at the margin.=========================================================
doc/guides/rel_notes/release_20_05.rst +3
-0+* **Updated the Intel ice driver.** + + Updated the Intel ice driver with new features and improvements,including:
doc/guides/rel_notes/release_20_05.rst
Quoted 2 lines
doc/guides/rel_notes/release_20_05.rst +2
-0+ + * Added support for DCF (Device Config Function) feature.Above comment is not related with this patch, right?
Quoted 3 lines
Removed Items
-------------....
Quoted 18 lines
doc/guides/rel_notes/release_20_05.rst +18
-0+ +static struct iavf_flow_engine * +iavf_parse_engine_create(struct iavf_adapter *ad, + struct rte_flow *flow, + struct iavf_parser_list *parser_list, + const struct rte_flow_item pattern[], + const struct rte_flow_action actions[], + struct rte_flow_error *error) +{ + struct iavf_flow_engine *engine = NULL; + struct iavf_flow_parser_node *parser_node; + void *temp; + void *meta = NULL; + + TAILQ_FOREACH_SAFE(parser_node, parser_list, node, temp) { + if (parser_node->parser->parse_pattern_action(ad, + parser_node->parser->array, + parser_node->parser->array_len,doc/guides/rel_notes/release_20_05.rst
Quoted 10 lines
doc/guides/rel_notes/release_20_05.rst +10
-0+ pattern, actions, &meta, error) < 0) + continue; + + engine = parser_node->parser->engine; + if (engine->create == NULL) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_HANDLE, + NULL, "Invalid engine"); + continue; + }Please sync with below fix for ice
https://patchwork.dpdk.org/patch/66232/Quoted 17 lines
doc/guides/rel_notes/release_20_05.rst +17
-0+ + if (!(engine->create(ad, flow, meta, error))) + return engine; + } + return NULL; +} + +static struct iavf_flow_engine * +iavf_parse_engine_validate(struct iavf_adapter *ad, + struct rte_flow *flow, + struct iavf_parser_list *parser_list, + const struct rte_flow_item pattern[], + const struct rte_flow_action actions[], + struct rte_flow_error *error) +{ + struct iavf_flow_engine *engine = NULL; + struct iavf_flow_parser_node *parser_node;doc/guides/rel_notes/release_20_05.rst
Quoted 10 lines
doc/guides/rel_notes/release_20_05.rst +10
-0+ void *temp; + void *meta = NULL; + + TAILQ_FOREACH_SAFE(parser_node, parser_list, node, temp) { + if (parser_node->parser->parse_pattern_action(ad, + parser_node->parser->array, + parser_node->parser->array_len, + pattern, actions, &meta, error) < 0) + continue; +Please sync with below fix for ice
https://patchwork.dpdk.org/patch/66232/Quoted 7 lines
doc/guides/rel_notes/release_20_05.rst +7
-0+ engine = parser_node->parser->engine; + if (engine->validation == NULL) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_HANDLE, + NULL, "Validation not support"); + continue; + }
PATCH 2/2 net/iavf: support more patterns
In reply to Qiming YangAdd patterns support for AH/ESP/L2TPV3OIP/PFCP.
Added patterns are as follows:
/* GTPU */
eth/ipv4/udp/gtpu
eth/ipv4/udp/gtpu/gtp_psc
/* ESP */
eth/ipv4/esp eth/ipv4/udp/esp
eth/ipv6/esp eth/ipv6/udp/esp
/* AH */
eth/ipv4/ah eth/ipv6/ah
/* L2TPV3 */
eth/ipv4/l2tpv3oip eth/ipv6/l2tpv3oip
/* PFCP */
eth/ipv4/udp/pfcp eth/ipv6/udp/pfcp
Depends on patch: ethdev: add PFCP header to flow API
--- drivers/net/iavf/iavf_generic_flow.c | 95 ++++++++++++++++++++++++++++++++++++ drivers/net/iavf/iavf_generic_flow.h | 39 +++++++++++++++ 2 files changed, 134 insertions(+)
drivers/net/iavf/iavf_generic_flow.c +95 -0
@@ -318,6 +318,23 @@ enum rte_flow_item_type iavf_pattern_eth_qinq_ipv6_icmp6[] = { };/* GTPU */ +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_GTPU , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_GTPU , +RTE_FLOW_ITEM_TYPE_GTP_PSC , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4[] = {RTE_FLOW_ITEM_TYPE_ETH ,RTE_FLOW_ITEM_TYPE_IPV4 ,
@@ -371,6 +388,84 @@ enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = { RTE_FLOW_ITEM_TYPE_END, }; +/* ESP */ +enum rte_flow_item_type iavf_pattern_eth_ipv4_esp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ESP , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_esp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_ESP , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_esp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ESP , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_esp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_ESP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* AH */ +enum rte_flow_item_type iavf_pattern_eth_ipv4_ah[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_AH , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_ah[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_AH , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* L2TPV3 */ +enum rte_flow_item_type iavf_pattern_eth_ipv4_l2tpv3[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_L2TPV3OIP , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_l2tpv3[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_L2TPV3OIP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* PFCP */ +enum rte_flow_item_type iavf_pattern_eth_ipv4_pfcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_PFCP , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_pfcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_PFCP , +RTE_FLOW_ITEM_TYPE_END , +}; + typedef struct iavf_flow_engine * (*parse_engine_t)(struct iavf_adapter *ad, struct rte_flow *flow, struct iavf_parser_list *parser_list,
drivers/net/iavf/iavf_generic_flow.h +39 -0
@@ -30,6 +30,10 @@#define IAVF_PROT_VXLAN (1ULL << 19)#define IAVF_PROT_NVGRE (1ULL << 20)#define IAVF_PROT_GTPU (1ULL << 21) +#define IAVF_PROT_ESP (1ULL << 22) +#define IAVF_PROT_AH (1ULL << 23) +#define IAVF_PROT_L2TPV3OIP (1ULL << 24) +#define IAVF_PROT_PFCP (1ULL << 25)/* field */
@@ -50,6 +54,11 @@#define IAVF_NVGRE_TNI (1ULL << 50)#define IAVF_GTPU_TEID (1ULL << 49)#define IAVF_GTPU_QFI (1ULL << 48) +#define IAVF_ESP_SPI (1ULL << 47) +#define IAVF_AH_SPI (1ULL << 46) +#define IAVF_L2TPV3OIP_SESSION_ID (1ULL << 45) +#define IAVF_PFCP_S_FIELD (1ULL << 44) +#define IAVF_PFCP_SEID (1ULL << 43)/* input set */
@@ -116,6 +125,16 @@ (IAVF_PROT_GTPU | IAVF_GTPU_TEID)#define IAVF_INSET_GTPU_QFI \ (IAVF_PROT_GTPU | IAVF_GTPU_QFI) +#define IAVF_INSET_ESP_SPI \ + (IAVF_PROT_ESP | IAVF_ESP_SPI) +#define IAVF_INSET_AH_SPI \ + (IAVF_PROT_AH | IAVF_AH_SPI) +#define IAVF_INSET_L2TPV3OIP_SESSION_ID \ + (IAVF_PROT_L2TPV3OIP | IAVF_L2TPV3OIP_SESSION_ID) +#define IAVF_INSET_PFCP_S_FIELD \ + (IAVF_PROT_PFCP | IAVF_PFCP_S_FIELD) +#define IAVF_INSET_PFCP_SEID \ + (IAVF_PROT_PFCP | IAVF_PFCP_S_FIELD | IAVF_PFCP_SEID)/* empty pattern */
@@ -164,12 +183,32 @@ extern enum rte_flow_item_type iavf_pattern_eth_vlan_ipv6_icmp6[];extern enum rte_flow_item_type iavf_pattern_eth_qinq_ipv6_icmp6[];/* GTPU */ +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu[];extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh[];extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4[];extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_udp[];extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_tcp[];extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_icmp[]; +/* ESP */ +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_esp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_esp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_esp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_esp[]; + +/* AH */ +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_ah[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_ah[]; + +/* L2TPV3 */ +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_l2tpv3[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_l2tpv3[]; + +/* PFCP */ +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_pfcp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_pfcp[]; +extern const struct rte_flow_ops iavf_flow_ops;
Signature · 1 line
2.9.5
v2 cover add generic filter support for iavf
In reply to Qiming YangThis patch set added generic flow APIs and supported patterns includes:
/* L2 */
/* ARP */
/* IPv4 */
/* IPv6 */
/* GTPU */
/* ESP */
/* AH */
/* L2TPV3 */
/* PFCP */
---
v2 changes:
- fixed document error.
- fixed multiple thread not safe issue.
- use RTE_ASSERT to replace runtime check for engine->create == NULL.
Qiming Yang (2):
net/iavf: support generic flow
net/iavf: support more patterns
doc/guides/rel_notes/release_20_05.rst | 6 + drivers/net/iavf/Makefile | 1 + drivers/net/iavf/iavf.h | 10 + drivers/net/iavf/iavf_ethdev.c | 46 ++ drivers/net/iavf/iavf_generic_flow.c | 1025 ++++++++++++++++++++++++++++++++ drivers/net/iavf/iavf_generic_flow.h | 318 ++++++++++ drivers/net/iavf/meson.build | 1 + 7 files changed, 1407 insertions(+) create mode 100644 drivers/net/iavf/iavf_generic_flow.c create mode 100644 drivers/net/iavf/iavf_generic_flow.h
Signature · 1 line
2.9.5
PATCH v2 1/2 net/iavf: support generic flow
This patch added iavf_flow_create, iavf_flow_destroy, iavf_flow_flush and iavf_flow_validate support, these are used to handle all the generic filters.
This patch supported basic L2, L3, L4 and GTPU patterns.
--- doc/guides/rel_notes/release_20_05.rst | 6 + drivers/net/iavf/Makefile | 1 + drivers/net/iavf/iavf.h | 10 + drivers/net/iavf/iavf_ethdev.c | 46 ++ drivers/net/iavf/iavf_generic_flow.c | 930 +++++++++++++++++++++++++++++++++ drivers/net/iavf/iavf_generic_flow.h | 279 ++++++++++ drivers/net/iavf/meson.build | 1 + 7 files changed, 1273 insertions(+) create mode 100644 drivers/net/iavf/iavf_generic_flow.c create mode 100644 drivers/net/iavf/iavf_generic_flow.h
doc/guides/rel_notes/release_20_05.rst +6 -0
@@ -68,6 +68,12 @@ New Features * Added support for DCF (Device Config Function) feature. +* **Updated the Intel iavf driver.** + + Update the Intel iavf driver with new features and improvements, including: + + * Added generic filter support. + Removed Items -------------
drivers/net/iavf/Makefile +1 -0
@@ -23,6 +23,7 @@ EXPORT_MAP := rte_pmd_iavf_version.map SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_ethdev.c SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_vchnl.c SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_rxtx.c +SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_generic_flow.c ifeq ($(CONFIG_RTE_ARCH_X86), y) SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_rxtx_vec_sse.c endif
drivers/net/iavf/iavf.h +10 -0
@@ -83,6 +83,12 @@ struct iavf_vsi {struct virtchnl_eth_stats eth_stats_offset; }; +struct rte_flow ; +TAILQ_HEAD (iavf_flow_list, rte_flow); + +struct iavf_flow_parser_node ; +TAILQ_HEAD (iavf_parser_list, iavf_flow_parser_node); +/* TODO: is that correct to assume the max number to be 16 ?*/ #define IAVF_MAX_MSIX_VECTORS 16
@@ -117,6 +123,10 @@ struct iavf_info {uint16_t msix_base;/* msix vector base from */ /* queue bitmask for each vector */ uint16_t rxq_map[IAVF_MAX_MSIX_VECTORS ]; +struct iavf_flow_list flow_list; +rte_spinlock_t flow_ops_lock; +struct iavf_parser_list rss_parser_list; +struct iavf_parser_list dist_parser_list; };#define IAVF_MAX_PKT_TYPE 1024
drivers/net/iavf/iavf_ethdev.c +46 -0
94 lines not on this page · raw message
drivers/net/iavf/iavf_generic_flow.c new file +930 -0
930 lines not on this page · raw message
drivers/net/iavf/iavf_generic_flow.h new file +279 -0
279 lines not on this page · raw message
drivers/net/iavf/meson.build +1 -0
@@ -12,6 +12,7 @@ sources = files( 'iavf_ethdev.c', 'iavf_rxtx.c', 'iavf_vchnl.c', + 'iavf_generic_flow.c', ) if arch_subdir == 'x86'
Signature · 1 line
2.9.5
Re: [dpdk-dev] [PATCH v2 1/2] net/iavf: support generic flow
Quoted 16 lines
-----Original Message-----
From: Yang, Qiming <[email protected]>
Sent: Monday, March 30, 2020 4:31 PM
To: [email protected]
Cc: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>
Subject: [PATCH v2 1/2] net/iavf: support generic flowThis patch added
iavf_flow_create,iavf_flow_destroy,iavf_flow_flushandiavf_flow_validatesupport, these are used to handle all the generic filters.This patch supported basic L2, L3, L4 and GTPU patterns.
Signed-off-by Qiming Yang <[email protected]>
Quoted 9 lines
--- doc/guides/rel_notes/release_20_05.rst | 6 + drivers/net/iavf/Makefile | 1 + drivers/net/iavf/iavf.h | 10 + drivers/net/iavf/iavf_ethdev.c | 46 ++ drivers/net/iavf/iavf_generic_flow.c | 930 +++++++++++++++++++++++++++++++++ drivers/net/iavf/iavf_generic_flow.h | 279 ++++++++++ drivers/net/iavf/meson.build | 1 +
You may also need to add "Flow API = Y" into the doc/guides/nics/features/iavf.ini
PATCH v2 2/2 net/iavf: support more patterns
In reply to Qiming YangAdd patterns support for AH/ESP/L2TPV3OIP/PFCP.
Added patterns are as follows:
/* GTPU */
eth/ipv4/udp/gtpu
eth/ipv4/udp/gtpu/gtp_psc
/* ESP */
eth/ipv4/esp eth/ipv4/udp/esp
eth/ipv6/esp eth/ipv6/udp/esp
/* AH */
eth/ipv4/ah eth/ipv6/ah
/* L2TPV3 */
eth/ipv4/l2tpv3oip eth/ipv6/l2tpv3oip
/* PFCP */
eth/ipv4/udp/pfcp eth/ipv6/udp/pfcp
Depends on patch: ethdev: add PFCP header to flow API
--- drivers/net/iavf/iavf_generic_flow.c | 95 ++++++++++++++++++++++++++++++++++++ drivers/net/iavf/iavf_generic_flow.h | 39 +++++++++++++++ 2 files changed, 134 insertions(+)
drivers/net/iavf/iavf_generic_flow.c +95 -0
@@ -318,6 +318,23 @@ enum rte_flow_item_type iavf_pattern_eth_qinq_ipv6_icmp6[] = { };/* GTPU */ +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_GTPU , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_GTPU , +RTE_FLOW_ITEM_TYPE_GTP_PSC , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4[] = {RTE_FLOW_ITEM_TYPE_ETH ,RTE_FLOW_ITEM_TYPE_IPV4 ,
@@ -371,6 +388,84 @@ enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = { RTE_FLOW_ITEM_TYPE_END, }; +/* ESP */ +enum rte_flow_item_type iavf_pattern_eth_ipv4_esp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ESP , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_esp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_ESP , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_esp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ESP , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_esp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_ESP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* AH */ +enum rte_flow_item_type iavf_pattern_eth_ipv4_ah[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_AH , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_ah[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_AH , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* L2TPV3 */ +enum rte_flow_item_type iavf_pattern_eth_ipv4_l2tpv3[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_L2TPV3OIP , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_l2tpv3[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_L2TPV3OIP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* PFCP */ +enum rte_flow_item_type iavf_pattern_eth_ipv4_pfcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_PFCP , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_pfcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_PFCP , +RTE_FLOW_ITEM_TYPE_END , +}; + typedef struct iavf_flow_engine * (*parse_engine_t)(struct iavf_adapter *ad, struct rte_flow *flow, struct iavf_parser_list *parser_list,
drivers/net/iavf/iavf_generic_flow.h +39 -0
@@ -30,6 +30,10 @@#define IAVF_PROT_VXLAN (1ULL << 19)#define IAVF_PROT_NVGRE (1ULL << 20)#define IAVF_PROT_GTPU (1ULL << 21) +#define IAVF_PROT_ESP (1ULL << 22) +#define IAVF_PROT_AH (1ULL << 23) +#define IAVF_PROT_L2TPV3OIP (1ULL << 24) +#define IAVF_PROT_PFCP (1ULL << 25)/* field */
@@ -50,6 +54,11 @@#define IAVF_NVGRE_TNI (1ULL << 50)#define IAVF_GTPU_TEID (1ULL << 49)#define IAVF_GTPU_QFI (1ULL << 48) +#define IAVF_ESP_SPI (1ULL << 47) +#define IAVF_AH_SPI (1ULL << 46) +#define IAVF_L2TPV3OIP_SESSION_ID (1ULL << 45) +#define IAVF_PFCP_S_FIELD (1ULL << 44) +#define IAVF_PFCP_SEID (1ULL << 43)/* input set */
@@ -116,6 +125,16 @@ (IAVF_PROT_GTPU | IAVF_GTPU_TEID)#define IAVF_INSET_GTPU_QFI \ (IAVF_PROT_GTPU | IAVF_GTPU_QFI) +#define IAVF_INSET_ESP_SPI \ + (IAVF_PROT_ESP | IAVF_ESP_SPI) +#define IAVF_INSET_AH_SPI \ + (IAVF_PROT_AH | IAVF_AH_SPI) +#define IAVF_INSET_L2TPV3OIP_SESSION_ID \ + (IAVF_PROT_L2TPV3OIP | IAVF_L2TPV3OIP_SESSION_ID) +#define IAVF_INSET_PFCP_S_FIELD \ + (IAVF_PROT_PFCP | IAVF_PFCP_S_FIELD) +#define IAVF_INSET_PFCP_SEID \ + (IAVF_PROT_PFCP | IAVF_PFCP_S_FIELD | IAVF_PFCP_SEID)/* empty pattern */
@@ -164,12 +183,32 @@ extern enum rte_flow_item_type iavf_pattern_eth_vlan_ipv6_icmp6[];extern enum rte_flow_item_type iavf_pattern_eth_qinq_ipv6_icmp6[];/* GTPU */ +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu[];extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh[];extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4[];extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_udp[];extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_tcp[];extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_icmp[]; +/* ESP */ +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_esp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_esp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_esp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_esp[]; + +/* AH */ +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_ah[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_ah[]; + +/* L2TPV3 */ +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_l2tpv3[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_l2tpv3[]; + +/* PFCP */ +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_pfcp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_pfcp[]; +extern const struct rte_flow_ops iavf_flow_ops;
Signature · 1 line
2.9.5
v3 cover add generic filter support for iavf
In reply to Qiming YangThis patch set added generic flow APIs and supported patterns includes:
/* L2 */
/* ARP */
/* IPv4 */
/* IPv6 */
/* GTPU */
/* ESP */
/* AH */
/* L2TPV3 */
/* PFCP */
---
v2 changes:
- fixed document error.
- fixed multiple thread not safe issue.
- use RTE_ASSERT to replace runtime check for engine->create == NULL.
v3 changes:
- add feature enable flag in iavf.ini
Qiming Yang (2):
net/iavf: support generic flow
net/iavf: support more patterns
doc/guides/nics/features/iavf.ini | 1 + doc/guides/rel_notes/release_20_05.rst | 5 + drivers/net/iavf/Makefile | 1 + drivers/net/iavf/iavf.h | 10 + drivers/net/iavf/iavf_ethdev.c | 46 ++ drivers/net/iavf/iavf_generic_flow.c | 1025 ++++++++++++++++++++++++++++++++ drivers/net/iavf/iavf_generic_flow.h | 318 ++++++++++ drivers/net/iavf/meson.build | 1 + 8 files changed, 1407 insertions(+) create mode 100644 drivers/net/iavf/iavf_generic_flow.c create mode 100644 drivers/net/iavf/iavf_generic_flow.h
Signature · 1 line
2.9.5
PATCH v3 1/2 net/iavf: support generic flow
This patch added iavf_flow_create, iavf_flow_destroy, iavf_flow_flush and iavf_flow_validate support, these are used to handle all the generic filters.
This patch supported basic L2, L3, L4 and GTPU patterns.
--- doc/guides/nics/features/iavf.ini | 1 + doc/guides/rel_notes/release_20_05.rst | 5 + drivers/net/iavf/Makefile | 1 + drivers/net/iavf/iavf.h | 10 + drivers/net/iavf/iavf_ethdev.c | 46 ++ drivers/net/iavf/iavf_generic_flow.c | 930 +++++++++++++++++++++++++++++++++ drivers/net/iavf/iavf_generic_flow.h | 279 ++++++++++ drivers/net/iavf/meson.build | 1 + 8 files changed, 1273 insertions(+) create mode 100644 drivers/net/iavf/iavf_generic_flow.c create mode 100644 drivers/net/iavf/iavf_generic_flow.h
doc/guides/nics/features/iavf.ini +1 -0
@@ -19,6 +19,7 @@ Multicast MAC filter = Y RSS hash = Y RSS key update = Y RSS reta update = Y +Flow API = Y VLAN filter = Y CRC offload = Y VLAN offload = Y
doc/guides/rel_notes/release_20_05.rst +5 -0
@@ -69,6 +69,11 @@ New Features * Added support for DCF (Device Config Function) feature. +* **Updated the Intel iavf driver.** + + Update the Intel iavf driver with new features and improvements, including: + + * Added generic filter support. Removed Items -------------
drivers/net/iavf/Makefile +1 -0
@@ -23,6 +23,7 @@ EXPORT_MAP := rte_pmd_iavf_version.map SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_ethdev.c SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_vchnl.c SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_rxtx.c +SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_generic_flow.c ifeq ($(CONFIG_RTE_ARCH_X86), y) SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_rxtx_vec_sse.c endif
drivers/net/iavf/iavf.h +10 -0
@@ -83,6 +83,12 @@ struct iavf_vsi {struct virtchnl_eth_stats eth_stats_offset; }; +struct rte_flow ; +TAILQ_HEAD (iavf_flow_list, rte_flow); + +struct iavf_flow_parser_node ; +TAILQ_HEAD (iavf_parser_list, iavf_flow_parser_node); +/* TODO: is that correct to assume the max number to be 16 ?*/ #define IAVF_MAX_MSIX_VECTORS 16
@@ -117,6 +123,10 @@ struct iavf_info {uint16_t msix_base;/* msix vector base from */ /* queue bitmask for each vector */ uint16_t rxq_map[IAVF_MAX_MSIX_VECTORS ]; +struct iavf_flow_list flow_list; +rte_spinlock_t flow_ops_lock; +struct iavf_parser_list rss_parser_list; +struct iavf_parser_list dist_parser_list; };#define IAVF_MAX_PKT_TYPE 1024
drivers/net/iavf/iavf_ethdev.c +46 -0
94 lines not on this page · raw message
drivers/net/iavf/iavf_generic_flow.c new file +930 -0
930 lines not on this page · raw message
drivers/net/iavf/iavf_generic_flow.h new file +279 -0
279 lines not on this page · raw message
drivers/net/iavf/meson.build +1 -0
@@ -12,6 +12,7 @@ sources = files( 'iavf_ethdev.c', 'iavf_rxtx.c', 'iavf_vchnl.c', + 'iavf_generic_flow.c', ) if arch_subdir == 'x86'
Signature · 1 line
2.9.5
PATCH v3 2/2 net/iavf: support more patterns
In reply to Qiming YangAdd patterns support for AH/ESP/L2TPV3OIP/PFCP.
Added patterns are as follows:
/* GTPU */
eth/ipv4/udp/gtpu
eth/ipv4/udp/gtpu/gtp_psc
/* ESP */
eth/ipv4/esp eth/ipv4/udp/esp
eth/ipv6/esp eth/ipv6/udp/esp
/* AH */
eth/ipv4/ah eth/ipv6/ah
/* L2TPV3 */
eth/ipv4/l2tpv3oip eth/ipv6/l2tpv3oip
/* PFCP */
eth/ipv4/udp/pfcp eth/ipv6/udp/pfcp
Depends on patch: ethdev: add PFCP header to flow API
--- drivers/net/iavf/iavf_generic_flow.c | 95 ++++++++++++++++++++++++++++++++++++ drivers/net/iavf/iavf_generic_flow.h | 39 +++++++++++++++ 2 files changed, 134 insertions(+)
drivers/net/iavf/iavf_generic_flow.c +95 -0
@@ -318,6 +318,23 @@ enum rte_flow_item_type iavf_pattern_eth_qinq_ipv6_icmp6[] = { };/* GTPU */ +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_GTPU , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_GTPU , +RTE_FLOW_ITEM_TYPE_GTP_PSC , +RTE_FLOW_ITEM_TYPE_END , +}; +enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4[] = {RTE_FLOW_ITEM_TYPE_ETH ,RTE_FLOW_ITEM_TYPE_IPV4 ,
@@ -371,6 +388,84 @@ enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_icmp[] = { RTE_FLOW_ITEM_TYPE_END, }; +/* ESP */ +enum rte_flow_item_type iavf_pattern_eth_ipv4_esp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_ESP , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_esp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_ESP , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_esp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_ESP , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_esp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_ESP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* AH */ +enum rte_flow_item_type iavf_pattern_eth_ipv4_ah[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_AH , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_ah[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_AH , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* L2TPV3 */ +enum rte_flow_item_type iavf_pattern_eth_ipv4_l2tpv3[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_L2TPV3OIP , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_l2tpv3[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_L2TPV3OIP , +RTE_FLOW_ITEM_TYPE_END , +}; + +/* PFCP */ +enum rte_flow_item_type iavf_pattern_eth_ipv4_pfcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV4 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_PFCP , +RTE_FLOW_ITEM_TYPE_END , +}; + +enum rte_flow_item_type iavf_pattern_eth_ipv6_pfcp[] = { +RTE_FLOW_ITEM_TYPE_ETH , +RTE_FLOW_ITEM_TYPE_IPV6 , +RTE_FLOW_ITEM_TYPE_UDP , +RTE_FLOW_ITEM_TYPE_PFCP , +RTE_FLOW_ITEM_TYPE_END , +}; + typedef struct iavf_flow_engine * (*parse_engine_t)(struct iavf_adapter *ad, struct rte_flow *flow, struct iavf_parser_list *parser_list,
drivers/net/iavf/iavf_generic_flow.h +39 -0
@@ -30,6 +30,10 @@#define IAVF_PROT_VXLAN (1ULL << 19)#define IAVF_PROT_NVGRE (1ULL << 20)#define IAVF_PROT_GTPU (1ULL << 21) +#define IAVF_PROT_ESP (1ULL << 22) +#define IAVF_PROT_AH (1ULL << 23) +#define IAVF_PROT_L2TPV3OIP (1ULL << 24) +#define IAVF_PROT_PFCP (1ULL << 25)/* field */
@@ -50,6 +54,11 @@#define IAVF_NVGRE_TNI (1ULL << 50)#define IAVF_GTPU_TEID (1ULL << 49)#define IAVF_GTPU_QFI (1ULL << 48) +#define IAVF_ESP_SPI (1ULL << 47) +#define IAVF_AH_SPI (1ULL << 46) +#define IAVF_L2TPV3OIP_SESSION_ID (1ULL << 45) +#define IAVF_PFCP_S_FIELD (1ULL << 44) +#define IAVF_PFCP_SEID (1ULL << 43)/* input set */
@@ -116,6 +125,16 @@ (IAVF_PROT_GTPU | IAVF_GTPU_TEID)#define IAVF_INSET_GTPU_QFI \ (IAVF_PROT_GTPU | IAVF_GTPU_QFI) +#define IAVF_INSET_ESP_SPI \ + (IAVF_PROT_ESP | IAVF_ESP_SPI) +#define IAVF_INSET_AH_SPI \ + (IAVF_PROT_AH | IAVF_AH_SPI) +#define IAVF_INSET_L2TPV3OIP_SESSION_ID \ + (IAVF_PROT_L2TPV3OIP | IAVF_L2TPV3OIP_SESSION_ID) +#define IAVF_INSET_PFCP_S_FIELD \ + (IAVF_PROT_PFCP | IAVF_PFCP_S_FIELD) +#define IAVF_INSET_PFCP_SEID \ + (IAVF_PROT_PFCP | IAVF_PFCP_S_FIELD | IAVF_PFCP_SEID)/* empty pattern */
@@ -164,12 +183,32 @@ extern enum rte_flow_item_type iavf_pattern_eth_vlan_ipv6_icmp6[];extern enum rte_flow_item_type iavf_pattern_eth_qinq_ipv6_icmp6[];/* GTPU */ +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu[];extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_ipv4[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh[];extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4[];extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_udp[];extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_tcp[];extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh_ipv4_icmp[]; +/* ESP */ +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_esp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_esp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_esp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_esp[]; + +/* AH */ +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_ah[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_ah[]; + +/* L2TPV3 */ +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_l2tpv3[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_l2tpv3[]; + +/* PFCP */ +extern enum rte_flow_item_type iavf_pattern_eth_ipv4_pfcp[]; +extern enum rte_flow_item_type iavf_pattern_eth_ipv6_pfcp[]; +extern const struct rte_flow_ops iavf_flow_ops;
Signature · 1 line
2.9.5
Quoted 45 lines
-----Original Message-----
From: Yang, Qiming <[email protected]>
Sent: Friday, April 3, 2020 1:43 PM
To: [email protected]
Cc: Zhang, Qi Z <[email protected]>; Yang, Qiming <[email protected]>
Subject: [PATCH v3 0/2] add generic filter support for iavfThis patch set added generic flow APIs and supported patterns includes:
/* L2 */
/* ARP */
/* IPv4 */
/* IPv6 */
/* GTPU */
/* ESP */
/* AH */
/* L2TPV3 */
/* PFCP */---
v2 changes:
- fixed document error.
- fixed multiple thread not safe issue.
- useRTE_ASSERTto replace runtime check forengine->create== NULL.
v3 changes:
- add feature enable flag in iavf.iniQiming Yang (2):
net/iavf: support generic flow
net/iavf: support more patternsdoc/guides/nics/features/iavf.ini | 1 + doc/guides/rel_notes/release_20_05.rst | 5 + drivers/net/iavf/Makefile | 1 + drivers/net/iavf/iavf.h | 10 + drivers/net/iavf/iavf_ethdev.c | 46 ++ drivers/net/iavf/iavf_generic_flow.c | 1025 ++++++++++++++++++++++++++++++++ drivers/net/iavf/iavf_generic_flow.h | 318 ++++++++++ drivers/net/iavf/meson.build | 1 + 8 files changed, 1407 insertions(+) create mode 100644 drivers/net/iavf/iavf_generic_flow.c create mode 100644 drivers/net/iavf/iavf_generic_flow.h
Quoted 2 lines
--
2.9.5
Ye Xiaolong
AppliedQuoted 32 lines · Qiming Yang
This patch set added generic flow APIs and supported patterns includes:
/* L2 */
/* ARP */
/* IPv4 */
/* IPv6 */
/* GTPU */
/* ESP */
/* AH */
/* L2TPV3 */
/* PFCP */---
v2 changes:
- fixed document error.
- fixed multiple thread not safe issue.
- useRTE_ASSERTto replace runtime check forengine->create== NULL. v3 changes:
- add feature enable flag in iavf.iniQiming Yang (2):
net/iavf: support generic flow
net/iavf: support more patternsdoc/guides/nics/features/iavf.ini | 1 + doc/guides/rel_notes/release_20_05.rst | 5 + drivers/net/iavf/Makefile | 1 + drivers/net/iavf/iavf.h | 10 + drivers/net/iavf/iavf_ethdev.c | 46 ++ drivers/net/iavf/iavf_generic_flow.c | 1025 ++++++++++++++++++++++++++++++++ drivers/net/iavf/iavf_generic_flow.h | 318 ++++++++++ drivers/net/iavf/meson.build | 1 + 8 files changed, 1407 insertions(+)
Quoted 6 lines
create mode 100644
drivers/net/iavf/iavf_generic_flow.ccreate mode 100644drivers/net/iavf/iavf_generic_flow.hSignature · 1 line
2.9.5
Applied to dpdk-next-net-intel, Thanks.