From: Maayan Kashani <mkashani@nvidia.com>
To: <dev@dpdk.org>
Cc: <mkashani@nvidia.com>, <dsosnowski@nvidia.com>,
<rasland@nvidia.com>, Yevgeny Kliteynik <kliteyn@nvidia.com>,
Viacheslav Ovsiienko <viacheslavo@nvidia.com>,
Ori Kam <orika@nvidia.com>, Suanming Mou <suanmingm@nvidia.com>,
Matan Azrad <matan@nvidia.com>
Subject: [PATCH v2 29/34] net/mlx5/hws: bwc - abort rehash on completion with error
Date: Mon, 3 Jun 2024 11:25:57 +0300 [thread overview]
Message-ID: <20240603082601.4173-4-mkashani@nvidia.com> (raw)
In-Reply-To: <20240603082601.4173-1-mkashani@nvidia.com>
From: Yevgeny Kliteynik <kliteyn@nvidia.com>
If during rehash there is a completion with error on moving
rule to a new matcher, abort the rehash and return error.
Signed-off-by: Yevgeny Kliteynik <kliteyn@nvidia.com>
---
drivers/net/mlx5/hws/mlx5dr_bwc.c | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/drivers/net/mlx5/hws/mlx5dr_bwc.c b/drivers/net/mlx5/hws/mlx5dr_bwc.c
index 8a8a143f17..e0b6390ed9 100644
--- a/drivers/net/mlx5/hws/mlx5dr_bwc.c
+++ b/drivers/net/mlx5/hws/mlx5dr_bwc.c
@@ -185,6 +185,7 @@ mlx5dr_bwc_queue_poll(struct mlx5dr_context *ctx,
struct rte_flow_op_result comp[MLX5DR_BWC_MATCHER_REHASH_BURST_TH];
uint16_t burst_th = mlx5dr_bwc_get_burst_th(ctx, queue_id);
bool got_comp = *pending_rules >= burst_th;
+ int err = 0;
int ret;
int i;
@@ -203,10 +204,12 @@ mlx5dr_bwc_queue_poll(struct mlx5dr_context *ctx,
if (ret) {
(*pending_rules) -= ret;
for (i = 0; i < ret; i++) {
- if (unlikely(comp[i].status != RTE_FLOW_OP_SUCCESS))
+ if (unlikely(comp[i].status != RTE_FLOW_OP_SUCCESS)) {
DR_LOG(ERR,
"Rehash error: polling queue %d returned completion with error\n",
queue_id);
+ err = -EINVAL;
+ }
}
queue_full = false;
}
@@ -214,7 +217,7 @@ mlx5dr_bwc_queue_poll(struct mlx5dr_context *ctx,
got_comp = !!ret;
}
- return 0;
+ return err;
}
static void
@@ -632,7 +635,7 @@ mlx5dr_bwc_matcher_move_all(struct mlx5dr_bwc_matcher *bwc_matcher)
ret = mlx5dr_matcher_resize_rule_move(bwc_matcher->matcher,
bwc_rules[i]->rule,
&rule_attr);
- if (ret) {
+ if (unlikely(ret)) {
DR_LOG(ERR, "Moving BWC rule failed during rehash - %d",
ret);
rte_errno = ENOMEM;
@@ -643,8 +646,12 @@ mlx5dr_bwc_matcher_move_all(struct mlx5dr_bwc_matcher *bwc_matcher)
pending_rules[i]++;
bwc_rules[i] = LIST_NEXT(bwc_rules[i], next);
- mlx5dr_bwc_queue_poll(ctx, rule_attr.queue_id,
- &pending_rules[i], false);
+ ret = mlx5dr_bwc_queue_poll(ctx, rule_attr.queue_id,
+ &pending_rules[i], false);
+ if (unlikely(ret)) {
+ rte_errno = EINVAL;
+ goto free_bwc_rules;
+ }
}
}
} while (!all_done);
@@ -654,8 +661,12 @@ mlx5dr_bwc_matcher_move_all(struct mlx5dr_bwc_matcher *bwc_matcher)
if (pending_rules[i]) {
uint16_t queue_id = mlx5dr_bwc_get_queue_id(ctx, i);
mlx5dr_send_engine_flush_queue(&ctx->send_queue[queue_id]);
- mlx5dr_bwc_queue_poll(ctx, queue_id,
- &pending_rules[i], true);
+ ret = mlx5dr_bwc_queue_poll(ctx, queue_id,
+ &pending_rules[i], true);
+ if (unlikely(ret)) {
+ rte_errno = EINVAL;
+ goto free_bwc_rules;
+ }
}
}
--
2.25.1
next prev parent reply other threads:[~2024-06-03 8:26 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-02 10:29 [PATCH 1/7] net/mlx5/hws: fix bug in matcher disconnect error flow Maayan Kashani
2024-06-03 8:25 ` [PATCH v2 26/34] " Maayan Kashani
2024-06-03 8:25 ` [PATCH v2 27/34] net/mlx5/hws: bwc - make burst threshold dynamic Maayan Kashani
2024-06-03 8:25 ` [PATCH v2 28/34] net/mlx5/hws: bwc - adding rules with larger action template Maayan Kashani
2024-06-03 8:25 ` Maayan Kashani [this message]
2024-06-03 8:25 ` [PATCH v2 30/34] net/mlx5/hws: bwc - go through all the resized matchers Maayan Kashani
2024-06-03 8:25 ` [PATCH v2 31/34] net/mlx5/hws: bwc - reorg rule resize struct Maayan Kashani
2024-06-03 8:26 ` [PATCH v2 32/34] net/mlx5/hws: bwc - fix deleting action stes Maayan Kashani
2024-06-03 10:56 ` [PATCH v3 1/7] net/mlx5/hws: fix bug in matcher disconnect error flow Maayan Kashani
2024-06-03 10:56 ` [PATCH v3 2/7] net/mlx5/hws: bwc - make burst threshold dynamic Maayan Kashani
2024-06-03 10:56 ` [PATCH v3 3/7] net/mlx5/hws: bwc - adding rules with larger action template Maayan Kashani
2024-06-03 10:56 ` [PATCH v3 4/7] net/mlx5/hws: bwc - abort rehash on completion with error Maayan Kashani
2024-06-03 10:56 ` [PATCH v3 5/7] net/mlx5/hws: bwc - go through all the resized matchers Maayan Kashani
2024-06-03 10:56 ` [PATCH v3 6/7] net/mlx5/hws: bwc - reorg rule resize struct Maayan Kashani
2024-06-03 10:56 ` [PATCH v3 7/7] net/mlx5/hws: bwc - fix deleting action stes Maayan Kashani
2024-06-06 9:55 ` [PATCH v4 0/7] HWS non-template fixes Maayan Kashani
2024-06-06 9:55 ` [PATCH v4 1/7] net/mlx5/hws: fix bug in matcher disconnect error flow Maayan Kashani
2024-06-06 9:55 ` [PATCH v4 2/7] net/mlx5/hws: bwc - make burst threshold dynamic Maayan Kashani
2024-06-06 9:55 ` [PATCH v4 3/7] net/mlx5/hws: bwc - adding rules with larger action template Maayan Kashani
2024-06-06 9:55 ` [PATCH v4 4/7] net/mlx5/hws: bwc - abort rehash on completion with error Maayan Kashani
2024-06-06 9:55 ` [PATCH v4 5/7] net/mlx5/hws: bwc - go through all the resized matchers Maayan Kashani
2024-06-06 9:55 ` [PATCH v4 6/7] net/mlx5/hws: bwc - reorg rule resize struct Maayan Kashani
2024-06-06 9:55 ` [PATCH v4 7/7] net/mlx5/hws: bwc - fix deleting action stes Maayan Kashani
2024-06-11 11:18 ` [PATCH v4 0/7] HWS non-template fixes Raslan Darawsheh
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=20240603082601.4173-4-mkashani@nvidia.com \
--to=mkashani@nvidia.com \
--cc=dev@dpdk.org \
--cc=dsosnowski@nvidia.com \
--cc=kliteyn@nvidia.com \
--cc=matan@nvidia.com \
--cc=orika@nvidia.com \
--cc=rasland@nvidia.com \
--cc=suanmingm@nvidia.com \
--cc=viacheslavo@nvidia.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).