From patchwork Fri Jan 20 15:27:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?N=C3=A9lio_Laranjeiro?= X-Patchwork-Id: 19843 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 5A649F614; Fri, 20 Jan 2017 16:28:02 +0100 (CET) Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by dpdk.org (Postfix) with ESMTP id 6BA8CAB08 for ; Fri, 20 Jan 2017 16:27:51 +0100 (CET) Received: by mail-wm0-f54.google.com with SMTP id c206so49008078wme.0 for ; Fri, 20 Jan 2017 07:27:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=W4bgkplVt1z+krHPxhSX2X7DtLB1DSBTJE5yF3KUjfc=; b=bOwyqOO69rcWJFUOL7Dj/NDQGiFT2LzZNLoN4F070AOCHJF9G7PfTGsTD7Xz2WU8dB lcHZAIU9lbmLzagneYwhnUT7P/NrXMZsN/XPXYcDNyTDwzngTGghXyKNR+hGy9E2sqQT 1GwGY7Cvc1T5NVnwVBAQE0DZ/i7xKCNjcQelPK9wQgfB12UspTKnhExpEgu4F65YaJL+ H3qnp5ypvAzLLEtqM2T0PUyI4b4L3+SpI/Eb6sG3opIDIJJnkc1C/VFd9TuAdcGZqNdS vwS+fNVk0Dvt7pQ5NG80ZL7hASPlueQ1kxJJ0mseMXOAsl9CYWD0jRC/YwKBoYiRyQ58 J8Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=W4bgkplVt1z+krHPxhSX2X7DtLB1DSBTJE5yF3KUjfc=; b=phpxJOIxzhJGJhYpbnwgRaf+hPytXPg66AWeO9kGAxKW7gTm25pWNzOYRTlRPH77SF JX8lTBwPewwyd9kR9F7IRevXXNmfQ7/OgBjY3QCa594xfAiAHBRyPmTK+4BNuab9VkWY 13z59D7n/7vGFmsBux9QOc+HCal8aUwHv29YthRaU7zvZj6C54Z4Y5DmTaVUS4HzCEFr 5w+VTxkTCsFYzKkvjJ3QEkzfzdNoozeG1h7jhobR6F4sR8KXMZKWhwviIA0iI7KG8dyC TU2OGWdE5YhoxAZ0Xau3MXLFvEqr4OBzGH1GdO97E4DGyPQea3z2hvuowGo251eC6Q4g OPBg== X-Gm-Message-State: AIkVDXKvpnrEW1BvsyzvPz0P1bRMZUxInTHKFzzEyZFmNKxJhHXfCU3hYKL/NEawHRYPqE1k X-Received: by 10.28.62.204 with SMTP id l195mr3619123wma.88.1484926070895; Fri, 20 Jan 2017 07:27:50 -0800 (PST) Received: from ping.vm.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id y127sm6649462wmg.12.2017.01.20.07.27.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Jan 2017 07:27:50 -0800 (PST) From: Nelio Laranjeiro To: dev@dpdk.org Cc: Adrien Mazarguil Date: Fri, 20 Jan 2017 16:27:28 +0100 Message-Id: <582098dca09b3d3bb70ec24e6c44426a63348392.1484925981.git.nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.1.4 Subject: [dpdk-dev] [PATCH 1/2] net/mlx5: fix flow API mark combined with drop 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" Fixes: ea3bc3b1df94 ("net/mlx5: support mark flow action") Signed-off-by: Nelio Laranjeiro Acked-by: Adrien Mazarguil --- drivers/net/mlx5/mlx5_flow.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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,