Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1462e48d authored by Roi Dayan's avatar Roi Dayan Committed by Saeed Mahameed
Browse files

net/mlx5e: Move Q counters allocation and drop RQ to init_rx 



Not all profiles query the HW Q counters in update_stats() callback.
HW Q couners are limited per device and in case of representors all
their Q counters are allocated on the parent PF device.
Avoid reundant allocation of HW Q counters by moving the allocation
to init_rx profile callback.

Signed-off-by: default avatarRoi Dayan <roid@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent d2408205

drivers/net/ethernet/mellanox/mlx5/core/en.h

+6 −0
Original line number Diff line number Diff line
@@ -898,6 +898,12 @@ void mlx5e_destroy_mdev_resources(struct mlx5_core_dev *mdev); 
int mlx5e_refresh_tirs(struct mlx5e_priv *priv, bool enable_uc_lb);



/* common netdev helpers */

void mlx5e_create_q_counters(struct mlx5e_priv *priv);

void mlx5e_destroy_q_counters(struct mlx5e_priv *priv);

int mlx5e_open_drop_rq(struct mlx5e_priv *priv,

		       struct mlx5e_rq *drop_rq);

void mlx5e_close_drop_rq(struct mlx5e_rq *drop_rq);



int mlx5e_create_indirect_rqt(struct mlx5e_priv *priv);



int mlx5e_create_indirect_tirs(struct mlx5e_priv *priv);

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+22 −23
Original line number Diff line number Diff line
@@ -3049,7 +3049,7 @@ static int mlx5e_alloc_drop_cq(struct mlx5_core_dev *mdev, 
	return mlx5e_alloc_cq_common(mdev, param, cq);

}



static int mlx5e_open_drop_rq(struct mlx5e_priv *priv,

int mlx5e_open_drop_rq(struct mlx5e_priv *priv,

		       struct mlx5e_rq *drop_rq)

{

	struct mlx5_core_dev *mdev = priv->mdev;
@@ -3094,7 +3094,7 @@ static int mlx5e_open_drop_rq(struct mlx5e_priv *priv, 
	return err;

}



static void mlx5e_close_drop_rq(struct mlx5e_rq *drop_rq)

void mlx5e_close_drop_rq(struct mlx5e_rq *drop_rq)

{

	mlx5e_destroy_rq(drop_rq);

	mlx5e_free_rq(drop_rq);
@@ -4726,7 +4726,7 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev) 
	mlx5e_tls_build_netdev(priv);

}



static void mlx5e_create_q_counters(struct mlx5e_priv *priv)

void mlx5e_create_q_counters(struct mlx5e_priv *priv)

{

	struct mlx5_core_dev *mdev = priv->mdev;

	int err;
@@ -4744,7 +4744,7 @@ static void mlx5e_create_q_counters(struct mlx5e_priv *priv) 
	}

}



static void mlx5e_destroy_q_counters(struct mlx5e_priv *priv)

void mlx5e_destroy_q_counters(struct mlx5e_priv *priv)

{

	if (priv->q_counter)

		mlx5_core_dealloc_q_counter(priv->mdev, priv->q_counter);
@@ -4783,9 +4783,17 @@ static int mlx5e_init_nic_rx(struct mlx5e_priv *priv) 
	struct mlx5_core_dev *mdev = priv->mdev;

	int err;



	mlx5e_create_q_counters(priv);



	err = mlx5e_open_drop_rq(priv, &priv->drop_rq);

	if (err) {

		mlx5_core_err(mdev, "open drop rq failed, %d\n", err);

		goto err_destroy_q_counters;

	}



	err = mlx5e_create_indirect_rqt(priv);

	if (err)

		return err;

		goto err_close_drop_rq;



	err = mlx5e_create_direct_rqts(priv);

	if (err)
@@ -4821,6 +4829,10 @@ static int mlx5e_init_nic_rx(struct mlx5e_priv *priv) 
	mlx5e_destroy_direct_rqts(priv);

err_destroy_indirect_rqts:

	mlx5e_destroy_rqt(priv, &priv->indir_rqt);

err_close_drop_rq:

	mlx5e_close_drop_rq(&priv->drop_rq);

err_destroy_q_counters:

	mlx5e_destroy_q_counters(priv);

	return err;

}
@@ -4832,6 +4844,8 @@ static void mlx5e_cleanup_nic_rx(struct mlx5e_priv *priv) 
	mlx5e_destroy_indirect_tirs(priv);

	mlx5e_destroy_direct_rqts(priv);

	mlx5e_destroy_rqt(priv, &priv->indir_rqt);

	mlx5e_close_drop_rq(&priv->drop_rq);

	mlx5e_destroy_q_counters(priv);

}



static int mlx5e_init_nic_tx(struct mlx5e_priv *priv)
@@ -4975,7 +4989,6 @@ struct net_device *mlx5e_create_netdev(struct mlx5_core_dev *mdev, 


int mlx5e_attach_netdev(struct mlx5e_priv *priv)

{

	struct mlx5_core_dev *mdev = priv->mdev;

	const struct mlx5e_profile *profile;

	int err;
@@ -4986,28 +4999,16 @@ int mlx5e_attach_netdev(struct mlx5e_priv *priv) 
	if (err)

		goto out;



	mlx5e_create_q_counters(priv);



	err = mlx5e_open_drop_rq(priv, &priv->drop_rq);

	if (err) {

		mlx5_core_err(mdev, "open drop rq failed, %d\n", err);

		goto err_destroy_q_counters;

	}



	err = profile->init_rx(priv);

	if (err)

		goto err_close_drop_rq;

		goto err_cleanup_tx;



	if (profile->enable)

		profile->enable(priv);



	return 0;



err_close_drop_rq:

	mlx5e_close_drop_rq(&priv->drop_rq);



err_destroy_q_counters:

	mlx5e_destroy_q_counters(priv);

err_cleanup_tx:

	profile->cleanup_tx(priv);



out:
@@ -5025,8 +5026,6 @@ void mlx5e_detach_netdev(struct mlx5e_priv *priv) 
	flush_workqueue(priv->wq);



	profile->cleanup_rx(priv);

	mlx5e_close_drop_rq(&priv->drop_rq);

	mlx5e_destroy_q_counters(priv);

	profile->cleanup_tx(priv);

	cancel_delayed_work_sync(&priv->update_stats_work);

}

drivers/net/ethernet/mellanox/mlx5/core/en_rep.c

+11 −1
Original line number Diff line number Diff line
@@ -999,14 +999,21 @@ static int mlx5e_init_rep_rx(struct mlx5e_priv *priv) 
	struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;

	struct mlx5e_rep_priv *rpriv = priv->ppriv;

	struct mlx5_eswitch_rep *rep = rpriv->rep;

	struct mlx5_core_dev *mdev = priv->mdev;

	struct mlx5_flow_handle *flow_rule;

	int err;



	mlx5e_init_l2_addr(priv);



	err = mlx5e_open_drop_rq(priv, &priv->drop_rq);

	if (err) {

		mlx5_core_err(mdev, "open drop rq failed, %d\n", err);

		return err;

	}



	err = mlx5e_create_direct_rqts(priv);

	if (err)

		return err;

		goto err_close_drop_rq;



	err = mlx5e_create_direct_tirs(priv);

	if (err)
@@ -1027,6 +1034,8 @@ static int mlx5e_init_rep_rx(struct mlx5e_priv *priv) 
	mlx5e_destroy_direct_tirs(priv);

err_destroy_direct_rqts:

	mlx5e_destroy_direct_rqts(priv);

err_close_drop_rq:

	mlx5e_close_drop_rq(&priv->drop_rq);

	return err;

}
@@ -1037,6 +1046,7 @@ static void mlx5e_cleanup_rep_rx(struct mlx5e_priv *priv) 
	mlx5_del_flow_rules(rpriv->vport_rx_rule);

	mlx5e_destroy_direct_tirs(priv);

	mlx5e_destroy_direct_rqts(priv);

	mlx5e_close_drop_rq(&priv->drop_rq);

}



static int mlx5e_init_rep_tx(struct mlx5e_priv *priv)

drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c

+16 −1
Original line number Diff line number Diff line
@@ -349,11 +349,20 @@ static void mlx5i_destroy_flow_steering(struct mlx5e_priv *priv) 


static int mlx5i_init_rx(struct mlx5e_priv *priv)

{

	struct mlx5_core_dev *mdev = priv->mdev;

	int err;



	mlx5e_create_q_counters(priv);



	err = mlx5e_open_drop_rq(priv, &priv->drop_rq);

	if (err) {

		mlx5_core_err(mdev, "open drop rq failed, %d\n", err);

		goto err_destroy_q_counters;

	}



	err = mlx5e_create_indirect_rqt(priv);

	if (err)

		return err;

		goto err_close_drop_rq;



	err = mlx5e_create_direct_rqts(priv);

	if (err)
@@ -381,6 +390,10 @@ static int mlx5i_init_rx(struct mlx5e_priv *priv) 
	mlx5e_destroy_direct_rqts(priv);

err_destroy_indirect_rqts:

	mlx5e_destroy_rqt(priv, &priv->indir_rqt);

err_close_drop_rq:

	mlx5e_close_drop_rq(&priv->drop_rq);

err_destroy_q_counters:

	mlx5e_destroy_q_counters(priv);

	return err;

}
@@ -391,6 +404,8 @@ static void mlx5i_cleanup_rx(struct mlx5e_priv *priv) 
	mlx5e_destroy_indirect_tirs(priv);

	mlx5e_destroy_direct_rqts(priv);

	mlx5e_destroy_rqt(priv, &priv->indir_rqt);

	mlx5e_close_drop_rq(&priv->drop_rq);

	mlx5e_destroy_q_counters(priv);

}



static const struct mlx5e_profile mlx5i_nic_profile = {