105 lines
4.3 KiB
Diff
105 lines
4.3 KiB
Diff
From 59a3d8fddda6c882efa6b79e0292733f9cf1f627 Mon Sep 17 00:00:00 2001
|
|
From: Kamal Heib <kheib@redhat.com>
|
|
Date: Sun, 19 Apr 2026 18:24:31 -0400
|
|
Subject: [PATCH] net/mlx5e: Remove unused mdev param from RSS indir init
|
|
|
|
JIRA: https://redhat.atlassian.net/browse/RHEL-169055
|
|
|
|
commit a3f69641cbbc36015eb50ad6170caeb26f9022de
|
|
Author: Carolina Jubran <cjubran@nvidia.com>
|
|
Date: Mon Sep 29 00:25:20 2025 +0300
|
|
|
|
net/mlx5e: Remove unused mdev param from RSS indir init
|
|
|
|
The mdev parameter is not used in mlx5e_rss_params_indir_init, so drop
|
|
it from the function and update all callers accordingly.
|
|
|
|
No functional changes.
|
|
|
|
Signed-off-by: Carolina Jubran <cjubran@nvidia.com>
|
|
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
|
|
Link: https://patch.msgid.link/1759094723-843774-5-git-send-email-tariqt@nvidia.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
|
|
Signed-off-by: Kamal Heib <kheib@redhat.com>
|
|
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c b/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c
|
|
index c68ba0e58fa6..6422eeabc334 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c
|
|
@@ -91,7 +91,7 @@ void mlx5e_rss_params_indir_modify_actual_size(struct mlx5e_rss *rss, u32 num_ch
|
|
rss->indir.actual_table_size = mlx5e_rqt_size(rss->mdev, num_channels);
|
|
}
|
|
|
|
-int mlx5e_rss_params_indir_init(struct mlx5e_rss_params_indir *indir, struct mlx5_core_dev *mdev,
|
|
+int mlx5e_rss_params_indir_init(struct mlx5e_rss_params_indir *indir,
|
|
u32 actual_table_size, u32 max_table_size)
|
|
{
|
|
indir->table = kvmalloc_array(max_table_size, sizeof(*indir->table), GFP_KERNEL);
|
|
@@ -139,7 +139,8 @@ static struct mlx5e_rss *mlx5e_rss_init_copy(const struct mlx5e_rss *from)
|
|
if (!rss)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
- err = mlx5e_rss_params_indir_init(&rss->indir, from->mdev, from->indir.actual_table_size,
|
|
+ err = mlx5e_rss_params_indir_init(&rss->indir,
|
|
+ from->indir.actual_table_size,
|
|
from->indir.max_table_size);
|
|
if (err)
|
|
goto err_free_rss;
|
|
@@ -363,6 +364,7 @@ struct mlx5e_rss *mlx5e_rss_init(struct mlx5_core_dev *mdev, bool inner_ft_suppo
|
|
enum mlx5e_rss_init_type type, unsigned int nch,
|
|
unsigned int max_nch)
|
|
{
|
|
+ u32 rqt_max_size, rqt_size;
|
|
struct mlx5e_rss *rss;
|
|
int err;
|
|
|
|
@@ -370,9 +372,9 @@ struct mlx5e_rss *mlx5e_rss_init(struct mlx5_core_dev *mdev, bool inner_ft_suppo
|
|
if (!rss)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
- err = mlx5e_rss_params_indir_init(&rss->indir, mdev,
|
|
- mlx5e_rqt_size(mdev, nch),
|
|
- mlx5e_rqt_size(mdev, max_nch));
|
|
+ rqt_size = mlx5e_rqt_size(mdev, nch);
|
|
+ rqt_max_size = mlx5e_rqt_size(mdev, max_nch);
|
|
+ err = mlx5e_rss_params_indir_init(&rss->indir, rqt_size, rqt_max_size);
|
|
if (err)
|
|
goto err_free_rss;
|
|
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rss.h b/drivers/net/ethernet/mellanox/mlx5/core/en/rss.h
|
|
index c6c1b2847cf5..616097c8770e 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rss.h
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rss.h
|
|
@@ -18,7 +18,7 @@ mlx5e_rss_get_default_tt_config(enum mlx5_traffic_types tt);
|
|
|
|
struct mlx5e_rss;
|
|
|
|
-int mlx5e_rss_params_indir_init(struct mlx5e_rss_params_indir *indir, struct mlx5_core_dev *mdev,
|
|
+int mlx5e_rss_params_indir_init(struct mlx5e_rss_params_indir *indir,
|
|
u32 actual_table_size, u32 max_table_size);
|
|
void mlx5e_rss_params_indir_cleanup(struct mlx5e_rss_params_indir *indir);
|
|
void mlx5e_rss_params_indir_modify_actual_size(struct mlx5e_rss *rss, u32 num_channels);
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
|
|
index e1599817c3b2..7a34a502f97f 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
|
|
@@ -758,11 +758,11 @@ static int mlx5e_hairpin_create_indirect_rqt(struct mlx5e_hairpin *hp)
|
|
struct mlx5e_priv *priv = hp->func_priv;
|
|
struct mlx5_core_dev *mdev = priv->mdev;
|
|
struct mlx5e_rss_params_indir indir;
|
|
+ u32 rqt_size;
|
|
int err;
|
|
|
|
- err = mlx5e_rss_params_indir_init(&indir, mdev,
|
|
- mlx5e_rqt_size(mdev, hp->num_channels),
|
|
- mlx5e_rqt_size(mdev, hp->num_channels));
|
|
+ rqt_size = mlx5e_rqt_size(mdev, hp->num_channels);
|
|
+ err = mlx5e_rss_params_indir_init(&indir, rqt_size, rqt_size);
|
|
if (err)
|
|
return err;
|
|
|
|
--
|
|
2.50.1 (Apple Git-155)
|
|
|