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

Commit 6b87663f authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

net/mlx5e: avoid stack overflow in mlx5e_open_channels 



struct mlx5e_channel_param is a large structure that is allocated
on the stack of mlx5e_open_channels, and with a recent change
it has grown beyond the warning size for the maximum stack
that a single function should use:

mellanox/mlx5/core/en_main.c: In function 'mlx5e_open_channels':
mellanox/mlx5/core/en_main.c:1325:1: error: the frame size of 1072 bytes is larger than 1024 bytes [-Werror=frame-larger-than=]

The function is already using dynamic allocation and is not in
a fast path, so the easiest workaround is to use another kzalloc
for allocating the channel parameters.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: d3c9bc27 ("net/mlx5e: Added ICO SQs")
Acked-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3df97ba8

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

+10 −8
Original line number Diff line number Diff line
@@ -1245,13 +1245,10 @@ static void mlx5e_build_icosq_param(struct mlx5e_priv *priv, 
	param->icosq = true;

}



static void mlx5e_build_channel_param(struct mlx5e_priv *priv,

				      struct mlx5e_channel_param *cparam)

static void mlx5e_build_channel_param(struct mlx5e_priv *priv, struct mlx5e_channel_param *cparam)

{

	u8 icosq_log_wq_sz = MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE;



	memset(cparam, 0, sizeof(*cparam));



	mlx5e_build_rq_param(priv, &cparam->rq);

	mlx5e_build_sq_param(priv, &cparam->sq);

	mlx5e_build_icosq_param(priv, &cparam->icosq, icosq_log_wq_sz);
@@ -1262,7 +1259,7 @@ static void mlx5e_build_channel_param(struct mlx5e_priv *priv, 


static int mlx5e_open_channels(struct mlx5e_priv *priv)

{

	struct mlx5e_channel_param cparam;

	struct mlx5e_channel_param *cparam;

	int nch = priv->params.num_channels;

	int err = -ENOMEM;

	int i;
@@ -1274,12 +1271,15 @@ static int mlx5e_open_channels(struct mlx5e_priv *priv) 
	priv->txq_to_sq_map = kcalloc(nch * priv->params.num_tc,

				      sizeof(struct mlx5e_sq *), GFP_KERNEL);



	if (!priv->channel || !priv->txq_to_sq_map)

	cparam = kzalloc(sizeof(struct mlx5e_channel_param), GFP_KERNEL);



	if (!priv->channel || !priv->txq_to_sq_map || !cparam)

		goto err_free_txq_to_sq_map;



	mlx5e_build_channel_param(priv, &cparam);

	mlx5e_build_channel_param(priv, cparam);



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

		err = mlx5e_open_channel(priv, i, &cparam, &priv->channel[i]);

		err = mlx5e_open_channel(priv, i, cparam, &priv->channel[i]);

		if (err)

			goto err_close_channels;

	}
@@ -1290,6 +1290,7 @@ static int mlx5e_open_channels(struct mlx5e_priv *priv) 
			goto err_close_channels;

	}



	kfree(cparam);

	return 0;



err_close_channels:
@@ -1299,6 +1300,7 @@ static int mlx5e_open_channels(struct mlx5e_priv *priv) 
err_free_txq_to_sq_map:

	kfree(priv->txq_to_sq_map);

	kfree(priv->channel);

	kfree(cparam);



	return err;

}