From: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
To: stable@dpdk.org, Yuanhan Liu <yliu@fridaylinux.org>
Cc: "Nélio Laranjeiro" <nelio.laranjeiro@6wind.com>,
"Adrien Mazarguil" <adrien.mazarguil@6wind.com>,
"Yongseok Koh" <yskoh@mellanox.com>
Subject: [dpdk-stable] [PATCH 2/3] net/mlx5: fix port stop by verify flows are still present
Date: Wed, 14 Feb 2018 09:58:30 +0100 [thread overview]
Message-ID: <60abcdb78605211d43588124988a44a0a6f4921d.1518598604.git.nelio.laranjeiro@6wind.com> (raw)
In-Reply-To: <9e4118bfe3df2a78d9cf6d5ca74efe4ece730799.1518598604.git.nelio.laranjeiro@6wind.com>
In-Reply-To: <20180207093155.GA31542@yliu-mob>
From: Nélio Laranjeiro <nelio.laranjeiro@6wind.com>
[ backported from upstream commit f07f9bcdb4d6aaaef7469ac4b03d8dd8d43a41db ]
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, indirection tables, ....).
Fixes: 8086cf08b2f0 ("net/mlx5: handle RSS hash configuration in RSS flow")
Cc: stable@dpdk.org
Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
---
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 68c28edee..c18c77d48 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -2240,23 +2240,33 @@ 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->drxq.ibv_flow)
continue;
claim_zero(ibv_destroy_flow(flow->drxq.ibv_flow));
flow->drxq.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;
--
2.11.0
next prev parent reply other threads:[~2018-02-14 8:57 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-07 9:31 [dpdk-stable] please help backporting some patches to LTS release 17.11.1 Yuanhan Liu
2018-02-08 7:44 ` [dpdk-stable] 答复: " wang.yong19
2018-02-08 8:46 ` [dpdk-stable] " Pavan Nikhilesh
2018-02-08 8:56 ` Yuanhan Liu
2018-02-11 4:54 ` Yuanhan Liu
2018-02-12 10:36 ` Burakov, Anatoly
2018-02-13 11:46 ` Yuanhan Liu
2018-02-13 11:49 ` Burakov, Anatoly
2018-02-20 11:02 ` Burakov, Anatoly
2019-03-06 10:56 ` Burakov, Anatoly
2019-03-06 19:03 ` Yongseok Koh
2019-03-07 12:04 ` Burakov, Anatoly
2019-03-07 20:10 ` Yongseok Koh
2018-02-14 8:58 ` [dpdk-stable] [PATCH 1/3] net/mlx5: fix secondary process verification Nelio Laranjeiro
2018-02-16 13:01 ` Yuanhan Liu
2018-02-14 8:58 ` Nelio Laranjeiro [this message]
2018-02-14 8:58 ` [dpdk-stable] [PATCH 3/3] net/mlx5: fix flow priority on queue action Nelio Laranjeiro
2018-02-27 9:36 ` [dpdk-stable] [PATCH 1/3] Revert "net/mlx5: fix flow priority on queue action" Nelio Laranjeiro
2018-02-27 9:49 ` Yuanhan Liu
2018-02-27 9:36 ` [dpdk-stable] [PATCH 2/3] net/mlx5: remove parser/flow drop queue Nelio Laranjeiro
2018-02-27 9:36 ` [dpdk-stable] [PATCH 3/3] net/mlx5: fix flow priority on queue action Nelio Laranjeiro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=60abcdb78605211d43588124988a44a0a6f4921d.1518598604.git.nelio.laranjeiro@6wind.com \
--to=nelio.laranjeiro@6wind.com \
--cc=adrien.mazarguil@6wind.com \
--cc=stable@dpdk.org \
--cc=yliu@fridaylinux.org \
--cc=yskoh@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).