Store items which define the pattern template on creation.
This allows validation of items, provided by the user during flow rule
creation, against pattern template.
Signed-off-by: Dariusz Sosnowski <dsosnow...@nvidia.com>
Acked-by: Ori Kam <or...@nvidia.com>
---
drivers/net/mlx5/mlx5_flow.h | 2 ++
drivers/net/mlx5/mlx5_flow_hw.c | 29 +++++++++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index da7d06d033..5c2cc2b7c1 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -1522,6 +1522,8 @@ struct rte_flow_pattern_template {
/* Manages all GENEVE TLV options used by this pattern template. */
struct mlx5_geneve_tlv_options_mng geneve_opt_mng;
uint8_t flex_item; /* flex item index. */
+ /* Items on which this pattern template is based on. */
+ struct rte_flow_item *items;
};
/* Flow action template struct. */
diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index c0d763198d..1ad261d529 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -8772,6 +8772,7 @@ flow_hw_pattern_template_create(struct rte_eth_dev *dev,
.mask = &tag_m,
.last = NULL
};
+ int it_items_size;
unsigned int i = 0;
int rc;
@@ -8815,6 +8816,31 @@ flow_hw_pattern_template_create(struct rte_eth_dev *dev,
it->attr = *attr;
it->item_flags = item_flags;
it->orig_item_nb = orig_item_nb;
+ it_items_size = rte_flow_conv(RTE_FLOW_CONV_OP_PATTERN, NULL, 0,
tmpl_items, error);
+ if (it_items_size <= 0) {
+ rte_flow_error_set(error, ENOMEM,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL,
+ "Failed to determine buffer size for
pattern");
+ goto error;
+ }
+ it_items_size = RTE_ALIGN(it_items_size, 16);
+ it->items = mlx5_malloc(MLX5_MEM_ZERO, it_items_size, 0,
rte_dev_numa_node(dev->device));
+ if (it->items == NULL) {
+ rte_flow_error_set(error, ENOMEM,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL,
+ "Cannot allocate memory for pattern");
+ goto error;
+ }
+ rc = rte_flow_conv(RTE_FLOW_CONV_OP_PATTERN, it->items, it_items_size,
tmpl_items, error);
+ if (rc <= 0) {
+ rte_flow_error_set(error, ENOMEM,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL,
+ "Failed to store pattern");
+ goto error;
+ }
it->mt = mlx5dr_match_template_create(tmpl_items,
attr->relaxed_matching);
if (!it->mt) {
rte_flow_error_set(error, rte_errno,
@@ -8829,6 +8855,7 @@ flow_hw_pattern_template_create(struct rte_eth_dev *dev,
else if (attr->egress)
it->implicit_tag = true;
mlx5_free(copied_items);
+ copied_items = NULL;
}
/* Either inner or outer, can't both. */
if (it->item_flags & (MLX5_FLOW_ITEM_OUTER_IPV6_ROUTING_EXT |
@@ -8889,6 +8916,7 @@ flow_hw_pattern_template_create(struct rte_eth_dev *dev,
mlx5_geneve_tlv_options_unregister(priv,
&it->geneve_opt_mng);
if (it->mt)
claim_zero(mlx5dr_match_template_destroy(it->mt));
+ mlx5_free(it->items);
mlx5_free(it);
}
if (copied_items)
@@ -8931,6 +8959,7 @@ flow_hw_pattern_template_destroy(struct rte_eth_dev *dev,
flow_hw_flex_item_release(dev, &template->flex_item);
mlx5_geneve_tlv_options_unregister(priv, &template->geneve_opt_mng);
claim_zero(mlx5dr_match_template_destroy(template->mt));
+ mlx5_free(template->items);
mlx5_free(template);
return 0;
}
--
2.39.2
