From: Nélio Laranjeiro <nelio.laranjeiro@6wind.com>
Date: Tue, 24 Oct 2017 15:18:16 +0000 (+0200)
Subject: net/mlx5: fix mark action with drop action
X-Git-Tag: spdx-start~1120
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=d5b854f2b129e813b9a81f8556da46d0851a87eb;p=dpdk.git

net/mlx5: fix mark action with drop action

Marking a packet which will not be received by the NIC is useless, even
if this action remains possible, it blocks the creation of the flow
counter which embed a mark action to a drop queue to be created.

Fixes: 31ba9997f11a ("net/mlx5: fully convert a flow to verbs in validate")

Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
Acked-by: Yongseok Koh <yskoh@mellanox.com>
---

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 96a753e8d2..13b78ce9bb 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -786,6 +786,8 @@ priv_flow_convert_actions(struct priv *priv,
 			goto exit_action_not_supported;
 		}
 	}
+	if (parser->drop && parser->mark)
+		parser->mark = 0;
 	if (!parser->queues_n && !parser->drop) {
 		rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_HANDLE,
 				   NULL, "no valid action");