From patchwork Sun Apr 14 20:19:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ori Kam X-Patchwork-Id: 52760 X-Patchwork-Delegate: shahafs@mellanox.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5FA025A6E; Sun, 14 Apr 2019 22:20:07 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id E43ED5911 for ; Sun, 14 Apr 2019 22:20:04 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from orika@mellanox.com) with ESMTPS (AES256-SHA encrypted); 14 Apr 2019 23:20:04 +0300 Received: from pegasus03.mtr.labs.mlnx (pegasus03.mtr.labs.mlnx [10.210.16.124]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x3EKK4j5011608; Sun, 14 Apr 2019 23:20:04 +0300 From: Ori Kam To: yskoh@mellanox.com, shahafs@mellanox.com Cc: dev@dpdk.org, orika@mellanox.com, dekelp@mellanox.com, stable@dpdk.org Date: Sun, 14 Apr 2019 20:19:57 +0000 Message-Id: <1555273197-1949-1-git-send-email-orika@mellanox.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dpdk-dev] [PATCH] net/mlx5: fix modify header action position X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" According to RTE flow the action order should be the order that the actions were given. In the case of modify actions the position of the action was always last. This commit solves this issue by saving the position of the first modify action, and then adds to this position the pointer to the modify action. Fixes: 4bb14c83df95 ("net/mlx5: support modify header using Direct Verbs") Cc: dekelp@mellanox.com Cc: stable@dpdk.org Signed-off-by: Ori Kam --- drivers/net/mlx5/mlx5_flow_dv.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 3862b26..7b5eab7 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -3235,6 +3235,7 @@ struct field_modify_info modify_tcp[] = { }; union flow_dv_attr flow_attr = { .attr = 0 }; struct mlx5_flow_dv_tag_resource tag_resource; + uint32_t modify_action_position = UINT32_MAX; if (priority == MLX5_FLOW_PRIO_RSVD) priority = priv->config.flow_prio - 1; @@ -3419,6 +3420,8 @@ struct field_modify_info modify_tcp[] = { RTE_FLOW_ACTION_TYPE_SET_MAC_SRC ? MLX5_FLOW_ACTION_SET_MAC_SRC : MLX5_FLOW_ACTION_SET_MAC_DST; + if (modify_action_position == UINT32_MAX) + modify_action_position = actions_n++; break; case RTE_FLOW_ACTION_TYPE_SET_IPV4_SRC: case RTE_FLOW_ACTION_TYPE_SET_IPV4_DST: @@ -3429,6 +3432,8 @@ struct field_modify_info modify_tcp[] = { RTE_FLOW_ACTION_TYPE_SET_IPV4_SRC ? MLX5_FLOW_ACTION_SET_IPV4_SRC : MLX5_FLOW_ACTION_SET_IPV4_DST; + if (modify_action_position == UINT32_MAX) + modify_action_position = actions_n++; break; case RTE_FLOW_ACTION_TYPE_SET_IPV6_SRC: case RTE_FLOW_ACTION_TYPE_SET_IPV6_DST: @@ -3439,6 +3444,8 @@ struct field_modify_info modify_tcp[] = { RTE_FLOW_ACTION_TYPE_SET_IPV6_SRC ? MLX5_FLOW_ACTION_SET_IPV6_SRC : MLX5_FLOW_ACTION_SET_IPV6_DST; + if (modify_action_position == UINT32_MAX) + modify_action_position = actions_n++; break; case RTE_FLOW_ACTION_TYPE_SET_TP_SRC: case RTE_FLOW_ACTION_TYPE_SET_TP_DST: @@ -3450,6 +3457,8 @@ struct field_modify_info modify_tcp[] = { RTE_FLOW_ACTION_TYPE_SET_TP_SRC ? MLX5_FLOW_ACTION_SET_TP_SRC : MLX5_FLOW_ACTION_SET_TP_DST; + if (modify_action_position == UINT32_MAX) + modify_action_position = actions_n++; break; case RTE_FLOW_ACTION_TYPE_DEC_TTL: if (flow_dv_convert_action_modify_dec_ttl(&res, items, @@ -3457,6 +3466,8 @@ struct field_modify_info modify_tcp[] = { error)) return -rte_errno; action_flags |= MLX5_FLOW_ACTION_DEC_TTL; + if (modify_action_position == UINT32_MAX) + modify_action_position = actions_n++; break; case RTE_FLOW_ACTION_TYPE_SET_TTL: if (flow_dv_convert_action_modify_ttl(&res, actions, @@ -3464,6 +3475,8 @@ struct field_modify_info modify_tcp[] = { error)) return -rte_errno; action_flags |= MLX5_FLOW_ACTION_SET_TTL; + if (modify_action_position == UINT32_MAX) + modify_action_position = actions_n++; break; case RTE_FLOW_ACTION_TYPE_END: actions_end = true; @@ -3474,7 +3487,7 @@ struct field_modify_info modify_tcp[] = { dev_flow, error)) return -rte_errno; - dev_flow->dv.actions[actions_n++] = + dev_flow->dv.actions[modify_action_position] = dev_flow->dv.modify_hdr->verbs_action; } break;