From patchwork Tue Jan 30 13:36:52 2018 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: 34705 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 [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9A9D01B419; Tue, 30 Jan 2018 14:36:48 +0100 (CET) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by dpdk.org (Postfix) with ESMTP id 5A1391B417 for ; Tue, 30 Jan 2018 14:36:47 +0100 (CET) Received: by mail-wm0-f66.google.com with SMTP id x4so3689774wmc.0 for ; Tue, 30 Jan 2018 05:36:47 -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=y8cgZSjZwx+IUgtpYePNIXVhJBzITG+CpksDS0PKorw=; b=2GZFPEZq1/Z69uDx6RXDTcBoOGy33D/qE4ebnKTAnX1PHGzZYMhGtHJM53SQ3LjgOY 3/2Rw8Xa2fb2hjX1dTvPNzc8lj5dloLw88NMhY/H9ZDOpXsDbFUlDr98sd73kKVowi9Y yEDjE8cRLIlTTmZZsZNaWIQWV0d/PO3R8RC8KXyBqWzqc8uR3JTpJOvCXQOlLZhwkVT7 uu9bfRd158azBFc1jI1hrnMPf2gESgZTm5H+ey/JlMfXMkx76gAhYWGdkWysJVWOOQIh rVGfznlj45gfgMNU+0dOzwPXOILWgQxuJocLEGJimyQ4xK1wHv6wI8JeS+EgPHYGYFAI tZuw== 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=y8cgZSjZwx+IUgtpYePNIXVhJBzITG+CpksDS0PKorw=; b=ngBOJpKGlcg2i+IomQZuoQbEBUFOFio2rEVMdlcs+pSJxcDV/4VJa+0w92JXBT6//K 8lW+5Nu/8phiLVK86Gs7zdfu8PHS7gdEnf5LRvkbQCnzyTfbOkFSobQCjySYSuT23Du2 1MElq0yDd6shrmFs9EYJp4kAxD+E7tM3gUFH2pYkKFNNe+aKIUekhShHZYqmcvFx00Kq WHAHghRSjyz8OLey3kbT/216vG41VVxHglPyfWaunupRKg9Bo/ZY3fyzLh6XKXjSGNi3 ONVj6aV/0jYRb5M0C3QCK5UXOyvXr8gb6tggSU2Tjh4Bza/vUB1SL8Kbv16Ts9Jdw+BG qkJw== X-Gm-Message-State: AKwxytfs5AumKIz8qc5v1upNSynRrntSq1tkFgxSpycJ5U7OQtCYrXPp OXX1RqIhNLfpetC49YCy7evD X-Google-Smtp-Source: AH8x225N3LSlA7Pqv4XFnHdyfdyfI0AB6UhQK9YMcGmamfu6OEXOE6AJxi0Uy09AMQsQDTpjjy2IAQ== X-Received: by 10.28.15.13 with SMTP id 13mr19632789wmp.105.1517319407073; Tue, 30 Jan 2018 05:36:47 -0800 (PST) Received: from laranjeiro-vm.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id w50sm5225906wrb.33.2018.01.30.05.36.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Jan 2018 05:36:46 -0800 (PST) From: Nelio Laranjeiro To: Adrien Mazarguil Cc: dev@dpdk.org, Shahaf Shuler , Yongseok Koh Date: Tue, 30 Jan 2018 14:36:52 +0100 Message-Id: <332ad9309ce19e728eca93ee1683464e8b6b4012.1517319259.git.nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.11.0 Subject: [dpdk-dev] [PATCH] net/mlx5: fix port stop by verify flows are still present 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" priv_flow_stop() may be called several times, in such situation flows are already removed from the NIC and thus all associated objects are no present in the flow object (ibv_flow, indirections tables, ....). Fixes: 71ee11c83bc4 ("net/mlx5: fix flow stop when flows are already stopped") Fixes: 8086cf08b2f0 ("net/mlx5: handle RSS hash configuration in RSS flow") Signed-off-by: Nelio Laranjeiro --- drivers/net/mlx5/mlx5_flow.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index bf8eff8a5..1167c741c 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -2208,6 +2208,7 @@ priv_flow_stop(struct priv *priv, struct mlx5_flows *list) TAILQ_FOREACH_REVERSE(flow, list, mlx5_flows, next) { unsigned int i; + struct mlx5_ind_table_ibv *ind_tbl = NULL; if (flow->drop) { if (!flow->frxq[HASH_RXQ_ETH].ibv_flow) @@ -2215,17 +2216,26 @@ priv_flow_stop(struct priv *priv, struct mlx5_flows *list) claim_zero(ibv_destroy_flow (flow->frxq[HASH_RXQ_ETH].ibv_flow)); flow->frxq[HASH_RXQ_ETH].ibv_flow = NULL; + DEBUG("Flow %p removed", (void *)flow); /* Next flow. */ continue; } + /* Verify the flow has not already been cleaned. */ + for (i = 0; i != hash_rxq_init_n; ++i) { + if (!flow->frxq[i].ibv_flow) + continue; + /* + * Indirection table may be necessary to remove the + * flags in the Rx queues. + * This helps to speed-up the process by avoiding + * another loop. + */ + ind_tbl = flow->frxq[i].hrxq->ind_table; + break; + } + if (i == hash_rxq_init_n) + return; if (flow->mark) { - struct mlx5_ind_table_ibv *ind_tbl = NULL; - - for (i = 0; i != hash_rxq_init_n; ++i) { - if (!flow->frxq[i].hrxq) - continue; - ind_tbl = flow->frxq[i].hrxq->ind_table; - } assert(ind_tbl); for (i = 0; i != ind_tbl->queues_n; ++i) (*priv->rxqs)[ind_tbl->queues[i]]->mark = 0;