Commit 454533aa authored by Lama Kayal's avatar Lama Kayal Committed by Saeed Mahameed
Browse files

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: default avatarLama Kayal <lkayal@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 23bde065

drivers/net/ethernet/mellanox/mlx5/core/en.h

+2 −0
Original line number Diff line number Diff line
@@ -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 {

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

+41 −11
Original line number Diff line number Diff line
@@ -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)

	int err;



	if (mlx5e_profile_feature_cap(priv->profile, FS_VLAN)) {

		err = mlx5e_fs_vlan_alloc(&priv->fs);

		if (err)

			goto err;

	}



	priv->fs.tc = mlx5e_tc_table_alloc();

	if (IS_ERR(priv->fs.tc))

	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);

}

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

+3 −1
Original line number Diff line number Diff line
@@ -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,