From: Jie Liu <[email protected]> Move sxe2_flow_parse_pattern_ipip, sxe2_flow_add_udp_tunnel_port and sxe2_flow_add_tunnel_port from sxe2_flow_parse_pattern.c into sxe2_flow.c as static helpers, and drop the public declaration of sxe2_flow_add_tunnel_port from the header, keeping the tunnel port handling internal to the flow module.
Cc: [email protected] Signed-off-by: Jie Liu <[email protected]> --- drivers/net/sxe2/sxe2_flow.c | 113 +++++++++++++++++++++ drivers/net/sxe2/sxe2_flow_parse_pattern.c | 113 --------------------- drivers/net/sxe2/sxe2_flow_parse_pattern.h | 6 -- 3 files changed, 113 insertions(+), 119 deletions(-) diff --git a/drivers/net/sxe2/sxe2_flow.c b/drivers/net/sxe2/sxe2_flow.c index a33b8606df..cd39385340 100644 --- a/drivers/net/sxe2/sxe2_flow.c +++ b/drivers/net/sxe2/sxe2_flow.c @@ -550,6 +550,119 @@ int32_t sxe2_flow_init_udp_tunnel_port(struct rte_eth_dev *dev) return ret; } +static int32_t sxe2_flow_add_udp_tunnel_port(struct sxe2_adapter *adapter, + enum sxe2_flow_udp_tunnel_protocol proto, + struct sxe2_flow *flow, + BITMAP_TYPE *flow_type) +{ + int32_t ret = 0; + uint16_t tun_port; + + tun_port = adapter->flow_ctxt.tunnel_port_list[proto]; + if (tun_port == 0xffff || tun_port == 0) { + ret = -EINVAL; + PMD_LOG_ERR(DRV, "UDP tunnel port not initialized, proto: %d", proto); + goto l_end; + } + if (!sxe2_test_bit(SXE2_EXPANSION_OUTER_UDP, flow_type)) { + ret = -EINVAL; + PMD_LOG_ERR(DRV, "UDP must be over tunnel"); + goto l_end; + } + sxe2_set_bit(SXE2_FLOW_FLD_ID_UDP_DST_PORT, flow->pattern_outer.map_spec); + flow->pattern_outer.item_spec.udp.dest = rte_cpu_to_be_16(tun_port); +l_end: + return ret; +} + +static int32_t sxe2_flow_parse_pattern_ipip(struct sxe2_flow *flow, BITMAP_TYPE *flow_type) +{ + sxe2_set_bit(SXE2_EXPANSION_IPIP, flow_type); + if (sxe2_test_bit(SXE2_EXPANSION_OUTER_IPV4, flow_type)) { + sxe2_set_bit(SXE2_FLOW_FLD_ID_IPV4_PROT, flow->pattern_outer.map_spec); + if (sxe2_test_bit(SXE2_EXPANSION_IPV4, flow_type)) + flow->pattern_outer.item_spec.ipv4.protocol = SXE2_FLOW_IP_PROTOCOL_IPV4; + if (sxe2_test_bit(SXE2_EXPANSION_IPV6, flow_type)) + flow->pattern_outer.item_spec.ipv4.protocol = SXE2_FLOW_IP_PROTOCOL_IPV6; + } + if (sxe2_test_bit(SXE2_EXPANSION_OUTER_IPV6, flow_type)) { + sxe2_set_bit(SXE2_FLOW_FLD_ID_IPV6_PROT, flow->pattern_outer.map_spec); + if (sxe2_test_bit(SXE2_EXPANSION_ETH, flow_type)) { + flow->pattern_outer.item_spec.ipv6.nexthdr = SXE2_FLOW_IP_PROTOCOL_ETH; + } else { + if (sxe2_test_bit(SXE2_EXPANSION_IPV4, flow_type)) + flow->pattern_outer.item_spec.ipv6.nexthdr = + SXE2_FLOW_IP_PROTOCOL_IPV4; + if (sxe2_test_bit(SXE2_EXPANSION_IPV6, flow_type)) + flow->pattern_outer.item_spec.ipv6.nexthdr = + SXE2_FLOW_IP_PROTOCOL_IPV6; + } + } + return 0; +} + +static int32_t sxe2_flow_add_tunnel_port(struct rte_eth_dev *dev, + struct rte_flow_error *error, + struct sxe2_flow *flow, BITMAP_TYPE *flow_type, + enum sxe2_flow_tunnel_type tunnel_type) +{ + int32_t ret = 0; + enum sxe2_flow_udp_tunnel_protocol proto = SXE2_FLOW_UDP_TUNNEL_MAX; + struct sxe2_adapter *adapter = SXE2_DEV_PRIVATE_TO_ADAPTER(dev); + struct sxe2_flow_pattern *pattern = &flow->pattern_outer; + switch (tunnel_type) { + case SXE2_FLOW_TUNNEL_TYPE_VXLAN: + if (sxe2_test_bit(SXE2_EXPANSION_ETH, flow_type)) { + proto = SXE2_FLOW_UDP_TUNNEL_PROTOCOL_VXLAN; + } else if (sxe2_test_bit(SXE2_EXPANSION_IPV4, flow_type) || + sxe2_test_bit(SXE2_EXPANSION_IPV6, flow_type)) { + proto = SXE2_FLOW_UDP_TUNNEL_PROTOCOL_VXLAN_GPE; + } + break; + case SXE2_FLOW_TUNNEL_TYPE_GTPU: + proto = SXE2_FLOW_UDP_TUNNEL_PROTOCOL_GTP_U; + break; + case SXE2_FLOW_TUNNEL_TYPE_GENEVE: + proto = SXE2_FLOW_UDP_TUNNEL_PROTOCOL_GENEVE; + break; + case SXE2_FLOW_TUNNEL_TYPE_GRE: + if (sxe2_test_bit(SXE2_EXPANSION_OUTER_UDP, flow_type)) { + proto = SXE2_FLOW_UDP_TUNNEL_PROTOCOL_NVGRE; + } else { + if (sxe2_test_bit(SXE2_EXPANSION_OUTER_IPV4, flow_type)) { + pattern->item_spec.ipv4.protocol = SXE2_FLOW_IP_PROTOCOL_GRE; + sxe2_set_bit(SXE2_FLOW_FLD_ID_IPV4_PROT, pattern->map_spec); + } + if (sxe2_test_bit(SXE2_EXPANSION_OUTER_IPV6, flow_type)) { + pattern->item_spec.ipv6.nexthdr = SXE2_FLOW_IP_PROTOCOL_GRE; + sxe2_set_bit(SXE2_FLOW_FLD_ID_IPV6_PROT, pattern->map_spec); + } + } + break; + case SXE2_FLOW_TUNNEL_TYPE_IPIP: + ret = sxe2_flow_parse_pattern_ipip(flow, flow_type); + break; + default: + break; + } + if (proto != SXE2_FLOW_UDP_TUNNEL_MAX) { + ret = sxe2_flow_add_udp_tunnel_port(adapter, proto, flow, flow_type); + if (ret != 0) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, + NULL, "Failed to add udp port for tunnel."); + PMD_LOG_ERR(DRV, "Failed to add udp port for tunnel, ret %d.", ret); + goto l_end; + } + } + if (tunnel_type != SXE2_FLOW_TUNNEL_TYPE_NONE) { + if (!sxe2_test_bit(SXE2_EXPANSION_OUTER_UDP, flow_type)) + sxe2_set_bit(SXE2_FLOW_HDR_IPV_OTHER, pattern->hdrs); + } +l_end: + return ret; +} + static int32_t sxe2_flowlist_add_tunnel_port(struct rte_eth_dev *dev, struct rte_flow *flow_list, struct rte_flow_error *error) diff --git a/drivers/net/sxe2/sxe2_flow_parse_pattern.c b/drivers/net/sxe2/sxe2_flow_parse_pattern.c index f5bf8922c6..189abb1a33 100644 --- a/drivers/net/sxe2/sxe2_flow_parse_pattern.c +++ b/drivers/net/sxe2/sxe2_flow_parse_pattern.c @@ -1637,119 +1637,6 @@ static int32_t sxe2_flow_parse_pattern_vxlan_gpe(const struct rte_flow_item *ite return ret; } -static int32_t sxe2_flow_parse_pattern_ipip(struct sxe2_flow *flow, BITMAP_TYPE *flow_type) -{ - sxe2_set_bit(SXE2_EXPANSION_IPIP, flow_type); - if (sxe2_test_bit(SXE2_EXPANSION_OUTER_IPV4, flow_type)) { - sxe2_set_bit(SXE2_FLOW_FLD_ID_IPV4_PROT, flow->pattern_outer.map_spec); - if (sxe2_test_bit(SXE2_EXPANSION_IPV4, flow_type)) - flow->pattern_outer.item_spec.ipv4.protocol = SXE2_FLOW_IP_PROTOCOL_IPV4; - if (sxe2_test_bit(SXE2_EXPANSION_IPV6, flow_type)) - flow->pattern_outer.item_spec.ipv4.protocol = SXE2_FLOW_IP_PROTOCOL_IPV6; - } - if (sxe2_test_bit(SXE2_EXPANSION_OUTER_IPV6, flow_type)) { - sxe2_set_bit(SXE2_FLOW_FLD_ID_IPV6_PROT, flow->pattern_outer.map_spec); - if (sxe2_test_bit(SXE2_EXPANSION_ETH, flow_type)) { - flow->pattern_outer.item_spec.ipv6.nexthdr = SXE2_FLOW_IP_PROTOCOL_ETH; - } else { - if (sxe2_test_bit(SXE2_EXPANSION_IPV4, flow_type)) - flow->pattern_outer.item_spec.ipv6.nexthdr = - SXE2_FLOW_IP_PROTOCOL_IPV4; - if (sxe2_test_bit(SXE2_EXPANSION_IPV6, flow_type)) - flow->pattern_outer.item_spec.ipv6.nexthdr = - SXE2_FLOW_IP_PROTOCOL_IPV6; - } - } - return 0; -} - -static int32_t sxe2_flow_add_udp_tunnel_port(struct sxe2_adapter *adapter, - enum sxe2_flow_udp_tunnel_protocol proto, - struct sxe2_flow *flow, - BITMAP_TYPE *flow_type) -{ - int32_t ret = 0; - uint16_t tun_port; - - tun_port = adapter->flow_ctxt.tunnel_port_list[proto]; - if (tun_port == 0xffff || tun_port == 0) { - ret = -EINVAL; - PMD_LOG_ERR(DRV, "UDP tunnel port not initialized, proto: %d", proto); - goto l_end; - } - if (!sxe2_test_bit(SXE2_EXPANSION_OUTER_UDP, flow_type)) { - ret = -EINVAL; - PMD_LOG_ERR(DRV, "UDP must be over tunnel"); - goto l_end; - } - sxe2_set_bit(SXE2_FLOW_FLD_ID_UDP_DST_PORT, flow->pattern_outer.map_spec); - flow->pattern_outer.item_spec.udp.dest = rte_cpu_to_be_16(tun_port); -l_end: - return ret; -} - -int32_t sxe2_flow_add_tunnel_port(struct rte_eth_dev *dev, - struct rte_flow_error *error, - struct sxe2_flow *flow, BITMAP_TYPE *flow_type, - enum sxe2_flow_tunnel_type tunnel_type) -{ - int32_t ret = 0; - enum sxe2_flow_udp_tunnel_protocol proto = SXE2_FLOW_UDP_TUNNEL_MAX; - struct sxe2_adapter *adapter = SXE2_DEV_PRIVATE_TO_ADAPTER(dev); - struct sxe2_flow_pattern *pattern = &flow->pattern_outer; - switch (tunnel_type) { - case SXE2_FLOW_TUNNEL_TYPE_VXLAN: - if (sxe2_test_bit(SXE2_EXPANSION_ETH, flow_type)) { - proto = SXE2_FLOW_UDP_TUNNEL_PROTOCOL_VXLAN; - } else if (sxe2_test_bit(SXE2_EXPANSION_IPV4, flow_type) || - sxe2_test_bit(SXE2_EXPANSION_IPV6, flow_type)) { - proto = SXE2_FLOW_UDP_TUNNEL_PROTOCOL_VXLAN_GPE; - } - break; - case SXE2_FLOW_TUNNEL_TYPE_GTPU: - proto = SXE2_FLOW_UDP_TUNNEL_PROTOCOL_GTP_U; - break; - case SXE2_FLOW_TUNNEL_TYPE_GENEVE: - proto = SXE2_FLOW_UDP_TUNNEL_PROTOCOL_GENEVE; - break; - case SXE2_FLOW_TUNNEL_TYPE_GRE: - if (sxe2_test_bit(SXE2_EXPANSION_OUTER_UDP, flow_type)) { - proto = SXE2_FLOW_UDP_TUNNEL_PROTOCOL_NVGRE; - } else { - if (sxe2_test_bit(SXE2_EXPANSION_OUTER_IPV4, flow_type)) { - pattern->item_spec.ipv4.protocol = SXE2_FLOW_IP_PROTOCOL_GRE; - sxe2_set_bit(SXE2_FLOW_FLD_ID_IPV4_PROT, pattern->map_spec); - } - if (sxe2_test_bit(SXE2_EXPANSION_OUTER_IPV6, flow_type)) { - pattern->item_spec.ipv6.nexthdr = SXE2_FLOW_IP_PROTOCOL_GRE; - sxe2_set_bit(SXE2_FLOW_FLD_ID_IPV6_PROT, pattern->map_spec); - } - } - break; - case SXE2_FLOW_TUNNEL_TYPE_IPIP: - ret = sxe2_flow_parse_pattern_ipip(flow, flow_type); - break; - default: - break; - } - if (proto != SXE2_FLOW_UDP_TUNNEL_MAX) { - ret = sxe2_flow_add_udp_tunnel_port(adapter, proto, flow, flow_type); - if (ret != 0) { - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ITEM, - NULL, "Failed to add udp port for tunnel."); - PMD_LOG_ERR(DRV, "Failed to add udp port for tunnel, ret %d.", ret); - goto l_end; - } - } - if (tunnel_type != SXE2_FLOW_TUNNEL_TYPE_NONE) { - if (!sxe2_test_bit(SXE2_EXPANSION_OUTER_UDP, flow_type)) - sxe2_set_bit(SXE2_FLOW_HDR_IPV_OTHER, pattern->hdrs); - } -l_end: - return ret; -} - struct sxe2_flow_parse_pattern_ops sxe2_flow_parse_pattern_list[] = { [SXE2_EXPANSION_OUTER_ETH] = { .is_inner = false, diff --git a/drivers/net/sxe2/sxe2_flow_parse_pattern.h b/drivers/net/sxe2/sxe2_flow_parse_pattern.h index 8442c35cae..69d83a6ea6 100644 --- a/drivers/net/sxe2/sxe2_flow_parse_pattern.h +++ b/drivers/net/sxe2/sxe2_flow_parse_pattern.h @@ -37,10 +37,4 @@ int32_t sxe2_flow_parse_pattern(struct rte_eth_dev *dev, struct rte_flow_error *error, struct sxe2_flow *flow); -int32_t sxe2_flow_add_tunnel_port(struct rte_eth_dev *dev, - struct rte_flow_error *error, - struct sxe2_flow *flow, - BITMAP_TYPE *flow_type, - enum sxe2_flow_tunnel_type tunnel_type); - #endif /* SXE2_FLOW_PARSE_PATTERN_H_ */ -- 2.52.0
