mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

net/mlx5e: Allocate VLAN and TC for featured profiles only 

Introduce allocation and de-allocation functions for both flow steering
VLAN and TC as part of fs API.
Add allocations of VLAN and TC as nic profile feature, such that
fs_init() will allocate both VLAN and TC only if they're featured in
the profile. VLAN and TC are relevant for nic_profile only.

Signed-off-by: Lama Kayal <lkayal@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
This commit is contained in:
Lama Kayal 2022-04-28 16:41:20 +03:00 committed by Saeed Mahameed
parent 23bde065c3
commit 454533aa87
3 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/mellanox/mlx5/core/en.h
View File

@ -987,6 +987,8 @@ enum mlx5e_profile_feature {
MLX5E_PROFILE_FEATURE_PTP_RX,
MLX5E_PROFILE_FEATURE_PTP_TX,
MLX5E_PROFILE_FEATURE_QOS_HTB,
MLX5E_PROFILE_FEATURE_FS_VLAN,
MLX5E_PROFILE_FEATURE_FS_TC,
};
struct mlx5e_profile {

52
drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
View File

@ -1343,27 +1343,57 @@ void mlx5e_destroy_flow_steering(struct mlx5e_priv *priv)
mlx5e_ethtool_cleanup_steering(priv);
}
static int mlx5e_fs_vlan_alloc(struct mlx5e_flow_steering *fs)
{
fs->vlan = kvzalloc(sizeof(*fs->vlan), GFP_KERNEL);
if (!fs->vlan)
return -ENOMEM;
return 0;
}
static void mlx5e_fs_vlan_free(struct mlx5e_flow_steering *fs)
{
kvfree(fs->vlan);
}
static int mlx5e_fs_tc_alloc(struct mlx5e_flow_steering *fs)
{
fs->tc = mlx5e_tc_table_alloc();
if (IS_ERR(fs->tc))
return -ENOMEM;
return 0;
}
static void mlx5e_fs_tc_free(struct mlx5e_flow_steering *fs)
{
mlx5e_tc_table_free(fs->tc);
}
int mlx5e_fs_init(struct mlx5e_priv *priv)
{
priv->fs.vlan = kvzalloc(sizeof(*priv->fs.vlan), GFP_KERNEL);
if (!priv->fs.vlan)
goto err;
int err;
priv->fs.tc = mlx5e_tc_table_alloc();
if (IS_ERR(priv->fs.tc))
goto err_free_vlan;
if (mlx5e_profile_feature_cap(priv->profile, FS_VLAN)) {
err = mlx5e_fs_vlan_alloc(&priv->fs);
if (err)
goto err;
}
if (mlx5e_profile_feature_cap(priv->profile, FS_TC)) {
err = mlx5e_fs_tc_alloc(&priv->fs);
if (err)
goto err_free_vlan;
}
return 0;
err_free_vlan:
kvfree(priv->fs.vlan);
priv->fs.vlan = NULL;
mlx5e_fs_vlan_free(&priv->fs);
err:
return -ENOMEM;
}
void mlx5e_fs_cleanup(struct mlx5e_priv *priv)
{
mlx5e_tc_table_free(priv->fs.tc);
kvfree(priv->fs.vlan);
priv->fs.vlan = NULL;
mlx5e_fs_tc_free(&priv->fs);
mlx5e_fs_vlan_free(&priv->fs);
}

4
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
View File

@ -5242,7 +5242,9 @@ static const struct mlx5e_profile mlx5e_nic_profile = {
.stats_grps_num = mlx5e_nic_stats_grps_num,
.features = BIT(MLX5E_PROFILE_FEATURE_PTP_RX) |
BIT(MLX5E_PROFILE_FEATURE_PTP_TX) |
BIT(MLX5E_PROFILE_FEATURE_QOS_HTB),
BIT(MLX5E_PROFILE_FEATURE_QOS_HTB) |
BIT(MLX5E_PROFILE_FEATURE_FS_VLAN) |
BIT(MLX5E_PROFILE_FEATURE_FS_TC),
};
static int mlx5e_profile_max_num_channels(struct mlx5_core_dev *mdev,