The patch initiates non-template sample action environment and
adds private functions to support the sample flow action.
Signed-off-by: Gregory Etelson <getel...@nvidia.com>
Acked-by: Dariusz Sosnowski <dsosnow...@nvidia.com>
---
drivers/net/mlx5/meson.build | 1 +
drivers/net/mlx5/mlx5.h | 7 +
drivers/net/mlx5/mlx5_flow.h | 2 +
drivers/net/mlx5/mlx5_nta_sample.c | 470 +++++++++++++++++++++++++++++
drivers/net/mlx5/mlx5_nta_sample.h | 22 ++
5 files changed, 502 insertions(+)
create mode 100644 drivers/net/mlx5/mlx5_nta_sample.c
create mode 100644 drivers/net/mlx5/mlx5_nta_sample.h
diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index 6a91692759..f16fe18193 100644
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -53,6 +53,7 @@ if is_linux
'mlx5_flow_verbs.c',
'mlx5_hws_cnt.c',
'mlx5_nta_split.c',
+ 'mlx5_nta_sample.c',
)
endif
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 5695d0f54a..f085656196 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -1255,6 +1255,11 @@ struct mlx5_flow_tbl_resource {
#define MLX5_FLOW_TABLE_PTYPE_RSS_LAST (MLX5_MAX_TABLES - 11)
#define MLX5_FLOW_TABLE_PTYPE_RSS_BASE \
(1 + MLX5_FLOW_TABLE_PTYPE_RSS_LAST - MLX5_FLOW_TABLE_PTYPE_RSS_NUM)
+#define MLX5_FLOW_TABLE_SAMPLE_NUM 1024
+#define MLX5_FLOW_TABLE_SAMPLE_LAST (MLX5_FLOW_TABLE_PTYPE_RSS_BASE - 1)
+#define MLX5_FLOW_TABLE_SAMPLE_BASE \
+(1 + MLX5_FLOW_TABLE_SAMPLE_LAST - MLX5_FLOW_TABLE_SAMPLE_NUM)
+
#define MLX5_FLOW_TABLE_FACTOR 10
/* ID generation structure. */
@@ -1962,6 +1967,7 @@ struct mlx5_quota_ctx {
struct mlx5_indexed_pool *quota_ipool; /* Manage quota objects */
};
+struct mlx5_nta_sample_ctx;
struct mlx5_priv {
struct rte_eth_dev_data *dev_data; /* Pointer to device data. */
struct mlx5_dev_ctx_shared *sh; /* Shared device context. */
@@ -2128,6 +2134,7 @@ struct mlx5_priv {
*/
struct mlx5dr_action *action_nat64[MLX5DR_TABLE_TYPE_MAX][2];
struct mlx5_indexed_pool *ptype_rss_groups;
+ struct mlx5_nta_sample_ctx *nta_sample_ctx;
#endif
struct rte_eth_dev *shared_host; /* Host device for HW steering. */
RTE_ATOMIC(uint16_t) shared_refcnt; /* HW steering host reference
counter. */
diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 23c5833290..561bb05dfa 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -3743,5 +3743,7 @@ mlx5_hw_create_mirror(struct rte_eth_dev *dev,
const struct rte_flow_action *actions,
struct rte_flow_error *error);
+#include "mlx5_nta_sample.h"
+
#endif
#endif /* RTE_PMD_MLX5_FLOW_H_ */
diff --git a/drivers/net/mlx5/mlx5_nta_sample.c
b/drivers/net/mlx5/mlx5_nta_sample.c
new file mode 100644
index 0000000000..aae864eb00
--- /dev/null
+++ b/drivers/net/mlx5/mlx5_nta_sample.c
@@ -0,0 +1,470 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2025 NVIDIA Corporation & Affiliates
+ */
+
+#include <rte_flow.h>
+#include "mlx5_malloc.h"
+#include "mlx5.h"
+#include "mlx5_defs.h"
+#include "mlx5_flow.h"
+#include "mlx5_rx.h"
+
+struct mlx5_nta_sample_ctx {
+ uint32_t groups_num;
+ struct mlx5_indexed_pool *group_ids;
+ struct mlx5_list *mirror_actions; /* cache FW mirror actions */
+ struct mlx5_list *mirror_groups; /* cache groups for sample and suffix
actions */
+};
+
+static void
+release_cached_group(struct rte_eth_dev *dev, uint32_t group)
+{
+ struct mlx5_priv *priv = dev->data->dev_private;
+ struct mlx5_nta_sample_ctx *ctx = priv->nta_sample_ctx;
+
+ mlx5_ipool_free(ctx->group_ids, group - MLX5_FLOW_TABLE_SAMPLE_BASE);
+}
+
+static uint32_t
+alloc_cached_group(struct rte_eth_dev *dev)
+{
+ void *obj;
+ uint32_t idx = 0;
+ struct mlx5_priv *priv = dev->data->dev_private;
+ struct mlx5_nta_sample_ctx *ctx = priv->nta_sample_ctx;
+
+ obj = mlx5_ipool_malloc(ctx->group_ids, &idx);
+ if (obj == NULL)
+ return 0;
+ return idx + MLX5_FLOW_TABLE_SAMPLE_BASE;
+}
+
+void
+mlx5_nta_sample_context_free(struct rte_eth_dev *dev)
+{
+ struct mlx5_priv *priv = dev->data->dev_private;
+ struct mlx5_nta_sample_ctx *ctx = priv->nta_sample_ctx;
+
+ if (ctx == NULL)
+ return;
+ if (ctx->mirror_groups != NULL)
+ mlx5_list_destroy(ctx->mirror_groups);
+ if (ctx->group_ids != NULL)
+ mlx5_ipool_destroy(ctx->group_ids);
+ if (ctx->mirror_actions != NULL)
+ mlx5_list_destroy(ctx->mirror_actions);
+ mlx5_free(ctx);
+ priv->nta_sample_ctx = NULL;
+}
+
+struct mlx5_nta_sample_cached_group {
+ const struct rte_flow_action *actions;
+ size_t actions_size;
+ uint32_t group;
+ struct mlx5_list_entry entry;
+};
+
+struct mlx5_nta_sample_cached_group_ctx {
+ struct rte_flow_action *actions;
+ size_t actions_size;
+};
+
+struct mlx5_nta_sample_cached_mirror {
+ struct mlx5_flow_template_table_cfg table_cfg;
+ struct mlx5_list_entry *sample;
+ struct mlx5_list_entry *suffix;
+ struct mlx5_mirror *mirror;
+ struct mlx5_list_entry entry;
+};
+
+struct mlx5_nta_sample_cached_mirror_ctx {
+ struct mlx5_flow_template_table_cfg *table_cfg;
+ struct mlx5_list_entry *sample;
+ struct mlx5_list_entry *suffix;
+};
+
+static struct mlx5_list_entry *
+mlx5_nta_sample_cached_mirror_create(void *cache_ctx, void *cb_ctx)
+{
+ struct rte_eth_dev *dev = cache_ctx;
+ struct mlx5_nta_sample_cached_mirror_ctx *ctx = cb_ctx;
+ struct rte_flow_action_jump sample_jump_conf = {
+ .group = container_of(ctx->sample,
+ struct mlx5_nta_sample_cached_group,
entry)->group
+ };
+ struct rte_flow_action_jump suffix_jump_conf = {
+ .group = container_of(ctx->suffix,
+ struct mlx5_nta_sample_cached_group,
entry)->group
+ };
+ struct rte_flow_action mirror_sample_actions[2] = {
+ [0] = {
+ .type = RTE_FLOW_ACTION_TYPE_JUMP,
+ .conf = &sample_jump_conf,
+ },
+ [1] = {
+ .type = RTE_FLOW_ACTION_TYPE_END
+ }
+ };
+ struct rte_flow_action_sample mirror_conf = {
+ .ratio = 1,
+ .actions = mirror_sample_actions,
+ };
+ struct rte_flow_action mirror_actions[3] = {
+ [0] = {
+ .type = RTE_FLOW_ACTION_TYPE_SAMPLE,
+ .conf = &mirror_conf,
+ },
+ [1] = {
+ .type = RTE_FLOW_ACTION_TYPE_JUMP,
+ .conf = &suffix_jump_conf,
+ },
+ [2] = {
+ .type = RTE_FLOW_ACTION_TYPE_END
+ }
+ };
+ struct mlx5_nta_sample_cached_mirror *obj = mlx5_malloc(MLX5_MEM_ANY,
+ sizeof(*obj), 0,
+ SOCKET_ID_ANY);
+ if (obj == NULL)
+ return NULL;
+ obj->mirror = mlx5_hw_create_mirror(dev, ctx->table_cfg,
mirror_actions, NULL);
+ if (obj->mirror == NULL) {
+ mlx5_free(obj);
+ return NULL;
+ }
+ obj->sample = ctx->sample;
+ obj->suffix = ctx->suffix;
+ obj->table_cfg = *ctx->table_cfg;
+ return &obj->entry;
+}
+
+static struct mlx5_list_entry *
+mlx5_nta_sample_cached_mirror_clone(void *tool_ctx __rte_unused,
+ struct mlx5_list_entry *entry,
+ void *cb_ctx __rte_unused)
+{
+ struct mlx5_nta_sample_cached_mirror *cached_obj =
+ container_of(entry, struct mlx5_nta_sample_cached_mirror,
entry);
+ struct mlx5_nta_sample_cached_mirror *new_obj =
mlx5_malloc(MLX5_MEM_ANY,
+
sizeof(*new_obj), 0,
+
SOCKET_ID_ANY);
+
+ if (new_obj == NULL)
+ return NULL;
+ memcpy(new_obj, cached_obj, sizeof(*new_obj));
+ return &new_obj->entry;
+}
+
+static int
+mlx5_nta_sample_cached_mirror_match(void *cache_ctx __rte_unused,
+ struct mlx5_list_entry *entry, void *cb_ctx)
+{
+ bool match;
+ struct mlx5_nta_sample_cached_mirror_ctx *ctx = cb_ctx;
+ struct mlx5_nta_sample_cached_mirror *obj =
+ container_of(entry, struct mlx5_nta_sample_cached_mirror,
entry);
+
+ match = obj->sample == ctx->sample &&
+ obj->suffix == ctx->suffix &&
+ memcmp(&obj->table_cfg, ctx->table_cfg, sizeof(obj->table_cfg))
== 0;
+
+ return match ? 0 : ~0;
+}
+
+static void
+mlx5_nta_sample_cached_mirror_remove(void *cache_ctx, struct mlx5_list_entry
*entry)
+{
+ struct rte_eth_dev *dev = cache_ctx;
+ struct mlx5_nta_sample_cached_mirror *obj =
+ container_of(entry, struct mlx5_nta_sample_cached_mirror,
entry);
+ mlx5_hw_mirror_destroy(dev, obj->mirror);
+ mlx5_free(obj);
+}
+
+static void
+mlx5_nta_sample_cached_mirror_free_cloned(void *cache_ctx __rte_unused,
+ struct mlx5_list_entry *entry)
+{
+ struct mlx5_nta_sample_cached_mirror *cloned_obj =
+ container_of(entry, struct mlx5_nta_sample_cached_mirror,
entry);
+
+ mlx5_free(cloned_obj);
+}
+
+static int
+serialize_actions(struct mlx5_nta_sample_cached_group_ctx *obj_ctx)
+{
+ if (obj_ctx->actions_size == 0) {
+ uint8_t *tgt_buffer;
+ int size = rte_flow_conv(RTE_FLOW_CONV_OP_ACTIONS, NULL, 0,
obj_ctx->actions, NULL);
+ if (size < 0)
+ return size;
+ tgt_buffer = mlx5_malloc(MLX5_MEM_ANY, size, 0, SOCKET_ID_ANY);
+ if (tgt_buffer == NULL)
+ return -ENOMEM;
+ obj_ctx->actions_size = size;
+ size = rte_flow_conv(RTE_FLOW_CONV_OP_ACTIONS, tgt_buffer, size,
+ obj_ctx->actions, NULL);
+ if (size < 0) {
+ mlx5_free(tgt_buffer);
+ return size;
+ }
+ obj_ctx->actions = (struct rte_flow_action *)tgt_buffer;
+ }
+ return obj_ctx->actions_size;
+}
+
+static struct mlx5_list_entry *
+mlx5_nta_sample_cached_group_create(void *cache_ctx, void *cb_ctx)
+{
+ struct rte_eth_dev *dev = cache_ctx;
+ struct mlx5_nta_sample_cached_group_ctx *obj_ctx = cb_ctx;
+ struct mlx5_nta_sample_cached_group *obj;
+ int actions_size = serialize_actions(obj_ctx);
+
+ if (actions_size < 0)
+ return NULL;
+ obj = mlx5_malloc(MLX5_MEM_ANY, sizeof(*obj), 0, SOCKET_ID_ANY);
+ if (obj == NULL)
+ return NULL;
+ obj->group = alloc_cached_group(dev);
+ if (obj->group == 0) {
+ mlx5_free(obj);
+ return NULL;
+ }
+ obj->actions = obj_ctx->actions;
+ obj->actions_size = obj_ctx->actions_size;
+ return &obj->entry;
+}
+
+static int
+mlx5_nta_sample_cached_group_match(void *cache_ctx __rte_unused,
+ struct mlx5_list_entry *entry, void *cb_ctx)
+{
+ struct mlx5_nta_sample_cached_group_ctx *obj_ctx = cb_ctx;
+ int actions_size = serialize_actions(obj_ctx);
+ struct mlx5_nta_sample_cached_group *cached_obj =
+ container_of(entry, struct mlx5_nta_sample_cached_group, entry);
+ if (actions_size < 0)
+ return ~0;
+ return memcmp(cached_obj->actions, obj_ctx->actions, actions_size);
+}
+
+static void
+mlx5_nta_sample_cached_group_remove(void *cache_ctx, struct mlx5_list_entry
*entry)
+{
+ struct rte_eth_dev *dev = cache_ctx;
+ struct mlx5_nta_sample_cached_group *cached_obj =
+ container_of(entry, struct mlx5_nta_sample_cached_group, entry);
+
+ release_cached_group(dev, cached_obj->group);
+ mlx5_free((void *)(uintptr_t)cached_obj->actions);
+ mlx5_free(cached_obj);
+}
+
+static struct mlx5_list_entry *
+mlx5_nta_sample_cached_group_clone(void *tool_ctx __rte_unused,
+ struct mlx5_list_entry *entry,
+ void *cb_ctx __rte_unused)
+{
+ struct mlx5_nta_sample_cached_group *cached_obj =
+ container_of(entry, struct mlx5_nta_sample_cached_group, entry);
+ struct mlx5_nta_sample_cached_group *new_obj;
+
+ new_obj = mlx5_malloc(MLX5_MEM_ANY, sizeof(*new_obj), 0, SOCKET_ID_ANY);
+ if (new_obj == NULL)
+ return NULL;
+ memcpy(new_obj, cached_obj, sizeof(*new_obj));
+ return &new_obj->entry;
+}
+
+static void
+mlx5_nta_sample_cached_group_free_cloned(void *cache_ctx __rte_unused,
+ struct mlx5_list_entry *entry)
+{
+ struct mlx5_nta_sample_cached_group *cloned_obj =
+ container_of(entry, struct mlx5_nta_sample_cached_group, entry);
+
+ mlx5_free(cloned_obj);
+}
+
+static int
+mlx5_init_nta_sample_context(struct rte_eth_dev *dev)
+{
+ struct mlx5_priv *priv = dev->data->dev_private;
+ struct mlx5_indexed_pool_config ipool_cfg = {
+ .size = 0,
+ .trunk_size = 32,
+ .grow_trunk = 5,
+ .grow_shift = 1,
+ .need_lock = 1,
+ .release_mem_en = !!priv->sh->config.reclaim_mode,
+ .max_idx = MLX5_FLOW_TABLE_SAMPLE_NUM,
+ .type = "mlx5_nta_sample"
+ };
+ struct mlx5_nta_sample_ctx *ctx = mlx5_malloc(MLX5_MEM_ZERO,
+ sizeof(*ctx), 0,
SOCKET_ID_ANY);
+
+ if (ctx == NULL)
+ return -ENOMEM;
+ priv->nta_sample_ctx = ctx;
+ ctx->group_ids = mlx5_ipool_create(&ipool_cfg);
+ if (ctx->group_ids == NULL)
+ goto error;
+ ctx->mirror_groups = mlx5_list_create("nta sample groups", dev, true,
+
mlx5_nta_sample_cached_group_create,
+
mlx5_nta_sample_cached_group_match,
+
mlx5_nta_sample_cached_group_remove,
+
mlx5_nta_sample_cached_group_clone,
+
mlx5_nta_sample_cached_group_free_cloned);
+ if (ctx->mirror_groups == NULL)
+ goto error;
+ ctx->mirror_actions = mlx5_list_create("nta sample mirror actions",
dev, true,
+
mlx5_nta_sample_cached_mirror_create,
+
mlx5_nta_sample_cached_mirror_match,
+
mlx5_nta_sample_cached_mirror_remove,
+
mlx5_nta_sample_cached_mirror_clone,
+
mlx5_nta_sample_cached_mirror_free_cloned);
+ if (ctx->mirror_actions == NULL)
+ goto error;
+ return 0;
+
+error:
+ mlx5_nta_sample_context_free(dev);
+ return -ENOMEM;
+}
+
+static struct mlx5_list_entry *
+register_mirror(struct mlx5_flow_template_table_cfg *table_cfg,
+ struct mlx5_list *cache,
+ struct mlx5_list_entry *sample,
+ struct mlx5_list_entry *suffix)
+{
+ struct mlx5_nta_sample_cached_mirror_ctx ctx = {
+ .table_cfg = table_cfg,
+ .sample = sample,
+ .suffix = suffix
+ };
+
+ return mlx5_list_register(cache, &ctx);
+}
+
+static struct mlx5_list_entry *
+register_mirror_actions(struct rte_flow_action *actions, struct mlx5_list
*cache)
+{
+ struct mlx5_nta_sample_cached_group_ctx ctx = {
+ .actions = actions
+ };
+ return mlx5_list_register(cache, &ctx);
+}
+
+static struct mlx5_list_entry *
+mlx5_create_nta_mirror(struct rte_eth_dev *dev,
+ const struct rte_flow_attr *attr,
+ struct rte_flow_action *sample_actions,
+ struct rte_flow_action *suffix_actions,
+ struct rte_flow_error *error)
+{
+ struct mlx5_list_entry *entry;
+ struct mlx5_list_entry *mirror_sample = NULL, *mirror_suffix = NULL;
+ struct mlx5_priv *priv = dev->data->dev_private;
+ struct mlx5_nta_sample_ctx *ctx = priv->nta_sample_ctx;
+ struct mlx5_flow_template_table_cfg table_cfg = {
+ .external = true,
+ .attr = {
+ .flow_attr = *attr
+ }
+ };
+
+ mirror_sample = register_mirror_actions(sample_actions,
ctx->mirror_groups);
+ if (mirror_sample == NULL) {
+ rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
+ NULL, "Failed to register sample
group");
+ goto error;
+ }
+ mirror_suffix = register_mirror_actions(suffix_actions,
ctx->mirror_groups);
+ if (mirror_suffix == NULL) {
+ rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
+ NULL, "Failed to register suffix
group");
+ goto error;
+ }
+ entry = register_mirror(&table_cfg, ctx->mirror_actions, mirror_sample,
mirror_suffix);
+ if (entry == NULL) {
+ rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
+ NULL, "Failed to register HWS mirror action");
+ goto error;
+ }
+
+ return entry;
+
+error:
+ if (mirror_sample)
+ mlx5_list_unregister(ctx->mirror_groups, mirror_sample);
+ if (mirror_suffix)
+ mlx5_list_unregister(ctx->mirror_groups, mirror_suffix);
+ return NULL;
+}
+
+static void
+mlx5_nta_parse_sample_actions(const struct rte_flow_action *action,
+ const struct rte_flow_action **sample_action,
+ struct rte_flow_action *prefix_actions,
+ struct rte_flow_action *suffix_actions)
+{
+ struct rte_flow_action *pa = prefix_actions;
+ struct rte_flow_action *sa = suffix_actions;
+
+ *sample_action = NULL;
+ do {
+ if (action->type == RTE_FLOW_ACTION_TYPE_SAMPLE) {
+ *sample_action = action;
+ } else if (*sample_action == NULL) {
+ if (action->type == RTE_FLOW_ACTION_TYPE_VOID)
+ continue;
+ *(pa++) = *action;
+ } else {
+ if (action->type == RTE_FLOW_ACTION_TYPE_VOID)
+ continue;
+ *(sa++) = *action;
+ }
+ } while ((action++)->type != RTE_FLOW_ACTION_TYPE_END);
+}
+
+struct rte_flow_hw *
+mlx5_nta_sample_flow_list_create(struct rte_eth_dev *dev,
+ enum mlx5_flow_type type __rte_unused,
+ const struct rte_flow_attr *attr,
+ const struct rte_flow_item pattern[]
__rte_unused,
+ const struct rte_flow_action actions[],
+ uint64_t item_flags __rte_unused,
+ uint64_t action_flags __rte_unused,
+ struct rte_flow_error *error)
+{
+ struct mlx5_priv *priv = dev->data->dev_private;
+ struct mlx5_mirror *mirror __rte_unused;
+ struct mlx5_list_entry *entry;
+ const struct rte_flow_action *sample;
+ struct rte_flow_action *sample_actions;
+ const struct rte_flow_action_sample *sample_conf;
+ struct rte_flow_action prefix_actions[MLX5_HW_MAX_ACTS] = { 0 };
+ struct rte_flow_action suffix_actions[MLX5_HW_MAX_ACTS] = { 0 };
+
+ if (priv->nta_sample_ctx == NULL) {
+ int rc = mlx5_init_nta_sample_context(dev);
+ if (rc != 0) {
+ rte_flow_error_set(error, -rc,
RTE_FLOW_ERROR_TYPE_ACTION,
+ NULL, "Failed to allocate sample
context");
+ return NULL;
+ }
+ }
+ mlx5_nta_parse_sample_actions(actions, &sample, prefix_actions,
suffix_actions);
+ sample_conf = (const struct rte_flow_action_sample *)sample->conf;
+ sample_actions = (struct rte_flow_action
*)(uintptr_t)sample_conf->actions;
+ entry = mlx5_create_nta_mirror(dev, attr, sample_actions,
+ suffix_actions, error);
+ if (entry == NULL)
+ goto error;
+ mirror = container_of(entry, struct mlx5_nta_sample_cached_mirror,
entry)->mirror;
+error:
+ return NULL;
+}
diff --git a/drivers/net/mlx5/mlx5_nta_sample.h
b/drivers/net/mlx5/mlx5_nta_sample.h
new file mode 100644
index 0000000000..07b7589a75
--- /dev/null
+++ b/drivers/net/mlx5/mlx5_nta_sample.h
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2025 NVIDIA Corporation & Affiliates
+ */
+
+#ifndef RTE_PMD_MLX5_NTA_SAMPLE_H_
+#define RTE_PMD_MLX5_NTA_SAMPLE_H_
+
+#include <stdint.h>
+
+struct rte_flow_hw *
+mlx5_nta_sample_flow_list_create(struct rte_eth_dev *dev,
+ enum mlx5_flow_type type,
+ const struct rte_flow_attr *attr,
+ const struct rte_flow_item pattern[],
+ const struct rte_flow_action actions[],
+ uint64_t item_flags, uint64_t action_flags,
+ struct rte_flow_error *error);
+
+void
+mlx5_nta_sample_context_free(struct rte_eth_dev *dev);
+
+#endif /* RTE_PMD_MLX5_NTA_SAMPLE_H_ */
--
2.48.1
