mirror of https://gitee.com/openkylin/linux.git
net/mlx5: Refactor mlx5_create_auto_grouped_flow_table
Refactor mlx5_create_auto_grouped_flow_table() to use ft_attr param which already carries the max_fte, prio and flags memebers, and is used the same in similar mlx5_create_flow_table() function. Signed-off-by: Paul Blakey <paulb@mellanox.com> Reviewed-by: Roi Dayan <roid@mellanox.com> Reviewed-by: Oz Shlomo <ozsh@mellanox.com> Reviewed-by: Mark Bloch <markb@mellanox.com> Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
This commit is contained in:
parent
827a8cb2dd
commit
61dc7b0141
|
@ -3239,12 +3239,14 @@ static struct mlx5_ib_flow_prio *_get_prio(struct mlx5_flow_namespace *ns,
|
|||
int num_entries, int num_groups,
|
||||
u32 flags)
|
||||
{
|
||||
struct mlx5_flow_table_attr ft_attr = {};
|
||||
struct mlx5_flow_table *ft;
|
||||
|
||||
ft = mlx5_create_auto_grouped_flow_table(ns, priority,
|
||||
num_entries,
|
||||
num_groups,
|
||||
0, flags);
|
||||
ft_attr.prio = priority;
|
||||
ft_attr.max_fte = num_entries;
|
||||
ft_attr.flags = flags;
|
||||
ft_attr.autogroup.max_num_groups = num_groups;
|
||||
ft = mlx5_create_auto_grouped_flow_table(ns, &ft_attr);
|
||||
if (IS_ERR(ft))
|
||||
return ERR_CAST(ft);
|
||||
|
||||
|
|
|
@ -58,6 +58,7 @@ static struct mlx5e_ethtool_table *get_flow_table(struct mlx5e_priv *priv,
|
|||
struct ethtool_rx_flow_spec *fs,
|
||||
int num_tuples)
|
||||
{
|
||||
struct mlx5_flow_table_attr ft_attr = {};
|
||||
struct mlx5e_ethtool_table *eth_ft;
|
||||
struct mlx5_flow_namespace *ns;
|
||||
struct mlx5_flow_table *ft;
|
||||
|
@ -102,9 +103,11 @@ static struct mlx5e_ethtool_table *get_flow_table(struct mlx5e_priv *priv,
|
|||
table_size = min_t(u32, BIT(MLX5_CAP_FLOWTABLE(priv->mdev,
|
||||
flow_table_properties_nic_receive.log_max_ft_size)),
|
||||
MLX5E_ETHTOOL_NUM_ENTRIES);
|
||||
ft = mlx5_create_auto_grouped_flow_table(ns, prio,
|
||||
table_size,
|
||||
MLX5E_ETHTOOL_NUM_GROUPS, 0, 0);
|
||||
|
||||
ft_attr.prio = prio;
|
||||
ft_attr.max_fte = table_size;
|
||||
ft_attr.autogroup.max_num_groups = MLX5E_ETHTOOL_NUM_GROUPS;
|
||||
ft = mlx5_create_auto_grouped_flow_table(ns, &ft_attr);
|
||||
if (IS_ERR(ft))
|
||||
return (void *)ft;
|
||||
|
||||
|
|
|
@ -960,7 +960,8 @@ mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv,
|
|||
|
||||
mutex_lock(&priv->fs.tc.t_lock);
|
||||
if (IS_ERR_OR_NULL(priv->fs.tc.t)) {
|
||||
int tc_grp_size, tc_tbl_size;
|
||||
struct mlx5_flow_table_attr ft_attr = {};
|
||||
int tc_grp_size, tc_tbl_size, tc_num_grps;
|
||||
u32 max_flow_counter;
|
||||
|
||||
max_flow_counter = (MLX5_CAP_GEN(dev, max_flow_counter_31_16) << 16) |
|
||||
|
@ -970,13 +971,15 @@ mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv,
|
|||
|
||||
tc_tbl_size = min_t(int, tc_grp_size * MLX5E_TC_TABLE_NUM_GROUPS,
|
||||
BIT(MLX5_CAP_FLOWTABLE_NIC_RX(dev, log_max_ft_size)));
|
||||
tc_num_grps = MLX5E_TC_TABLE_NUM_GROUPS;
|
||||
|
||||
ft_attr.prio = MLX5E_TC_PRIO;
|
||||
ft_attr.max_fte = tc_tbl_size;
|
||||
ft_attr.level = MLX5E_TC_FT_LEVEL;
|
||||
ft_attr.autogroup.max_num_groups = tc_num_grps;
|
||||
priv->fs.tc.t =
|
||||
mlx5_create_auto_grouped_flow_table(priv->fs.ns,
|
||||
MLX5E_TC_PRIO,
|
||||
tc_tbl_size,
|
||||
MLX5E_TC_TABLE_NUM_GROUPS,
|
||||
MLX5E_TC_FT_LEVEL, 0);
|
||||
&ft_attr);
|
||||
if (IS_ERR(priv->fs.tc.t)) {
|
||||
mutex_unlock(&priv->fs.tc.t_lock);
|
||||
NL_SET_ERR_MSG_MOD(extack,
|
||||
|
|
|
@ -277,6 +277,7 @@ enum {
|
|||
|
||||
static int esw_create_legacy_vepa_table(struct mlx5_eswitch *esw)
|
||||
{
|
||||
struct mlx5_flow_table_attr ft_attr = {};
|
||||
struct mlx5_core_dev *dev = esw->dev;
|
||||
struct mlx5_flow_namespace *root_ns;
|
||||
struct mlx5_flow_table *fdb;
|
||||
|
@ -289,8 +290,10 @@ static int esw_create_legacy_vepa_table(struct mlx5_eswitch *esw)
|
|||
}
|
||||
|
||||
/* num FTE 2, num FG 2 */
|
||||
fdb = mlx5_create_auto_grouped_flow_table(root_ns, LEGACY_VEPA_PRIO,
|
||||
2, 2, 0, 0);
|
||||
ft_attr.prio = LEGACY_VEPA_PRIO;
|
||||
ft_attr.max_fte = 2;
|
||||
ft_attr.autogroup.max_num_groups = 2;
|
||||
fdb = mlx5_create_auto_grouped_flow_table(root_ns, &ft_attr);
|
||||
if (IS_ERR(fdb)) {
|
||||
err = PTR_ERR(fdb);
|
||||
esw_warn(dev, "Failed to create VEPA FDB err %d\n", err);
|
||||
|
|
|
@ -904,6 +904,7 @@ create_next_size_table(struct mlx5_eswitch *esw,
|
|||
int level,
|
||||
u32 flags)
|
||||
{
|
||||
struct mlx5_flow_table_attr ft_attr = {};
|
||||
struct mlx5_flow_table *fdb;
|
||||
int sz;
|
||||
|
||||
|
@ -911,12 +912,12 @@ create_next_size_table(struct mlx5_eswitch *esw,
|
|||
if (!sz)
|
||||
return ERR_PTR(-ENOSPC);
|
||||
|
||||
fdb = mlx5_create_auto_grouped_flow_table(ns,
|
||||
table_prio,
|
||||
sz,
|
||||
ESW_OFFLOADS_NUM_GROUPS,
|
||||
level,
|
||||
flags);
|
||||
ft_attr.max_fte = sz;
|
||||
ft_attr.prio = table_prio;
|
||||
ft_attr.level = level;
|
||||
ft_attr.flags = flags;
|
||||
ft_attr.autogroup.max_num_groups = ESW_OFFLOADS_NUM_GROUPS;
|
||||
fdb = mlx5_create_auto_grouped_flow_table(ns, &ft_attr);
|
||||
if (IS_ERR(fdb)) {
|
||||
esw_warn(esw->dev, "Failed to create FDB Table err %d (table prio: %d, level: %d, size: %d)\n",
|
||||
(int)PTR_ERR(fdb), table_prio, level, sz);
|
||||
|
|
|
@ -50,8 +50,8 @@ mlx5_eswitch_termtbl_create(struct mlx5_core_dev *dev,
|
|||
struct mlx5_flow_act *flow_act)
|
||||
{
|
||||
static const struct mlx5_flow_spec spec = {};
|
||||
struct mlx5_flow_table_attr ft_attr = {};
|
||||
struct mlx5_flow_namespace *root_ns;
|
||||
int prio, flags;
|
||||
int err;
|
||||
|
||||
root_ns = mlx5_get_flow_namespace(dev, MLX5_FLOW_NAMESPACE_FDB);
|
||||
|
@ -63,10 +63,11 @@ mlx5_eswitch_termtbl_create(struct mlx5_core_dev *dev,
|
|||
/* As this is the terminating action then the termination table is the
|
||||
* same prio as the slow path
|
||||
*/
|
||||
prio = FDB_SLOW_PATH;
|
||||
flags = MLX5_FLOW_TABLE_TERMINATION;
|
||||
tt->termtbl = mlx5_create_auto_grouped_flow_table(root_ns, prio, 1, 1,
|
||||
0, flags);
|
||||
ft_attr.flags = MLX5_FLOW_TABLE_TERMINATION;
|
||||
ft_attr.prio = FDB_SLOW_PATH;
|
||||
ft_attr.max_fte = 1;
|
||||
ft_attr.autogroup.max_num_groups = 1;
|
||||
tt->termtbl = mlx5_create_auto_grouped_flow_table(root_ns, &ft_attr);
|
||||
if (IS_ERR(tt->termtbl)) {
|
||||
esw_warn(dev, "Failed to create termination table\n");
|
||||
return -EOPNOTSUPP;
|
||||
|
|
|
@ -1111,31 +1111,22 @@ EXPORT_SYMBOL(mlx5_create_lag_demux_flow_table);
|
|||
|
||||
struct mlx5_flow_table*
|
||||
mlx5_create_auto_grouped_flow_table(struct mlx5_flow_namespace *ns,
|
||||
int prio,
|
||||
int num_flow_table_entries,
|
||||
int max_num_groups,
|
||||
u32 level,
|
||||
u32 flags)
|
||||
struct mlx5_flow_table_attr *ft_attr)
|
||||
{
|
||||
struct mlx5_flow_table_attr ft_attr = {};
|
||||
struct mlx5_flow_table *ft;
|
||||
|
||||
if (max_num_groups > num_flow_table_entries)
|
||||
if (ft_attr->autogroup.max_num_groups > ft_attr->max_fte)
|
||||
return ERR_PTR(-EINVAL);
|
||||
|
||||
ft_attr.max_fte = num_flow_table_entries;
|
||||
ft_attr.prio = prio;
|
||||
ft_attr.level = level;
|
||||
ft_attr.flags = flags;
|
||||
|
||||
ft = mlx5_create_flow_table(ns, &ft_attr);
|
||||
ft = mlx5_create_flow_table(ns, ft_attr);
|
||||
if (IS_ERR(ft))
|
||||
return ft;
|
||||
|
||||
ft->autogroup.active = true;
|
||||
ft->autogroup.required_groups = max_num_groups;
|
||||
ft->autogroup.required_groups = ft_attr->autogroup.max_num_groups;
|
||||
/* We save place for flow groups in addition to max types */
|
||||
ft->autogroup.group_size = ft->max_fte / (max_num_groups + 1);
|
||||
ft->autogroup.group_size = ft->max_fte /
|
||||
(ft->autogroup.required_groups + 1);
|
||||
|
||||
return ft;
|
||||
}
|
||||
|
|
|
@ -145,25 +145,25 @@ mlx5_get_flow_vport_acl_namespace(struct mlx5_core_dev *dev,
|
|||
enum mlx5_flow_namespace_type type,
|
||||
int vport);
|
||||
|
||||
struct mlx5_flow_table *
|
||||
mlx5_create_auto_grouped_flow_table(struct mlx5_flow_namespace *ns,
|
||||
int prio,
|
||||
int num_flow_table_entries,
|
||||
int max_num_groups,
|
||||
u32 level,
|
||||
u32 flags);
|
||||
|
||||
struct mlx5_flow_table_attr {
|
||||
int prio;
|
||||
int max_fte;
|
||||
u32 level;
|
||||
u32 flags;
|
||||
|
||||
struct {
|
||||
int max_num_groups;
|
||||
} autogroup;
|
||||
};
|
||||
|
||||
struct mlx5_flow_table *
|
||||
mlx5_create_flow_table(struct mlx5_flow_namespace *ns,
|
||||
struct mlx5_flow_table_attr *ft_attr);
|
||||
|
||||
struct mlx5_flow_table *
|
||||
mlx5_create_auto_grouped_flow_table(struct mlx5_flow_namespace *ns,
|
||||
struct mlx5_flow_table_attr *ft_attr);
|
||||
|
||||
struct mlx5_flow_table *
|
||||
mlx5_create_vport_flow_table(struct mlx5_flow_namespace *ns,
|
||||
int prio,
|
||||
|
|
Loading…
Reference in New Issue