Use the new flow graph API and the common parsing framework to implement flow parser for GTP tunnels.
Signed-off-by: Anatoly Burakov <[email protected]> --- drivers/net/intel/i40e/i40e_flow.c | 191 +--------------------- drivers/net/intel/i40e/i40e_flow.h | 2 + drivers/net/intel/i40e/i40e_flow_tunnel.c | 175 ++++++++++++++++++++ 3 files changed, 178 insertions(+), 190 deletions(-) diff --git a/drivers/net/intel/i40e/i40e_flow.c b/drivers/net/intel/i40e/i40e_flow.c index 98a0ecbf3c..3fff01755e 100644 --- a/drivers/net/intel/i40e/i40e_flow.c +++ b/drivers/net/intel/i40e/i40e_flow.c @@ -37,6 +37,7 @@ const struct ci_flow_engine_list i40e_flow_engine_list = { &i40e_flow_engine_tunnel_vxlan, &i40e_flow_engine_tunnel_nvgre, &i40e_flow_engine_tunnel_mpls, + &i40e_flow_engine_tunnel_gtp, } }; @@ -63,11 +64,6 @@ static int i40e_flow_parse_tunnel_action(struct rte_eth_dev *dev, const struct rte_flow_action *actions, struct rte_flow_error *error, struct i40e_tunnel_filter_conf *filter); -static int i40e_flow_parse_gtp_filter(struct rte_eth_dev *dev, - const struct rte_flow_item pattern[], - const struct rte_flow_action actions[], - struct rte_flow_error *error, - struct i40e_filter_ctx *filter); static int i40e_flow_destroy_tunnel_filter(struct i40e_pf *pf, struct i40e_tunnel_filter *filter); static int i40e_flow_flush_tunnel_filter(struct i40e_pf *pf); @@ -106,22 +102,6 @@ static enum rte_flow_item_type pattern_fdir_ipv4_sctp[] = { RTE_FLOW_ITEM_TYPE_END, }; -static enum rte_flow_item_type pattern_fdir_ipv4_gtpc[] = { - RTE_FLOW_ITEM_TYPE_ETH, - RTE_FLOW_ITEM_TYPE_IPV4, - RTE_FLOW_ITEM_TYPE_UDP, - RTE_FLOW_ITEM_TYPE_GTPC, - RTE_FLOW_ITEM_TYPE_END, -}; - -static enum rte_flow_item_type pattern_fdir_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, -}; - static enum rte_flow_item_type pattern_fdir_ipv6_udp[] = { RTE_FLOW_ITEM_TYPE_ETH, RTE_FLOW_ITEM_TYPE_IPV6, @@ -143,28 +123,7 @@ static enum rte_flow_item_type pattern_fdir_ipv6_sctp[] = { RTE_FLOW_ITEM_TYPE_END, }; -static enum rte_flow_item_type pattern_fdir_ipv6_gtpc[] = { - RTE_FLOW_ITEM_TYPE_ETH, - RTE_FLOW_ITEM_TYPE_IPV6, - RTE_FLOW_ITEM_TYPE_UDP, - RTE_FLOW_ITEM_TYPE_GTPC, - RTE_FLOW_ITEM_TYPE_END, -}; - -static enum rte_flow_item_type pattern_fdir_ipv6_gtpu[] = { - RTE_FLOW_ITEM_TYPE_ETH, - RTE_FLOW_ITEM_TYPE_IPV6, - RTE_FLOW_ITEM_TYPE_UDP, - RTE_FLOW_ITEM_TYPE_GTPU, - RTE_FLOW_ITEM_TYPE_END, -}; - static struct i40e_valid_pattern i40e_supported_patterns[] = { - /* GTP-C & GTP-U */ - { pattern_fdir_ipv4_gtpc, i40e_flow_parse_gtp_filter }, - { pattern_fdir_ipv4_gtpu, i40e_flow_parse_gtp_filter }, - { pattern_fdir_ipv6_gtpc, i40e_flow_parse_gtp_filter }, - { pattern_fdir_ipv6_gtpu, i40e_flow_parse_gtp_filter }, /* L4 over port */ { pattern_fdir_ipv4_udp, i40e_flow_parse_l4_cloud_filter }, { pattern_fdir_ipv4_tcp, i40e_flow_parse_l4_cloud_filter }, @@ -661,154 +620,6 @@ i40e_check_tunnel_filter_type(uint8_t filter_type) } -/* 1. Last in item should be NULL as range is not supported. - * 2. Supported filter types: GTP TEID. - * 3. Mask of fields which need to be matched should be - * filled with 1. - * 4. Mask of fields which needn't to be matched should be - * filled with 0. - * 5. GTP profile supports GTPv1 only. - * 6. GTP-C response message ('source_port' = 2123) is not supported. - */ -static int -i40e_flow_parse_gtp_pattern(struct rte_eth_dev *dev, - const struct rte_flow_item *pattern, - struct rte_flow_error *error, - struct i40e_tunnel_filter_conf *filter) -{ - struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private); - const struct rte_flow_item *item = pattern; - const struct rte_flow_item_gtp *gtp_spec; - const struct rte_flow_item_gtp *gtp_mask; - enum rte_flow_item_type item_type; - - if (!pf->gtp_support) { - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ITEM, - item, - "GTP is not supported by default."); - return -rte_errno; - } - - 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 -rte_errno; - } - item_type = item->type; - switch (item_type) { - case RTE_FLOW_ITEM_TYPE_ETH: - if (item->spec || item->mask) { - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ITEM, - item, - "Invalid ETH item"); - return -rte_errno; - } - break; - case RTE_FLOW_ITEM_TYPE_IPV4: - filter->ip_type = I40E_TUNNEL_IPTYPE_IPV4; - /* IPv4 is used to describe protocol, - * spec and mask should be NULL. - */ - if (item->spec || item->mask) { - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ITEM, - item, - "Invalid IPv4 item"); - return -rte_errno; - } - break; - case RTE_FLOW_ITEM_TYPE_IPV6: - filter->ip_type = I40E_TUNNEL_IPTYPE_IPV6; - /* IPv6 is used to describe protocol, - * spec and mask should be NULL. - */ - if (item->spec || item->mask) { - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ITEM, - item, - "Invalid IPv6 item"); - return -rte_errno; - } - break; - case RTE_FLOW_ITEM_TYPE_UDP: - if (item->spec || item->mask) { - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ITEM, - item, - "Invalid UDP item"); - return -rte_errno; - } - break; - case RTE_FLOW_ITEM_TYPE_GTPC: - case RTE_FLOW_ITEM_TYPE_GTPU: - gtp_spec = item->spec; - gtp_mask = item->mask; - - if (!gtp_spec || !gtp_mask) { - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ITEM, - item, - "Invalid GTP item"); - return -rte_errno; - } - - if (gtp_mask->hdr.gtp_hdr_info || - gtp_mask->hdr.msg_type || - gtp_mask->hdr.plen || - gtp_mask->hdr.teid != UINT32_MAX) { - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ITEM, - item, - "Invalid GTP mask"); - return -rte_errno; - } - - if (item_type == RTE_FLOW_ITEM_TYPE_GTPC) - filter->tunnel_type = I40E_TUNNEL_TYPE_GTPC; - else if (item_type == RTE_FLOW_ITEM_TYPE_GTPU) - filter->tunnel_type = I40E_TUNNEL_TYPE_GTPU; - - filter->tenant_id = rte_be_to_cpu_32(gtp_spec->hdr.teid); - - break; - default: - break; - } - } - - return 0; -} - -static int -i40e_flow_parse_gtp_filter(struct rte_eth_dev *dev, - const struct rte_flow_item pattern[], - const struct rte_flow_action actions[], - struct rte_flow_error *error, - struct i40e_filter_ctx *filter) -{ - struct i40e_tunnel_filter_conf *tunnel_filter = &filter->consistent_tunnel_filter; - int ret; - - ret = i40e_flow_parse_gtp_pattern(dev, pattern, - error, tunnel_filter); - if (ret) - return ret; - - ret = i40e_flow_parse_tunnel_action(dev, actions, error, tunnel_filter); - if (ret) - return ret; - - filter->type = RTE_ETH_FILTER_TUNNEL; - - return ret; -} - - static int i40e_flow_check(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, diff --git a/drivers/net/intel/i40e/i40e_flow.h b/drivers/net/intel/i40e/i40e_flow.h index 55e6b5dbdd..95eec07373 100644 --- a/drivers/net/intel/i40e/i40e_flow.h +++ b/drivers/net/intel/i40e/i40e_flow.h @@ -21,6 +21,7 @@ enum i40e_flow_engine_type { I40E_FLOW_ENGINE_TYPE_TUNNEL_VXLAN, I40E_FLOW_ENGINE_TYPE_TUNNEL_NVGRE, I40E_FLOW_ENGINE_TYPE_TUNNEL_MPLS, + I40E_FLOW_ENGINE_TYPE_TUNNEL_GTP, }; extern const struct ci_flow_engine_list i40e_flow_engine_list; @@ -31,5 +32,6 @@ extern const struct ci_flow_engine i40e_flow_engine_tunnel_qinq; extern const struct ci_flow_engine i40e_flow_engine_tunnel_vxlan; extern const struct ci_flow_engine i40e_flow_engine_tunnel_nvgre; extern const struct ci_flow_engine i40e_flow_engine_tunnel_mpls; +extern const struct ci_flow_engine i40e_flow_engine_tunnel_gtp; #endif /* _I40E_FLOW_H_ */ diff --git a/drivers/net/intel/i40e/i40e_flow_tunnel.c b/drivers/net/intel/i40e/i40e_flow_tunnel.c index a7184d2d50..1159c4a713 100644 --- a/drivers/net/intel/i40e/i40e_flow_tunnel.c +++ b/drivers/net/intel/i40e/i40e_flow_tunnel.c @@ -831,6 +831,172 @@ const struct rte_flow_graph i40e_tunnel_mpls_graph = { }, }; +/** + * GTP tunnel filter graph implementation + * Pattern: START -> (IPv4 | IPv6) -> UDP -> (GTPC | GTPU) -> END + */ +enum i40e_tunnel_gtp_node_id { + I40E_TUNNEL_GTP_NODE_START = RTE_FLOW_NODE_FIRST, + I40E_TUNNEL_GTP_NODE_ETH, + I40E_TUNNEL_GTP_NODE_IPV4, + I40E_TUNNEL_GTP_NODE_IPV6, + I40E_TUNNEL_GTP_NODE_UDP, + I40E_TUNNEL_GTP_NODE_GTPC, + I40E_TUNNEL_GTP_NODE_GTPU, + I40E_TUNNEL_GTP_NODE_END, + I40E_TUNNEL_GTP_NODE_MAX, +}; + +static int +i40e_tunnel_node_gtp_validate(const void *ctx __rte_unused, const struct rte_flow_item *item, + struct rte_flow_error *error) +{ + const struct rte_flow_item_gtp *gtp_mask = item->mask; + const struct i40e_tunnel_ctx *tunnel_ctx = ctx; + const struct rte_eth_dev *dev = tunnel_ctx->base.dev; + const struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private); + + /* does HW support GTP? */ + if (!pf->gtp_support) { + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ITEM, item, + "GTP not supported"); + } + + /* reject unsupported fields */ + if (gtp_mask->hdr.gtp_hdr_info || + gtp_mask->hdr.msg_type || + gtp_mask->hdr.plen) { + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, item, + "Invalid GTP mask"); + } + + /* teid must be fully masked */ + if (!CI_FIELD_IS_MASKED(>p_mask->hdr.teid)) { + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, item, + "Invalid GTP mask"); + } + return 0; +} + +static int +i40e_tunnel_node_gtp_process(void *ctx, const struct rte_flow_item *item, + struct rte_flow_error *error) +{ + const struct rte_flow_item_gtp *gtp_spec = item->spec; + struct i40e_tunnel_ctx *tunnel_ctx = ctx; + struct i40e_tunnel_filter_conf *tunnel_filter = &tunnel_ctx->filter; + + if (item->type == RTE_FLOW_ITEM_TYPE_GTPC) + tunnel_filter->tunnel_type = I40E_TUNNEL_TYPE_GTPC; + else if (item->type == RTE_FLOW_ITEM_TYPE_GTPU) + tunnel_filter->tunnel_type = I40E_TUNNEL_TYPE_GTPU; + else { + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, item, + "Invalid GTP item type"); + } + tunnel_filter->tenant_id = rte_be_to_cpu_32(gtp_spec->hdr.teid); + + return 0; +} + +const struct rte_flow_graph i40e_tunnel_gtp_graph = { + .nodes = (struct rte_flow_graph_node[]) { + [I40E_TUNNEL_GTP_NODE_START] = { + .name = "START", + }, + [I40E_TUNNEL_GTP_NODE_ETH] = { + .name = "ETH", + .type = RTE_FLOW_ITEM_TYPE_ETH, + .constraints = RTE_FLOW_NODE_EXPECT_EMPTY, + }, + [I40E_TUNNEL_GTP_NODE_IPV4] = { + .name = "IPv4", + .type = RTE_FLOW_ITEM_TYPE_IPV4, + .constraints = RTE_FLOW_NODE_EXPECT_EMPTY, + .process = i40e_tunnel_node_ipv4_process, + }, + [I40E_TUNNEL_GTP_NODE_IPV6] = { + .name = "IPv6", + .type = RTE_FLOW_ITEM_TYPE_IPV6, + .constraints = RTE_FLOW_NODE_EXPECT_EMPTY, + .process = i40e_tunnel_node_ipv6_process, + }, + [I40E_TUNNEL_GTP_NODE_UDP] = { + .name = "UDP", + .type = RTE_FLOW_ITEM_TYPE_UDP, + .constraints = RTE_FLOW_NODE_EXPECT_EMPTY, + }, + [I40E_TUNNEL_GTP_NODE_GTPC] = { + .name = "GTPC", + .type = RTE_FLOW_ITEM_TYPE_GTPC, + .constraints = RTE_FLOW_NODE_EXPECT_SPEC_MASK, + .validate = i40e_tunnel_node_gtp_validate, + .process = i40e_tunnel_node_gtp_process, + }, + [I40E_TUNNEL_GTP_NODE_GTPU] = { + .name = "GTPU", + .type = RTE_FLOW_ITEM_TYPE_GTPU, + .constraints = RTE_FLOW_NODE_EXPECT_SPEC_MASK, + .validate = i40e_tunnel_node_gtp_validate, + .process = i40e_tunnel_node_gtp_process, + }, + [I40E_TUNNEL_GTP_NODE_END] = { + .name = "END", + .type = RTE_FLOW_ITEM_TYPE_END, + }, + }, + .edges = (struct rte_flow_graph_edge[]) { + [I40E_TUNNEL_GTP_NODE_START] = { + .next = (const size_t[]) { + I40E_TUNNEL_GTP_NODE_ETH, + RTE_FLOW_NODE_EDGE_END + } + }, + [I40E_TUNNEL_GTP_NODE_ETH] = { + .next = (const size_t[]) { + I40E_TUNNEL_GTP_NODE_IPV4, + I40E_TUNNEL_GTP_NODE_IPV6, + RTE_FLOW_NODE_EDGE_END + } + }, + [I40E_TUNNEL_GTP_NODE_IPV4] = { + .next = (const size_t[]) { + I40E_TUNNEL_GTP_NODE_UDP, + RTE_FLOW_NODE_EDGE_END + } + }, + [I40E_TUNNEL_GTP_NODE_IPV6] = { + .next = (const size_t[]) { + I40E_TUNNEL_GTP_NODE_UDP, + RTE_FLOW_NODE_EDGE_END + } + }, + [I40E_TUNNEL_GTP_NODE_UDP] = { + .next = (const size_t[]) { + I40E_TUNNEL_GTP_NODE_GTPC, + I40E_TUNNEL_GTP_NODE_GTPU, + RTE_FLOW_NODE_EDGE_END + } + }, + [I40E_TUNNEL_GTP_NODE_GTPC] = { + .next = (const size_t[]) { + I40E_TUNNEL_GTP_NODE_END, + RTE_FLOW_NODE_EDGE_END + } + }, + [I40E_TUNNEL_GTP_NODE_GTPU] = { + .next = (const size_t[]) { + I40E_TUNNEL_GTP_NODE_END, + RTE_FLOW_NODE_EDGE_END + } + }, + }, +}; + static int i40e_tunnel_action_check(const struct ci_flow_actions *actions, const struct ci_flow_actions_check_param *param, @@ -1020,6 +1186,15 @@ const struct ci_flow_engine i40e_flow_engine_tunnel_mpls = { .graph = &i40e_tunnel_mpls_graph, }; +const struct ci_flow_engine i40e_flow_engine_tunnel_gtp = { + .name = "i40e_tunnel_gtp", + .type = I40E_FLOW_ENGINE_TYPE_TUNNEL_GTP, + .ops = &i40e_flow_engine_tunnel_ops, + .ctx_size = sizeof(struct i40e_tunnel_ctx), + .flow_size = sizeof(struct i40e_tunnel_flow), + .graph = &i40e_tunnel_gtp_graph, +}; + const struct ci_flow_engine i40e_flow_engine_tunnel_qinq = { .name = "i40e_tunnel_qinq", .type = I40E_FLOW_ENGINE_TYPE_TUNNEL_QINQ, -- 2.47.3
