From: Asaf Penso Date: Wed, 25 Mar 2020 19:53:18 +0000 (+0000) Subject: net/mlx5: fix call to modify action without init item X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=7c2062c45193f46b81617a207b0dcd3940ce11ab;p=dpdk.git net/mlx5: fix call to modify action without init item The item is being set according to the attribute value, whether it is udp/tcp or ipv4/6. Also, there are two condition calls. If the attribute is neither udp/tcp or ipv4/6 the item is not initialized at all, but the call to the flow_dv_convert_modify_action is still being done. Also, even if the attribute is tcp/udp or ipv4/6, we still have two conditions. This patch changes the conditions, so the item will always be set. By doing this, there is also a save in the number of condition calls. Fixes: 4bb14c83df95 ("net/mlx5: support modify header using Direct Verbs") Cc: stable@dpdk.org Signed-off-by: Asaf Penso Reviewed-by: Dekel Peled Acked-by: Matan Azrad --- diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index f90cab2961..b9bf83a4b7 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -702,8 +702,8 @@ flow_dv_convert_action_modify_tp item.spec = &udp; item.mask = &udp_mask; field = modify_udp; - } - if (attr->tcp) { + } else { + MLX5_ASSERT(attr->tcp); memset(&tcp, 0, sizeof(tcp)); memset(&tcp_mask, 0, sizeof(tcp_mask)); if (action->type == RTE_FLOW_ACTION_TYPE_SET_TP_SRC) { @@ -773,8 +773,8 @@ flow_dv_convert_action_modify_ttl item.spec = &ipv4; item.mask = &ipv4_mask; field = modify_ipv4; - } - if (attr->ipv6) { + } else { + MLX5_ASSERT(attr->ipv6); memset(&ipv6, 0, sizeof(ipv6)); memset(&ipv6_mask, 0, sizeof(ipv6_mask)); ipv6.hdr.hop_limits = conf->ttl_value; @@ -834,8 +834,8 @@ flow_dv_convert_action_modify_dec_ttl item.spec = &ipv4; item.mask = &ipv4_mask; field = modify_ipv4; - } - if (attr->ipv6) { + } else { + MLX5_ASSERT(attr->ipv6); memset(&ipv6, 0, sizeof(ipv6)); memset(&ipv6_mask, 0, sizeof(ipv6_mask)); ipv6.hdr.hop_limits = 0xFF;