Commit d32c2253 authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Jakub Kicinski
Browse files

net/mlx5e: Split out channel (de)activation in rx_res 



To decrease the nesting level and reduce duplication of code, create
functions to redirect direct RQTs to the actual RQs or drop_rq, which
are used in the activation and deactivation flows of channels.

Signed-off-by: default avatarMaxim Mikityanskiy <maximmi@nvidia.com>
Reviewed-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2d0765f7

drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c

+53 −53
Original line number Diff line number Diff line
@@ -523,21 +523,12 @@ static u32 mlx5e_rx_res_get_rqtn_direct(struct mlx5e_rx_res *res, unsigned int i 
	return mlx5e_rqt_get_rqtn(&res->channels[ix].direct_rqt);

}



void mlx5e_rx_res_channels_activate(struct mlx5e_rx_res *res, struct mlx5e_channels *chs)

static void mlx5e_rx_res_channel_activate_direct(struct mlx5e_rx_res *res,

						 struct mlx5e_channels *chs,

						 unsigned int ix)

{

	unsigned int nch, ix;

	int err;



	nch = mlx5e_channels_get_num(chs);



	for (ix = 0; ix < chs->num; ix++)

		mlx5e_channels_get_regular_rqn(chs, ix, &res->rss_rqns[ix]);

	res->rss_nch = chs->num;



	mlx5e_rx_res_rss_enable(res);



	for (ix = 0; ix < nch; ix++) {

	u32 rqn;

	int err;



	mlx5e_channels_get_regular_rqn(chs, ix, &rqn);

	err = mlx5e_rqt_redirect_direct(&res->channels[ix].direct_rqt, rqn);
@@ -547,7 +538,7 @@ void mlx5e_rx_res_channels_activate(struct mlx5e_rx_res *res, struct mlx5e_chann 
			       rqn, ix, err);



	if (!(res->features & MLX5E_RX_RES_FEATURE_XSK))

			continue;

		return;



	if (!mlx5e_channels_get_xsk_rqn(chs, ix, &rqn))

		rqn = res->drop_rqn;
@@ -557,7 +548,12 @@ void mlx5e_rx_res_channels_activate(struct mlx5e_rx_res *res, struct mlx5e_chann 
			       mlx5e_rqt_get_rqtn(&res->channels[ix].xsk_rqt),

			       rqn, ix, err);

}

	for (ix = nch; ix < res->max_nch; ix++) {



static void mlx5e_rx_res_channel_deactivate_direct(struct mlx5e_rx_res *res,

						   unsigned int ix)

{

	int err;



	err = mlx5e_rqt_redirect_direct(&res->channels[ix].direct_rqt, res->drop_rqn);

	if (err)

		mlx5_core_warn(res->mdev, "Failed to redirect direct RQT %#x to drop RQ %#x (channel %u): err = %d\n",
@@ -565,7 +561,7 @@ void mlx5e_rx_res_channels_activate(struct mlx5e_rx_res *res, struct mlx5e_chann 
			       res->drop_rqn, ix, err);



	if (!(res->features & MLX5E_RX_RES_FEATURE_XSK))

			continue;

		return;



	err = mlx5e_rqt_redirect_direct(&res->channels[ix].xsk_rqt, res->drop_rqn);

	if (err)
@@ -574,6 +570,24 @@ void mlx5e_rx_res_channels_activate(struct mlx5e_rx_res *res, struct mlx5e_chann 
			       res->drop_rqn, ix, err);

}



void mlx5e_rx_res_channels_activate(struct mlx5e_rx_res *res, struct mlx5e_channels *chs)

{

	unsigned int nch, ix;

	int err;



	nch = mlx5e_channels_get_num(chs);



	for (ix = 0; ix < chs->num; ix++)

		mlx5e_channels_get_regular_rqn(chs, ix, &res->rss_rqns[ix]);

	res->rss_nch = chs->num;



	mlx5e_rx_res_rss_enable(res);



	for (ix = 0; ix < nch; ix++)

		mlx5e_rx_res_channel_activate_direct(res, chs, ix);

	for (ix = nch; ix < res->max_nch; ix++)

		mlx5e_rx_res_channel_deactivate_direct(res, ix);



	if (res->features & MLX5E_RX_RES_FEATURE_PTP) {

		u32 rqn;
@@ -595,22 +609,8 @@ void mlx5e_rx_res_channels_deactivate(struct mlx5e_rx_res *res) 


	mlx5e_rx_res_rss_disable(res);



	for (ix = 0; ix < res->max_nch; ix++) {

		err = mlx5e_rqt_redirect_direct(&res->channels[ix].direct_rqt, res->drop_rqn);

		if (err)

			mlx5_core_warn(res->mdev, "Failed to redirect direct RQT %#x to drop RQ %#x (channel %u): err = %d\n",

				       mlx5e_rqt_get_rqtn(&res->channels[ix].direct_rqt),

				       res->drop_rqn, ix, err);



		if (!(res->features & MLX5E_RX_RES_FEATURE_XSK))

			continue;



		err = mlx5e_rqt_redirect_direct(&res->channels[ix].xsk_rqt, res->drop_rqn);

		if (err)

			mlx5_core_warn(res->mdev, "Failed to redirect XSK RQT %#x to drop RQ %#x (channel %u): err = %d\n",

				       mlx5e_rqt_get_rqtn(&res->channels[ix].xsk_rqt),

				       res->drop_rqn, ix, err);

	}

	for (ix = 0; ix < res->max_nch; ix++)

		mlx5e_rx_res_channel_deactivate_direct(res, ix);



	if (res->features & MLX5E_RX_RES_FEATURE_PTP) {

		err = mlx5e_rqt_redirect_direct(&res->ptp.rqt, res->drop_rqn);