[dpdk-dev,1/2] net/mlx5: fix flow API mark combined with drop

Message ID 582098dca09b3d3bb70ec24e6c44426a63348392.1484925981.git.nelio.laranjeiro@6wind.com
State Accepted, archived
Delegated to: Ferruh Yigit
Headers show

Checks

Context Check Description
ci/Intel compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Nélio Laranjeiro Jan. 20, 2017, 3:27 p.m.
Fixes: ea3bc3b1df94 ("net/mlx5: support mark flow action")

Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
---
 drivers/net/mlx5/mlx5_flow.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Adrien Mazarguil Jan. 20, 2017, 4:47 p.m. | #1
On Fri, Jan 20, 2017 at 04:27:28PM +0100, Nelio Laranjeiro wrote:
> Fixes: ea3bc3b1df94 ("net/mlx5: support mark flow action")
> 
> Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
> ---
>  drivers/net/mlx5/mlx5_flow.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

Acked-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
Ferruh Yigit Jan. 20, 2017, 6:43 p.m. | #2
On 1/20/2017 4:47 PM, Adrien Mazarguil wrote:
> On Fri, Jan 20, 2017 at 04:27:28PM +0100, Nelio Laranjeiro wrote:
>> Fixes: ea3bc3b1df94 ("net/mlx5: support mark flow action")
>>
>> Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
>> ---
>>  drivers/net/mlx5/mlx5_flow.c | 5 +++--
>>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> Acked-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>

Applied to dpdk-next-net/master, thanks.

Patch

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index d7ed686..7b97a61 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -480,7 +480,7 @@  priv_flow_validate(struct priv *priv,
 			goto exit_action_not_supported;
 		}
 	}
-	if (action.mark && !flow->ibv_attr)
+	if (action.mark && !flow->ibv_attr && !action.drop)
 		flow->offset += sizeof(struct ibv_exp_flow_spec_action_tag);
 	if (!action.queue && !action.drop) {
 		rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_HANDLE,
@@ -1042,6 +1042,7 @@  priv_flow_create(struct priv *priv,
 				 actions->conf)->index;
 		} else if (actions->type == RTE_FLOW_ACTION_TYPE_DROP) {
 			action.drop = 1;
+			action.mark = 0;
 		} else if (actions->type == RTE_FLOW_ACTION_TYPE_MARK) {
 			const struct rte_flow_action_mark *mark =
 				(const struct rte_flow_action_mark *)
@@ -1049,7 +1050,7 @@  priv_flow_create(struct priv *priv,
 
 			if (mark)
 				action.mark_id = mark->id;
-			action.mark = 1;
+			action.mark = !action.drop;
 		} else {
 			rte_flow_error_set(error, ENOTSUP,
 					   RTE_FLOW_ERROR_TYPE_ACTION,