Using range and non range templates is not allowed, and in HWS there is a
check that enforce that limitation with constantly check that, in a loop,
if the current template defined as range, the last one
should also be defined as range.
But, in the case where there are two templates in the following order:
(1) template with range, and (2) template without range.
The existing checks will not cover this case.
This commit fixes that hole by maintain the invariant that if a template
without a range exist, all the previous match template are also.
Fixes: 9732ffe13bd6 ("net/mlx5/hws: add range definer creation")
Cc: va...@nvidia.com
Cc: sta...@dpdk.org
Signed-off-by: Itamar Gozlan <igoz...@nvidia.com>
Acked-by: Matan Azrad <ma...@nvidia.com>
---
drivers/net/mlx5/hws/mlx5dr_definer.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c
b/drivers/net/mlx5/hws/mlx5dr_definer.c
index 9ebda9267d..51a3f7be4b 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.c
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.c
@@ -4041,15 +4041,18 @@ mlx5dr_definer_matcher_range_init(struct mlx5dr_context
*ctx,
/* Create optional range definers */
for (i = 0; i < matcher->num_of_mt; i++) {
- if (!mt[i].fcr_sz)
- continue;
-
/* All must use range if requested */
- if (i && !mt[i - 1].range_definer) {
+ bool is_range = !!mt[i].fcr_sz;
+ bool has_range = matcher->flags &
MLX5DR_MATCHER_FLAGS_RANGE_DEFINER;
+
+ if (i && ((is_range && !has_range) || (!is_range &&
has_range))) {
DR_LOG(ERR, "Using range and non range templates is not
allowed");
goto free_definers;
}
+ if (!mt[i].fcr_sz)
+ continue;
+
matcher->flags |= MLX5DR_MATCHER_FLAGS_RANGE_DEFINER;
/* Create definer without fcr binding, already binded */
mt[i].range_definer = mlx5dr_definer_alloc(ctx,
--
2.39.3
