From: Alex Vesker <va...@nvidia.com>
Current TIR action is allowed to be used only for NIC RX,
this will allow TIR action over FDB for RX traffic in case
of TX traffic packets will be dropped.
Signed-off-by: Alex Vesker <va...@nvidia.com>
Reviewed-by: Erez Shitrit <ere...@nvidia.com>
Acked-by: Matan Azrad <ma...@nvidia.com>
---
drivers/common/mlx5/mlx5_prm.h | 2 ++
drivers/net/mlx5/hws/mlx5dr_action.c | 17 ++++++++++++++++-
drivers/net/mlx5/hws/mlx5dr_cmd.c | 4 ++++
drivers/net/mlx5/hws/mlx5dr_cmd.h | 1 +
4 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h
index 2b499666f8..5259031a04 100644
--- a/drivers/common/mlx5/mlx5_prm.h
+++ b/drivers/common/mlx5/mlx5_prm.h
@@ -2418,6 +2418,8 @@ struct mlx5_ifc_wqe_based_flow_table_cap_bits {
u8 reserved_at_180[0x10];
u8 ste_format_gen_wqe[0x10];
u8 linear_match_definer_reg_c3[0x20];
+ u8 fdb_jump_to_tir_stc[0x1];
+ u8 reserved_at_1c1[0x1f];
};
union mlx5_ifc_hca_cap_union_bits {
diff --git a/drivers/net/mlx5/hws/mlx5dr_action.c
b/drivers/net/mlx5/hws/mlx5dr_action.c
index f794d6cd78..1bace23c58 100644
--- a/drivers/net/mlx5/hws/mlx5dr_action.c
+++ b/drivers/net/mlx5/hws/mlx5dr_action.c
@@ -389,7 +389,15 @@ mlx5dr_action_fixup_stc_attr(struct mlx5dr_context *ctx,
}
use_fixup = true;
break;
-
+ case MLX5_IFC_STC_ACTION_TYPE_JUMP_TO_TIR:
+ /* TIR is allowed on RX side, requires mask in case of FDB */
+ if (fw_tbl_type == FS_FT_FDB_TX) {
+ fixup_stc_attr->action_type =
MLX5_IFC_STC_ACTION_TYPE_DROP;
+ fixup_stc_attr->action_offset =
MLX5DR_ACTION_OFFSET_HIT;
+ fixup_stc_attr->stc_offset = stc_attr->stc_offset;
+ use_fixup = true;
+ }
+ break;
default:
break;
}
@@ -859,6 +867,13 @@ mlx5dr_action_create_dest_tir(struct mlx5dr_context *ctx,
return NULL;
}
+ if ((flags & MLX5DR_ACTION_FLAG_ROOT_FDB) ||
+ (flags & MLX5DR_ACTION_FLAG_HWS_FDB && !ctx->caps->fdb_tir_stc)) {
+ DR_LOG(ERR, "TIR action not support on FDB");
+ rte_errno = ENOTSUP;
+ return NULL;
+ }
+
if (!is_local) {
DR_LOG(ERR, "TIR should be created on local ibv_device, flags:
0x%x",
flags);
diff --git a/drivers/net/mlx5/hws/mlx5dr_cmd.c
b/drivers/net/mlx5/hws/mlx5dr_cmd.c
index f24651041c..a07378bc42 100644
--- a/drivers/net/mlx5/hws/mlx5dr_cmd.c
+++ b/drivers/net/mlx5/hws/mlx5dr_cmd.c
@@ -1259,6 +1259,10 @@ int mlx5dr_cmd_query_caps(struct ibv_context *ctx,
caps->supp_ste_format_gen_wqe = MLX5_GET(query_hca_cap_out, out,
capability.wqe_based_flow_table_cap.
ste_format_gen_wqe);
+
+ caps->fdb_tir_stc = MLX5_GET(query_hca_cap_out, out,
+
capability.wqe_based_flow_table_cap.
+ fdb_jump_to_tir_stc);
}
if (caps->eswitch_manager) {
diff --git a/drivers/net/mlx5/hws/mlx5dr_cmd.h
b/drivers/net/mlx5/hws/mlx5dr_cmd.h
index 03db62e2e2..2b44f0e1f2 100644
--- a/drivers/net/mlx5/hws/mlx5dr_cmd.h
+++ b/drivers/net/mlx5/hws/mlx5dr_cmd.h
@@ -236,6 +236,7 @@ struct mlx5dr_cmd_query_caps {
uint8_t log_header_modify_argument_granularity;
uint8_t log_header_modify_argument_max_alloc;
uint8_t sq_ts_format;
+ uint8_t fdb_tir_stc;
uint64_t definer_format_sup;
uint32_t trivial_match_definer;
uint32_t vhca_id;
--
2.27.0
