Commit 46f2a8ae authored by Yevgeny Kliteynik's avatar Yevgeny Kliteynik Committed by Saeed Mahameed
Browse files

net/mlx5: DR, Remove HW specific STE type from nic domain 



Instead of using the HW specific STEv0 type, it is better to use
an enum to indicate if this is an RX or TX nic domain.
This means that now we will need to convert the nic domain type
to the corresponding STE type.

Signed-off-by: default avatarAlex Vesker <valex@nvidia.com>
Signed-off-by: default avatarYevgeny Kliteynik <kliteyn@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent ab9d1f96

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c

+7 −7
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ dr_action_reformat_to_action_type(enum mlx5dr_action_reformat_type reformat_type 
 * the new size of the STEs array, rule with actions.

 */

static void dr_actions_apply(struct mlx5dr_domain *dmn,

			     enum mlx5dr_ste_entry_type ste_type,

			     enum mlx5dr_domain_nic_type nic_type,

			     u8 *action_type_set,

			     u8 *last_ste,

			     struct mlx5dr_ste_actions_attr *attr,
@@ -443,7 +443,7 @@ static void dr_actions_apply(struct mlx5dr_domain *dmn, 
	struct mlx5dr_ste_ctx *ste_ctx = dmn->ste_ctx;

	u32 added_stes = 0;



	if (ste_type == MLX5DR_STE_TYPE_RX)

	if (nic_type == DR_DOMAIN_NIC_TYPE_RX)

		mlx5dr_ste_set_actions_rx(ste_ctx, dmn, action_type_set,

					  last_ste, attr, &added_stes);

	else
@@ -455,7 +455,7 @@ static void dr_actions_apply(struct mlx5dr_domain *dmn, 


static enum dr_action_domain

dr_action_get_action_domain(enum mlx5dr_domain_type domain,

			    enum mlx5dr_ste_entry_type ste_type)

			    enum mlx5dr_domain_nic_type nic_type)

{

	switch (domain) {

	case MLX5DR_DOMAIN_TYPE_NIC_RX:
@@ -463,7 +463,7 @@ dr_action_get_action_domain(enum mlx5dr_domain_type domain, 
	case MLX5DR_DOMAIN_TYPE_NIC_TX:

		return DR_ACTION_DOMAIN_NIC_EGRESS;

	case MLX5DR_DOMAIN_TYPE_FDB:

		if (ste_type == MLX5DR_STE_TYPE_RX)

		if (nic_type == DR_DOMAIN_NIC_TYPE_RX)

			return DR_ACTION_DOMAIN_FDB_INGRESS;

		return DR_ACTION_DOMAIN_FDB_EGRESS;

	default:
@@ -551,7 +551,7 @@ int mlx5dr_actions_build_ste_arr(struct mlx5dr_matcher *matcher, 
				 u32 *new_hw_ste_arr_sz)

{

	struct mlx5dr_domain_rx_tx *nic_dmn = nic_matcher->nic_tbl->nic_dmn;

	bool rx_rule = nic_dmn->ste_type == MLX5DR_STE_TYPE_RX;

	bool rx_rule = nic_dmn->type == DR_DOMAIN_NIC_TYPE_RX;

	struct mlx5dr_domain *dmn = matcher->tbl->dmn;

	u8 action_type_set[DR_ACTION_TYP_MAX] = {};

	struct mlx5dr_ste_actions_attr attr = {};
@@ -565,7 +565,7 @@ int mlx5dr_actions_build_ste_arr(struct mlx5dr_matcher *matcher, 
	attr.gvmi = dmn->info.caps.gvmi;

	attr.hit_gvmi = dmn->info.caps.gvmi;

	attr.final_icm_addr = nic_dmn->default_icm_addr;

	action_domain = dr_action_get_action_domain(dmn->type, nic_dmn->ste_type);

	action_domain = dr_action_get_action_domain(dmn->type, nic_dmn->type);



	for (i = 0; i < num_actions; i++) {

		struct mlx5dr_action_dest_tbl *dest_tbl;
@@ -752,7 +752,7 @@ int mlx5dr_actions_build_ste_arr(struct mlx5dr_matcher *matcher, 
	}



	dr_actions_apply(dmn,

			 nic_dmn->ste_type,

			 nic_dmn->type,

			 action_type_set,

			 last_ste,

			 &attr,

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c

+4 −4
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static int dr_domain_caps_init(struct mlx5_core_dev *mdev, 
			return -ENOTSUPP;



		dmn->info.supp_sw_steering = true;

		dmn->info.rx.ste_type = MLX5DR_STE_TYPE_RX;

		dmn->info.rx.type = DR_DOMAIN_NIC_TYPE_RX;

		dmn->info.rx.default_icm_addr = dmn->info.caps.nic_rx_drop_address;

		dmn->info.rx.drop_icm_addr = dmn->info.caps.nic_rx_drop_address;

		break;
@@ -254,7 +254,7 @@ static int dr_domain_caps_init(struct mlx5_core_dev *mdev, 
			return -ENOTSUPP;



		dmn->info.supp_sw_steering = true;

		dmn->info.tx.ste_type = MLX5DR_STE_TYPE_TX;

		dmn->info.tx.type = DR_DOMAIN_NIC_TYPE_TX;

		dmn->info.tx.default_icm_addr = dmn->info.caps.nic_tx_allow_address;

		dmn->info.tx.drop_icm_addr = dmn->info.caps.nic_tx_drop_address;

		break;
@@ -265,8 +265,8 @@ static int dr_domain_caps_init(struct mlx5_core_dev *mdev, 
		if (!DR_DOMAIN_SW_STEERING_SUPPORTED(dmn, fdb))

			return -ENOTSUPP;



		dmn->info.rx.ste_type = MLX5DR_STE_TYPE_RX;

		dmn->info.tx.ste_type = MLX5DR_STE_TYPE_TX;

		dmn->info.rx.type = DR_DOMAIN_NIC_TYPE_RX;

		dmn->info.tx.type = DR_DOMAIN_NIC_TYPE_TX;

		vport_cap = mlx5dr_get_vport_cap(&dmn->info.caps, 0);

		if (!vport_cap) {

			mlx5dr_err(dmn, "Failed to get esw manager vport\n");

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ static int dr_matcher_set_ste_builders(struct mlx5dr_matcher *matcher, 
	int ret, i;



	sb = nic_matcher->ste_builder_arr[outer_ipv][inner_ipv];

	rx = nic_dmn->ste_type == MLX5DR_STE_TYPE_RX;

	rx = nic_dmn->type == DR_DOMAIN_NIC_TYPE_RX;



	/* Create a temporary mask to track and clear used mask fields */

	if (matcher->match_criteria & DR_MATCHER_CRITERIA_OUTER)

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c

+4 −4
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ dr_rule_rehash_htbl(struct mlx5dr_rule *rule, 
	info.miss_icm_addr = nic_matcher->e_anchor->chunk->icm_addr;

	mlx5dr_ste_set_formatted_ste(dmn->ste_ctx,

				     dmn->info.caps.gvmi,

				     nic_dmn,

				     nic_dmn->type,

				     new_htbl,

				     formatted_ste,

				     &info);
@@ -1015,12 +1015,12 @@ static enum mlx5dr_ipv dr_rule_get_ipv(struct mlx5dr_match_spec *spec) 
}



static bool dr_rule_skip(enum mlx5dr_domain_type domain,

			 enum mlx5dr_ste_entry_type ste_type,

			 enum mlx5dr_domain_nic_type nic_type,

			 struct mlx5dr_match_param *mask,

			 struct mlx5dr_match_param *value,

			 u32 flow_source)

{

	bool rx = ste_type == MLX5DR_STE_TYPE_RX;

	bool rx = nic_type == DR_DOMAIN_NIC_TYPE_RX;



	if (domain != MLX5DR_DOMAIN_TYPE_FDB)

		return false;
@@ -1067,7 +1067,7 @@ dr_rule_create_rule_nic(struct mlx5dr_rule *rule, 


	INIT_LIST_HEAD(&nic_rule->rule_members_list);



	if (dr_rule_skip(dmn->type, nic_dmn->ste_type, &matcher->mask, param,

	if (dr_rule_skip(dmn->type, nic_dmn->type, &matcher->mask, param,

			 rule->flow_source))

		return 0;

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c

+6 −4
Original line number Diff line number Diff line
@@ -382,14 +382,15 @@ void mlx5dr_ste_prepare_for_postsend(struct mlx5dr_ste_ctx *ste_ctx, 
/* Init one ste as a pattern for ste data array */

void mlx5dr_ste_set_formatted_ste(struct mlx5dr_ste_ctx *ste_ctx,

				  u16 gvmi,

				  struct mlx5dr_domain_rx_tx *nic_dmn,

				  enum mlx5dr_domain_nic_type nic_type,

				  struct mlx5dr_ste_htbl *htbl,

				  u8 *formatted_ste,

				  struct mlx5dr_htbl_connect_info *connect_info)

{

	bool is_rx = nic_type == DR_DOMAIN_NIC_TYPE_RX;

	struct mlx5dr_ste ste = {};



	ste_ctx->ste_init(formatted_ste, htbl->lu_type, nic_dmn->ste_type, gvmi);

	ste_ctx->ste_init(formatted_ste, htbl->lu_type, is_rx, gvmi);

	ste.hw_ste = formatted_ste;



	if (connect_info->type == CONNECT_HIT)
@@ -408,7 +409,7 @@ int mlx5dr_ste_htbl_init_and_postsend(struct mlx5dr_domain *dmn, 


	mlx5dr_ste_set_formatted_ste(dmn->ste_ctx,

				     dmn->info.caps.gvmi,

				     nic_dmn,

				     nic_dmn->type,

				     htbl,

				     formatted_ste,

				     connect_info);
@@ -649,6 +650,7 @@ int mlx5dr_ste_build_ste_arr(struct mlx5dr_matcher *matcher, 
			     u8 *ste_arr)

{

	struct mlx5dr_domain_rx_tx *nic_dmn = nic_matcher->nic_tbl->nic_dmn;

	bool is_rx = nic_dmn->type == DR_DOMAIN_NIC_TYPE_RX;

	struct mlx5dr_domain *dmn = matcher->tbl->dmn;

	struct mlx5dr_ste_ctx *ste_ctx = dmn->ste_ctx;

	struct mlx5dr_ste_build *sb;
@@ -663,7 +665,7 @@ int mlx5dr_ste_build_ste_arr(struct mlx5dr_matcher *matcher, 
	for (i = 0; i < nic_matcher->num_of_builders; i++) {

		ste_ctx->ste_init(ste_arr,

				  sb->lu_type,

				  nic_dmn->ste_type,

				  is_rx,

				  dmn->info.caps.gvmi);



		mlx5dr_ste_set_bit_mask(ste_arr, sb->bit_mask);