Commit 3ac90dec authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Saeed Mahameed

net/mlx5e: Allocate the array of channels according to the real max_nch

The channels array in struct mlx5e_rx_res is converted to a dynamic one,
which will use the dynamic value of max_nch instead of
implementation-defined maximum of MLX5E_MAX_NUM_CHANNELS.
Signed-off-by: default avatarMaxim Mikityanskiy <maximmi@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 43ec0f41
...@@ -140,6 +140,7 @@ struct page_pool; ...@@ -140,6 +140,7 @@ struct page_pool;
#define MLX5E_PARAMS_DEFAULT_MIN_RX_WQES_MPW 0x2 #define MLX5E_PARAMS_DEFAULT_MIN_RX_WQES_MPW 0x2
#define MLX5E_MIN_NUM_CHANNELS 0x1 #define MLX5E_MIN_NUM_CHANNELS 0x1
#define MLX5E_MAX_NUM_CHANNELS (MLX5E_INDIR_RQT_SIZE / 2)
#define MLX5E_MAX_NUM_SQS (MLX5E_MAX_NUM_CHANNELS * MLX5E_MAX_NUM_TC) #define MLX5E_MAX_NUM_SQS (MLX5E_MAX_NUM_CHANNELS * MLX5E_MAX_NUM_TC)
#define MLX5E_TX_CQ_POLL_BUDGET 128 #define MLX5E_TX_CQ_POLL_BUDGET 128
#define MLX5E_TX_XSK_POLL_BUDGET 64 #define MLX5E_TX_XSK_POLL_BUDGET 64
......
...@@ -91,7 +91,7 @@ struct mlx5e_rx_res { ...@@ -91,7 +91,7 @@ struct mlx5e_rx_res {
struct mlx5e_tir direct_tir; struct mlx5e_tir direct_tir;
struct mlx5e_rqt xsk_rqt; struct mlx5e_rqt xsk_rqt;
struct mlx5e_tir xsk_tir; struct mlx5e_tir xsk_tir;
} channels[MLX5E_MAX_NUM_CHANNELS]; } *channels;
struct { struct {
struct mlx5e_rqt rqt; struct mlx5e_rqt rqt;
...@@ -210,6 +210,12 @@ static int mlx5e_rx_res_channels_init(struct mlx5e_rx_res *res, ...@@ -210,6 +210,12 @@ static int mlx5e_rx_res_channels_init(struct mlx5e_rx_res *res,
if (!builder) if (!builder)
return -ENOMEM; return -ENOMEM;
res->channels = kvcalloc(res->max_nch, sizeof(*res->channels), GFP_KERNEL);
if (!res->channels) {
err = -ENOMEM;
goto out;
}
for (ix = 0; ix < res->max_nch; ix++) { for (ix = 0; ix < res->max_nch; ix++) {
err = mlx5e_rqt_init_direct(&res->channels[ix].direct_rqt, err = mlx5e_rqt_init_direct(&res->channels[ix].direct_rqt,
res->mdev, false, res->drop_rqn); res->mdev, false, res->drop_rqn);
...@@ -288,6 +294,8 @@ static int mlx5e_rx_res_channels_init(struct mlx5e_rx_res *res, ...@@ -288,6 +294,8 @@ static int mlx5e_rx_res_channels_init(struct mlx5e_rx_res *res,
while (--ix >= 0) while (--ix >= 0)
mlx5e_rqt_destroy(&res->channels[ix].direct_rqt); mlx5e_rqt_destroy(&res->channels[ix].direct_rqt);
kvfree(res->channels);
out: out:
mlx5e_tir_builder_free(builder); mlx5e_tir_builder_free(builder);
...@@ -355,6 +363,8 @@ static void mlx5e_rx_res_channels_destroy(struct mlx5e_rx_res *res) ...@@ -355,6 +363,8 @@ static void mlx5e_rx_res_channels_destroy(struct mlx5e_rx_res *res)
mlx5e_tir_destroy(&res->channels[ix].xsk_tir); mlx5e_tir_destroy(&res->channels[ix].xsk_tir);
mlx5e_rqt_destroy(&res->channels[ix].xsk_rqt); mlx5e_rqt_destroy(&res->channels[ix].xsk_rqt);
} }
kvfree(res->channels);
} }
static void mlx5e_rx_res_ptp_destroy(struct mlx5e_rx_res *res) static void mlx5e_rx_res_ptp_destroy(struct mlx5e_rx_res *res)
......
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
#include "tir.h" #include "tir.h"
#include "fs.h" #include "fs.h"
#define MLX5E_MAX_NUM_CHANNELS (MLX5E_INDIR_RQT_SIZE / 2)
struct mlx5e_rx_res; struct mlx5e_rx_res;
struct mlx5e_channels; struct mlx5e_channels;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment