diff options
| author |   Lama Kayal <lkayal@nvidia.com> | 2022-02-07 16:04:48 +0200 |
|---|---|---|
| committer |   Saeed Mahameed <saeedm@nvidia.com> | 2022-08-22 22:44:22 -0700 |
| commit | c7eafc5ed0688812f7b59094107d664893911c0f (patch) | |
| tree | 50308c368a2806fc6729df6f8b2548a1e1ae667f /drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | |
| parent | net/mlx5e: Drop priv argument of ptp function in en_fs (diff) | |
| download | linux-dev-c7eafc5ed0688812f7b59094107d664893911c0f.tar.xz linux-dev-c7eafc5ed0688812f7b59094107d664893911c0f.zip | |
net/mlx5e: Convert ethtool_steering member of flow_steering struct to pointer
Convert mlx5e_ethtool_steering member of mlx5e_flow_steering to a
pointer, and allocate dynamically for each profile at flow_steering
init.
Signed-off-by: Lama Kayal <lkayal@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/en_fs.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 41 |
1 files changed, 33 insertions, 8 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c index a84559b2bd92..eef674cf0f1d 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c @@ -50,7 +50,7 @@ struct mlx5e_flow_steering { struct mlx5_flow_namespace *ns; struct mlx5_flow_namespace *egress_ns; #ifdef CONFIG_MLX5_EN_RXNFC - struct mlx5e_ethtool_steering ethtool; + struct mlx5e_ethtool_steering *ethtool; #endif struct mlx5e_tc_table *tc; struct mlx5e_promisc_table promisc; @@ -1407,6 +1407,31 @@ struct mlx5e_tc_table *mlx5e_fs_get_tc(struct mlx5e_flow_steering *fs) return fs->tc; } +#ifdef CONFIG_MLX5_EN_RXNFC +static int mlx5e_fs_ethtool_alloc(struct mlx5e_flow_steering *fs) +{ + fs->ethtool = kvzalloc(sizeof(*fs->ethtool), GFP_KERNEL); + + if (!fs->ethtool) + return -ENOMEM; + return 0; +} + +static void mlx5e_fs_ethtool_free(struct mlx5e_flow_steering *fs) +{ + kvfree(fs->ethtool); +} + +struct mlx5e_ethtool_steering *mlx5e_fs_get_ethtool(struct mlx5e_flow_steering *fs) +{ + return fs->ethtool; +} +#else +static int mlx5e_fs_ethtool_alloc(struct mlx5e_flow_steering *fs) +{ return 0; } +static void mlx5e_fs_ethtool_free(struct mlx5e_flow_steering *fs) { } +#endif + struct mlx5e_flow_steering *mlx5e_fs_init(const struct mlx5e_profile *profile, struct mlx5_core_dev *mdev, bool state_destroy) @@ -1432,7 +1457,13 @@ struct mlx5e_flow_steering *mlx5e_fs_init(const struct mlx5e_profile *profile, goto err_free_vlan; } + err = mlx5e_fs_ethtool_alloc(fs); + if (err) + goto err_free_tc; + return fs; +err_free_tc: + mlx5e_fs_tc_free(fs); err_free_fs: kvfree(fs); err_free_vlan: @@ -1443,6 +1474,7 @@ err: void mlx5e_fs_cleanup(struct mlx5e_flow_steering *fs) { + mlx5e_fs_ethtool_free(fs); mlx5e_fs_tc_free(fs); mlx5e_fs_vlan_free(fs); kvfree(fs); @@ -1466,13 +1498,6 @@ void mlx5e_fs_set_ns(struct mlx5e_flow_steering *fs, struct mlx5_flow_namespace fs->egress_ns = ns; } -#ifdef CONFIG_MLX5_EN_RXNFC -struct mlx5e_ethtool_steering *mlx5e_fs_get_ethtool(struct mlx5e_flow_steering *fs) -{ - return &fs->ethtool; -} -#endif - struct mlx5_ttc_table *mlx5e_fs_get_ttc(struct mlx5e_flow_steering *fs, bool inner) { return inner ? fs->inner_ttc : fs->ttc; |