From patchwork Wed May 9 07:37:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shahaf Shuler X-Patchwork-Id: 39521 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 70EB44F93; Wed, 9 May 2018 09:37:12 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 2EC04397D for ; Wed, 9 May 2018 09:37:11 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from shahafs@mellanox.com) with ESMTPS (AES256-SHA encrypted); 9 May 2018 10:38:48 +0300 Received: from unicorn01.mtl.labs.mlnx. (unicorn01.mtl.labs.mlnx [10.7.12.62]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id w497b6NS007737; Wed, 9 May 2018 10:37:06 +0300 From: Shahaf Shuler To: nelio.laranjeiro@6wind.com, adrien.mazarguil@6wind.com, yskoh@mellanox.com Cc: dev@dpdk.org, stable@dpdk.org Date: Wed, 9 May 2018 10:37:00 +0300 Message-Id: <20180509073700.11627-1-shahafs@mellanox.com> X-Mailer: git-send-email 2.12.0 Subject: [dpdk-dev] [PATCH] net/mlx5: fix flow director drop rule deletion crash 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" Drop flow rules are created on the ETH queue even though the parser layer matches the flow rule layer (L3/L4) Fixes: 6f2f4948b236 ("net/mlx5: fix flow director rule deletion crash") Cc: stable@dpdk.org Cc: adrien.mazarguil@6wind.com Signed-off-by: Shahaf Shuler --- drivers/net/mlx5/mlx5_flow.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 38811bbcec..ebc6754eeb 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -3382,6 +3382,8 @@ mlx5_fdir_filter_delete(struct rte_eth_dev *dev, if (parser.drop) { struct ibv_flow_spec_action_drop *drop; + /* Drop rules are created on the ETH queue. */ + parser.layer = HASH_RXQ_ETH; drop = (void *)((uintptr_t)parser.queue[parser.layer].ibv_attr + parser.queue[parser.layer].offset); *drop = (struct ibv_flow_spec_action_drop){ @@ -3401,6 +3403,9 @@ mlx5_fdir_filter_delete(struct rte_eth_dev *dev, attr = parser.queue[parser.layer].ibv_attr; flow_attr = flow->frxq[parser.layer].ibv_attr; + /* Matching flows must have ibv context on the same queue. */ + if (!flow_attr) + continue; /* Compare first the attributes. */ if (memcmp(attr, flow_attr, sizeof(struct ibv_flow_attr))) continue;