net/mlx5: DR, Add support for flow sampler offload
Add SW steering support for sFlow / flow sampler action. Signed-off-by: Yevgeny Kliteynik <kliteyn@nvidia.com> Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
This commit is contained in:
parent
6f8515568e
commit
1ab6dc35e9
@ -31,6 +31,7 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX]
|
||||
[DR_ACTION_TYP_DROP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_QP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_FT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_SAMPLER] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_TAG] = DR_ACTION_STATE_NON_TERM,
|
||||
[DR_ACTION_TYP_CTR] = DR_ACTION_STATE_NON_TERM,
|
||||
[DR_ACTION_TYP_TNL_L2_TO_L2] = DR_ACTION_STATE_DECAP,
|
||||
@ -45,6 +46,7 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX]
|
||||
[DR_ACTION_TYP_DROP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_QP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_FT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_SAMPLER] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_TAG] = DR_ACTION_STATE_DECAP,
|
||||
[DR_ACTION_TYP_CTR] = DR_ACTION_STATE_DECAP,
|
||||
[DR_ACTION_TYP_L2_TO_TNL_L2] = DR_ACTION_STATE_ENCAP,
|
||||
@ -57,6 +59,7 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX]
|
||||
[DR_ACTION_TYP_DROP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_QP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_FT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_SAMPLER] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_TAG] = DR_ACTION_STATE_ENCAP,
|
||||
[DR_ACTION_TYP_CTR] = DR_ACTION_STATE_ENCAP,
|
||||
},
|
||||
@ -64,6 +67,7 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX]
|
||||
[DR_ACTION_TYP_DROP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_QP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_FT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_SAMPLER] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_TAG] = DR_ACTION_STATE_MODIFY_HDR,
|
||||
[DR_ACTION_TYP_CTR] = DR_ACTION_STATE_MODIFY_HDR,
|
||||
[DR_ACTION_TYP_L2_TO_TNL_L2] = DR_ACTION_STATE_ENCAP,
|
||||
@ -74,6 +78,7 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX]
|
||||
[DR_ACTION_TYP_DROP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_QP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_FT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_SAMPLER] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_TAG] = DR_ACTION_STATE_MODIFY_VLAN,
|
||||
[DR_ACTION_TYP_CTR] = DR_ACTION_STATE_MODIFY_VLAN,
|
||||
[DR_ACTION_TYP_POP_VLAN] = DR_ACTION_STATE_MODIFY_VLAN,
|
||||
@ -86,6 +91,7 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX]
|
||||
[DR_ACTION_TYP_DROP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_QP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_FT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_SAMPLER] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_TAG] = DR_ACTION_STATE_NON_TERM,
|
||||
[DR_ACTION_TYP_CTR] = DR_ACTION_STATE_NON_TERM,
|
||||
[DR_ACTION_TYP_TNL_L2_TO_L2] = DR_ACTION_STATE_DECAP,
|
||||
@ -104,6 +110,7 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX]
|
||||
[DR_ACTION_STATE_NO_ACTION] = {
|
||||
[DR_ACTION_TYP_DROP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_FT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_SAMPLER] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_CTR] = DR_ACTION_STATE_NON_TERM,
|
||||
[DR_ACTION_TYP_L2_TO_TNL_L2] = DR_ACTION_STATE_ENCAP,
|
||||
[DR_ACTION_TYP_L2_TO_TNL_L3] = DR_ACTION_STATE_ENCAP,
|
||||
@ -114,11 +121,13 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX]
|
||||
[DR_ACTION_STATE_ENCAP] = {
|
||||
[DR_ACTION_TYP_DROP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_FT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_SAMPLER] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_CTR] = DR_ACTION_STATE_ENCAP,
|
||||
},
|
||||
[DR_ACTION_STATE_MODIFY_HDR] = {
|
||||
[DR_ACTION_TYP_DROP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_FT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_SAMPLER] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_CTR] = DR_ACTION_STATE_MODIFY_HDR,
|
||||
[DR_ACTION_TYP_L2_TO_TNL_L2] = DR_ACTION_STATE_ENCAP,
|
||||
[DR_ACTION_TYP_L2_TO_TNL_L3] = DR_ACTION_STATE_ENCAP,
|
||||
@ -128,6 +137,7 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX]
|
||||
[DR_ACTION_STATE_MODIFY_VLAN] = {
|
||||
[DR_ACTION_TYP_DROP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_FT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_SAMPLER] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_CTR] = DR_ACTION_STATE_MODIFY_VLAN,
|
||||
[DR_ACTION_TYP_PUSH_VLAN] = DR_ACTION_STATE_MODIFY_VLAN,
|
||||
[DR_ACTION_TYP_L2_TO_TNL_L2] = DR_ACTION_STATE_ENCAP,
|
||||
@ -137,6 +147,7 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX]
|
||||
[DR_ACTION_STATE_NON_TERM] = {
|
||||
[DR_ACTION_TYP_DROP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_FT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_SAMPLER] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_CTR] = DR_ACTION_STATE_NON_TERM,
|
||||
[DR_ACTION_TYP_L2_TO_TNL_L2] = DR_ACTION_STATE_ENCAP,
|
||||
[DR_ACTION_TYP_L2_TO_TNL_L3] = DR_ACTION_STATE_ENCAP,
|
||||
@ -152,6 +163,7 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX]
|
||||
[DR_ACTION_STATE_NO_ACTION] = {
|
||||
[DR_ACTION_TYP_DROP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_FT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_SAMPLER] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_CTR] = DR_ACTION_STATE_NON_TERM,
|
||||
[DR_ACTION_TYP_TNL_L2_TO_L2] = DR_ACTION_STATE_DECAP,
|
||||
[DR_ACTION_TYP_TNL_L3_TO_L2] = DR_ACTION_STATE_DECAP,
|
||||
@ -166,6 +178,7 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX]
|
||||
[DR_ACTION_TYP_DROP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_FT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_CTR] = DR_ACTION_STATE_DECAP,
|
||||
[DR_ACTION_TYP_SAMPLER] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_MODIFY_HDR] = DR_ACTION_STATE_MODIFY_HDR,
|
||||
[DR_ACTION_TYP_POP_VLAN] = DR_ACTION_STATE_MODIFY_VLAN,
|
||||
[DR_ACTION_TYP_VPORT] = DR_ACTION_STATE_TERM,
|
||||
@ -178,11 +191,13 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX]
|
||||
[DR_ACTION_TYP_QP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_FT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_VPORT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_SAMPLER] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_CTR] = DR_ACTION_STATE_ENCAP,
|
||||
},
|
||||
[DR_ACTION_STATE_MODIFY_HDR] = {
|
||||
[DR_ACTION_TYP_DROP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_FT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_SAMPLER] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_CTR] = DR_ACTION_STATE_MODIFY_HDR,
|
||||
[DR_ACTION_TYP_VPORT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_L2_TO_TNL_L2] = DR_ACTION_STATE_ENCAP,
|
||||
@ -192,6 +207,7 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX]
|
||||
[DR_ACTION_STATE_MODIFY_VLAN] = {
|
||||
[DR_ACTION_TYP_DROP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_FT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_SAMPLER] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_POP_VLAN] = DR_ACTION_STATE_MODIFY_VLAN,
|
||||
[DR_ACTION_TYP_CTR] = DR_ACTION_STATE_MODIFY_VLAN,
|
||||
[DR_ACTION_TYP_VPORT] = DR_ACTION_STATE_TERM,
|
||||
@ -203,6 +219,7 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX]
|
||||
[DR_ACTION_STATE_NON_TERM] = {
|
||||
[DR_ACTION_TYP_DROP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_FT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_SAMPLER] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_CTR] = DR_ACTION_STATE_NON_TERM,
|
||||
[DR_ACTION_TYP_TNL_L2_TO_L2] = DR_ACTION_STATE_DECAP,
|
||||
[DR_ACTION_TYP_TNL_L3_TO_L2] = DR_ACTION_STATE_DECAP,
|
||||
@ -221,6 +238,7 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX]
|
||||
[DR_ACTION_STATE_NO_ACTION] = {
|
||||
[DR_ACTION_TYP_DROP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_FT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_SAMPLER] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_CTR] = DR_ACTION_STATE_NON_TERM,
|
||||
[DR_ACTION_TYP_MODIFY_HDR] = DR_ACTION_STATE_MODIFY_HDR,
|
||||
[DR_ACTION_TYP_L2_TO_TNL_L2] = DR_ACTION_STATE_ENCAP,
|
||||
@ -233,11 +251,13 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX]
|
||||
[DR_ACTION_TYP_DROP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_FT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_CTR] = DR_ACTION_STATE_ENCAP,
|
||||
[DR_ACTION_TYP_SAMPLER] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_VPORT] = DR_ACTION_STATE_TERM,
|
||||
},
|
||||
[DR_ACTION_STATE_MODIFY_HDR] = {
|
||||
[DR_ACTION_TYP_DROP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_FT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_SAMPLER] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_CTR] = DR_ACTION_STATE_MODIFY_HDR,
|
||||
[DR_ACTION_TYP_L2_TO_TNL_L2] = DR_ACTION_STATE_ENCAP,
|
||||
[DR_ACTION_TYP_L2_TO_TNL_L3] = DR_ACTION_STATE_ENCAP,
|
||||
@ -248,6 +268,7 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX]
|
||||
[DR_ACTION_STATE_MODIFY_VLAN] = {
|
||||
[DR_ACTION_TYP_DROP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_FT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_SAMPLER] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_PUSH_VLAN] = DR_ACTION_STATE_MODIFY_VLAN,
|
||||
[DR_ACTION_TYP_CTR] = DR_ACTION_STATE_MODIFY_VLAN,
|
||||
[DR_ACTION_TYP_L2_TO_TNL_L2] = DR_ACTION_STATE_ENCAP,
|
||||
@ -258,6 +279,7 @@ next_action_state[DR_ACTION_DOMAIN_MAX][DR_ACTION_STATE_MAX][DR_ACTION_TYP_MAX]
|
||||
[DR_ACTION_STATE_NON_TERM] = {
|
||||
[DR_ACTION_TYP_DROP] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_FT] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_SAMPLER] = DR_ACTION_STATE_TERM,
|
||||
[DR_ACTION_TYP_CTR] = DR_ACTION_STATE_NON_TERM,
|
||||
[DR_ACTION_TYP_MODIFY_HDR] = DR_ACTION_STATE_MODIFY_HDR,
|
||||
[DR_ACTION_TYP_L2_TO_TNL_L2] = DR_ACTION_STATE_ENCAP,
|
||||
@ -519,6 +541,10 @@ int mlx5dr_actions_build_ste_arr(struct mlx5dr_matcher *matcher,
|
||||
attr.reformat.size = action->reformat->size;
|
||||
attr.reformat.id = action->reformat->id;
|
||||
break;
|
||||
case DR_ACTION_TYP_SAMPLER:
|
||||
attr.final_icm_addr = rx_rule ? action->sampler->rx_icm_addr :
|
||||
action->sampler->tx_icm_addr;
|
||||
break;
|
||||
case DR_ACTION_TYP_VPORT:
|
||||
attr.hit_gvmi = action->vport->caps->vhca_gvmi;
|
||||
dest_action = action;
|
||||
@ -612,6 +638,7 @@ static unsigned int action_size[DR_ACTION_TYP_MAX] = {
|
||||
[DR_ACTION_TYP_VPORT] = sizeof(struct mlx5dr_action_vport),
|
||||
[DR_ACTION_TYP_PUSH_VLAN] = sizeof(struct mlx5dr_action_push_vlan),
|
||||
[DR_ACTION_TYP_INSERT_HDR] = sizeof(struct mlx5dr_action_reformat),
|
||||
[DR_ACTION_TYP_SAMPLER] = sizeof(struct mlx5dr_action_sampler),
|
||||
};
|
||||
|
||||
static struct mlx5dr_action *
|
||||
@ -824,6 +851,31 @@ struct mlx5dr_action *mlx5dr_action_create_tag(u32 tag_value)
|
||||
return action;
|
||||
}
|
||||
|
||||
struct mlx5dr_action *
|
||||
mlx5dr_action_create_flow_sampler(struct mlx5dr_domain *dmn, u32 sampler_id)
|
||||
{
|
||||
struct mlx5dr_action *action;
|
||||
u64 icm_rx, icm_tx;
|
||||
int ret;
|
||||
|
||||
ret = mlx5dr_cmd_query_flow_sampler(dmn->mdev, sampler_id,
|
||||
&icm_rx, &icm_tx);
|
||||
if (ret)
|
||||
return NULL;
|
||||
|
||||
action = dr_action_create_generic(DR_ACTION_TYP_SAMPLER);
|
||||
if (!action)
|
||||
return NULL;
|
||||
|
||||
action->sampler->dmn = dmn;
|
||||
action->sampler->sampler_id = sampler_id;
|
||||
action->sampler->rx_icm_addr = icm_rx;
|
||||
action->sampler->tx_icm_addr = icm_tx;
|
||||
|
||||
refcount_inc(&dmn->refcount);
|
||||
return action;
|
||||
}
|
||||
|
||||
static int
|
||||
dr_action_verify_reformat_params(enum mlx5dr_action_type reformat_type,
|
||||
struct mlx5dr_domain *dmn,
|
||||
@ -1624,6 +1676,9 @@ int mlx5dr_action_destroy(struct mlx5dr_action *action)
|
||||
kfree(action->rewrite->data);
|
||||
refcount_dec(&action->rewrite->dmn->refcount);
|
||||
break;
|
||||
case DR_ACTION_TYP_SAMPLER:
|
||||
refcount_dec(&action->sampler->dmn->refcount);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@ -228,6 +228,36 @@ int mlx5dr_cmd_query_flow_table(struct mlx5_core_dev *dev,
|
||||
return 0;
|
||||
}
|
||||
|
||||
int mlx5dr_cmd_query_flow_sampler(struct mlx5_core_dev *dev,
|
||||
u32 sampler_id,
|
||||
u64 *rx_icm_addr,
|
||||
u64 *tx_icm_addr)
|
||||
{
|
||||
u32 out[MLX5_ST_SZ_DW(query_sampler_obj_out)] = {};
|
||||
u32 in[MLX5_ST_SZ_DW(general_obj_in_cmd_hdr)] = {};
|
||||
void *attr;
|
||||
int ret;
|
||||
|
||||
MLX5_SET(general_obj_in_cmd_hdr, in, opcode,
|
||||
MLX5_CMD_OP_QUERY_GENERAL_OBJECT);
|
||||
MLX5_SET(general_obj_in_cmd_hdr, in, obj_type,
|
||||
MLX5_GENERAL_OBJECT_TYPES_SAMPLER);
|
||||
MLX5_SET(general_obj_in_cmd_hdr, in, obj_id, sampler_id);
|
||||
|
||||
ret = mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
attr = MLX5_ADDR_OF(query_sampler_obj_out, out, sampler_object);
|
||||
|
||||
*rx_icm_addr = MLX5_GET64(sampler_obj, attr,
|
||||
sw_steering_icm_address_rx);
|
||||
*tx_icm_addr = MLX5_GET64(sampler_obj, attr,
|
||||
sw_steering_icm_address_tx);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int mlx5dr_cmd_sync_steering(struct mlx5_core_dev *mdev)
|
||||
{
|
||||
u32 in[MLX5_ST_SZ_DW(sync_steering_in)] = {};
|
||||
@ -711,6 +741,9 @@ int mlx5dr_cmd_set_fte(struct mlx5_core_dev *dev,
|
||||
fte->dest_arr[i].vport.reformat_id);
|
||||
}
|
||||
break;
|
||||
case MLX5_FLOW_DESTINATION_TYPE_FLOW_SAMPLER:
|
||||
id = fte->dest_arr[i].sampler_id;
|
||||
break;
|
||||
default:
|
||||
id = fte->dest_arr[i].tir_num;
|
||||
}
|
||||
|
@ -124,6 +124,7 @@ enum mlx5dr_action_type {
|
||||
DR_ACTION_TYP_POP_VLAN,
|
||||
DR_ACTION_TYP_PUSH_VLAN,
|
||||
DR_ACTION_TYP_INSERT_HDR,
|
||||
DR_ACTION_TYP_SAMPLER,
|
||||
DR_ACTION_TYP_MAX,
|
||||
};
|
||||
|
||||
@ -919,6 +920,13 @@ struct mlx5dr_action_reformat {
|
||||
u8 param_1;
|
||||
};
|
||||
|
||||
struct mlx5dr_action_sampler {
|
||||
struct mlx5dr_domain *dmn;
|
||||
u64 rx_icm_addr;
|
||||
u64 tx_icm_addr;
|
||||
u32 sampler_id;
|
||||
};
|
||||
|
||||
struct mlx5dr_action_dest_tbl {
|
||||
u8 is_fw_tbl:1;
|
||||
union {
|
||||
@ -962,6 +970,7 @@ struct mlx5dr_action {
|
||||
void *data;
|
||||
struct mlx5dr_action_rewrite *rewrite;
|
||||
struct mlx5dr_action_reformat *reformat;
|
||||
struct mlx5dr_action_sampler *sampler;
|
||||
struct mlx5dr_action_dest_tbl *dest_tbl;
|
||||
struct mlx5dr_action_ctr *ctr;
|
||||
struct mlx5dr_action_vport *vport;
|
||||
@ -1116,6 +1125,10 @@ int mlx5dr_cmd_query_gvmi(struct mlx5_core_dev *mdev,
|
||||
bool other_vport, u16 vport_number, u16 *gvmi);
|
||||
int mlx5dr_cmd_query_esw_caps(struct mlx5_core_dev *mdev,
|
||||
struct mlx5dr_esw_caps *caps);
|
||||
int mlx5dr_cmd_query_flow_sampler(struct mlx5_core_dev *dev,
|
||||
u32 sampler_id,
|
||||
u64 *rx_icm_addr,
|
||||
u64 *tx_icm_addr);
|
||||
int mlx5dr_cmd_sync_steering(struct mlx5_core_dev *mdev);
|
||||
int mlx5dr_cmd_set_fte_modify_and_vport(struct mlx5_core_dev *mdev,
|
||||
u32 table_type,
|
||||
@ -1303,6 +1316,7 @@ struct mlx5dr_cmd_flow_destination_hw_info {
|
||||
u32 ft_num;
|
||||
u32 ft_id;
|
||||
u32 counter_id;
|
||||
u32 sampler_id;
|
||||
struct {
|
||||
u16 num;
|
||||
u16 vhca_id;
|
||||
|
@ -387,7 +387,7 @@ static int mlx5_cmd_dr_create_fte(struct mlx5_flow_root_namespace *ns,
|
||||
if (fte->action.action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) {
|
||||
list_for_each_entry(dst, &fte->node.children, node.list) {
|
||||
enum mlx5_flow_destination_type type = dst->dest_attr.type;
|
||||
u32 ft_id;
|
||||
u32 id;
|
||||
|
||||
if (num_actions == MLX5_FLOW_CONTEXT_ACTION_MAX ||
|
||||
num_term_actions >= MLX5_FLOW_CONTEXT_ACTION_MAX) {
|
||||
@ -425,9 +425,20 @@ static int mlx5_cmd_dr_create_fte(struct mlx5_flow_root_namespace *ns,
|
||||
num_term_actions++;
|
||||
break;
|
||||
case MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE_NUM:
|
||||
ft_id = dst->dest_attr.ft_num;
|
||||
id = dst->dest_attr.ft_num;
|
||||
tmp_action = mlx5dr_action_create_dest_table_num(domain,
|
||||
ft_id);
|
||||
id);
|
||||
if (!tmp_action) {
|
||||
err = -ENOMEM;
|
||||
goto free_actions;
|
||||
}
|
||||
fs_dr_actions[fs_dr_num_actions++] = tmp_action;
|
||||
term_actions[num_term_actions++].dest = tmp_action;
|
||||
break;
|
||||
case MLX5_FLOW_DESTINATION_TYPE_FLOW_SAMPLER:
|
||||
id = dst->dest_attr.sampler_id;
|
||||
tmp_action = mlx5dr_action_create_flow_sampler(domain,
|
||||
id);
|
||||
if (!tmp_action) {
|
||||
err = -ENOMEM;
|
||||
goto free_actions;
|
||||
|
@ -100,6 +100,9 @@ struct mlx5dr_action *mlx5dr_action_create_drop(void);
|
||||
|
||||
struct mlx5dr_action *mlx5dr_action_create_tag(u32 tag_value);
|
||||
|
||||
struct mlx5dr_action *
|
||||
mlx5dr_action_create_flow_sampler(struct mlx5dr_domain *dmn, u32 sampler_id);
|
||||
|
||||
struct mlx5dr_action *
|
||||
mlx5dr_action_create_flow_counter(u32 counter_id);
|
||||
|
||||
|
@ -11083,6 +11083,11 @@ struct mlx5_ifc_create_sampler_obj_in_bits {
|
||||
struct mlx5_ifc_sampler_obj_bits sampler_object;
|
||||
};
|
||||
|
||||
struct mlx5_ifc_query_sampler_obj_out_bits {
|
||||
struct mlx5_ifc_general_obj_out_cmd_hdr_bits general_obj_out_cmd_hdr;
|
||||
struct mlx5_ifc_sampler_obj_bits sampler_object;
|
||||
};
|
||||
|
||||
enum {
|
||||
MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_KEY_SIZE_128 = 0x0,
|
||||
MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_KEY_SIZE_256 = 0x1,
|
||||
|
Loading…
x
Reference in New Issue
Block a user