Commit 911e3a37 authored by Tariq Toukan's avatar Tariq Toukan Committed by Jakub Kicinski
Browse files

net/mlx5e: Pass old channels as argument to mlx5e_switch_priv_channels 



Let the caller function mlx5e_safe_switch_params() maintain a copy
of the old channels, and pass it to mlx5e_switch_priv_channels().

This is in preparation for the next patch.

Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarCarolina Jubran <cjubran@nvidia.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/1761831159-1013140-7-git-send-email-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 477c352a

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

+17 −8
Original line number Diff line number Diff line
@@ -3356,12 +3356,12 @@ static int mlx5e_switch_priv_params(struct mlx5e_priv *priv, 
}



static int mlx5e_switch_priv_channels(struct mlx5e_priv *priv,

				      struct mlx5e_channels *old_chs,

				      struct mlx5e_channels *new_chs,

				      mlx5e_fp_preactivate preactivate,

				      void *context)

{

	struct net_device *netdev = priv->netdev;

	struct mlx5e_channels old_chs;

	int carrier_ok;

	int err = 0;
@@ -3370,7 +3370,6 @@ static int mlx5e_switch_priv_channels(struct mlx5e_priv *priv, 


	mlx5e_deactivate_priv_channels(priv);



	old_chs = priv->channels;

	priv->channels = *new_chs;



	/* New channels are ready to roll, call the preactivate hook if needed
@@ -3379,12 +3378,12 @@ static int mlx5e_switch_priv_channels(struct mlx5e_priv *priv, 
	if (preactivate) {

		err = preactivate(priv, context);

		if (err) {

			priv->channels = old_chs;

			priv->channels = *old_chs;

			goto out;

		}

	}



	mlx5e_close_channels(&old_chs);

	mlx5e_close_channels(old_chs);

	priv->profile->update_rx(priv);



	mlx5e_selq_apply(&priv->selq);
@@ -3403,16 +3402,20 @@ int mlx5e_safe_switch_params(struct mlx5e_priv *priv, 
			     mlx5e_fp_preactivate preactivate,

			     void *context, bool reset)

{

	struct mlx5e_channels *new_chs;

	struct mlx5e_channels *old_chs, *new_chs;

	int err;



	reset &= test_bit(MLX5E_STATE_OPENED, &priv->state);

	if (!reset)

		return mlx5e_switch_priv_params(priv, params, preactivate, context);



	old_chs = kzalloc(sizeof(*old_chs), GFP_KERNEL);

	new_chs = kzalloc(sizeof(*new_chs), GFP_KERNEL);

	if (!new_chs)

		return -ENOMEM;

	if (!old_chs || !new_chs) {

		err = -ENOMEM;

		goto err_free_chs;

	}



	new_chs->params = *params;



	mlx5e_selq_prepare_params(&priv->selq, &new_chs->params);
@@ -3421,11 +3424,15 @@ int mlx5e_safe_switch_params(struct mlx5e_priv *priv, 
	if (err)

		goto err_cancel_selq;



	err = mlx5e_switch_priv_channels(priv, new_chs, preactivate, context);

	*old_chs = priv->channels;



	err = mlx5e_switch_priv_channels(priv, old_chs, new_chs,

					 preactivate, context);

	if (err)

		goto err_close;



	kfree(new_chs);

	kfree(old_chs);

	return 0;



err_close:
@@ -3433,7 +3440,9 @@ int mlx5e_safe_switch_params(struct mlx5e_priv *priv, 


err_cancel_selq:

	mlx5e_selq_cancel(&priv->selq);

err_free_chs:

	kfree(new_chs);

	kfree(old_chs);

	return err;

}