From 9e0d81c1a13cac520a535f259e7d3c9132770e14 Mon Sep 17 00:00:00 2001 From: Ori Kam Date: Thu, 21 Nov 2019 13:18:31 +0000 Subject: [PATCH] net/mlx5: fix selection between encap and decap The current raw_encap function selects if to decap or encap based on the egress/ingress attribute. This concepts doesn't work in case of FDB since all flows are considered ingress. To solve this issue we moved to check the encap size. if the encap size is larger then eth + ipv4 it means we are trying to encap. Fixes: 8ba9eee4ce32 ("net/mlx5: add raw data encap/decap to Direct Verbs") Cc: stable@dpdk.org Signed-off-by: Ori Kam Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 37 +++++++++++++++++---------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index c402a8d830..02f20fb2ae 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -51,6 +51,8 @@ #define MLX5DV_DR_ACTION_FLAGS_ROOT_LEVEL 1 #endif +#define MLX5_ENCAPSULATION_DECISION_SIZE (sizeof(struct rte_flow_item_eth) + \ + sizeof(struct rte_flow_item_ipv4)) /* VLAN header definitions */ #define MLX5DV_FLOW_VLAN_PCP_SHIFT 13 #define MLX5DV_FLOW_VLAN_PCP_MASK (0x7 << MLX5DV_FLOW_VLAN_PCP_SHIFT) @@ -2171,6 +2173,8 @@ flow_dv_validate_action_raw_decap(uint64_t action_flags, const struct rte_flow_attr *attr, struct rte_flow_error *error) { + const struct rte_flow_action_raw_decap *decap = action->conf; + if (action_flags & MLX5_FLOW_ACTION_DROP) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, NULL, @@ -2186,22 +2190,19 @@ flow_dv_validate_action_raw_decap(uint64_t action_flags, "can only have a single decap" " action in a flow"); /* decap action is valid on egress only if it is followed by encap */ - if (attr->egress) { - for (; action->type != RTE_FLOW_ACTION_TYPE_END && - action->type != RTE_FLOW_ACTION_TYPE_RAW_ENCAP; - action++) { - } - if (action->type != RTE_FLOW_ACTION_TYPE_RAW_ENCAP) - return rte_flow_error_set - (error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, - NULL, "decap action not supported" - " for egress"); - } else if (action_flags & MLX5_FLOW_MODIFY_HDR_ACTIONS) { + if (attr->egress && decap && + decap->size > MLX5_ENCAPSULATION_DECISION_SIZE) { + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, + NULL, "decap action not supported" + " for egress"); + } else if (decap && decap->size > MLX5_ENCAPSULATION_DECISION_SIZE && + (action_flags & MLX5_FLOW_MODIFY_HDR_ACTIONS)) { return rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ACTION, NULL, - "can't have decap action after" - " modify action"); + RTE_FLOW_ERROR_TYPE_ACTION, + NULL, + "can't have decap action " + "after modify action"); } return 0; } @@ -2879,9 +2880,9 @@ flow_dv_create_action_raw_encap(struct rte_eth_dev *dev, encap_data = (const struct rte_flow_action_raw_encap *)action->conf; res.size = encap_data->size; memcpy(res.buf, encap_data->data, res.size); - res.reformat_type = attr->egress ? - MLX5DV_FLOW_ACTION_PACKET_REFORMAT_TYPE_L2_TO_L3_TUNNEL : - MLX5DV_FLOW_ACTION_PACKET_REFORMAT_TYPE_L3_TUNNEL_TO_L2; + res.reformat_type = res.size < MLX5_ENCAPSULATION_DECISION_SIZE ? + MLX5DV_FLOW_ACTION_PACKET_REFORMAT_TYPE_L3_TUNNEL_TO_L2 : + MLX5DV_FLOW_ACTION_PACKET_REFORMAT_TYPE_L2_TO_L3_TUNNEL; if (attr->transfer) res.ft_type = MLX5DV_FLOW_TABLE_TYPE_FDB; else -- 2.20.1