Skip to content

Commit

Permalink
net/mlx5e: Add mdev to flow_steering struct
Browse files Browse the repository at this point in the history 
Make flow_steering struct contain mlx5_core_dev such that
it becomes self contained and easier to decouple later on this series.
Let its values be initialized in mlx5e_fs_init().

Signed-off-by: Lama Kayal <lkayal@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
  • Loading branch information
Lama Kayal authored and Saeed Mahameed committed Jul 28, 2022
1 parent 6a7bc5d commit 7bb7071
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 38 deletions.
4 changes: 3 additions & 1 deletion drivers/net/ethernet/mellanox/mlx5/core/en/fs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ struct mlx5e_fs_any;
struct mlx5e_ptp_fs;

struct mlx5e_flow_steering {
struct mlx5_core_dev *mdev;
struct mlx5_flow_namespace *ns;
#ifdef CONFIG_MLX5_EN_RXNFC
struct mlx5e_ethtool_steering ethtool;
Expand Down Expand Up @@ -178,7 +179,8 @@ void mlx5e_disable_cvlan_filter(struct mlx5e_priv *priv);
int mlx5e_create_flow_steering(struct mlx5e_priv *priv);
void mlx5e_destroy_flow_steering(struct mlx5e_priv *priv);

struct mlx5e_flow_steering *mlx5e_fs_init(const struct mlx5e_profile *profile);
struct mlx5e_flow_steering *mlx5e_fs_init(const struct mlx5e_profile *profile,
struct mlx5_core_dev *mdev);
void mlx5e_fs_cleanup(struct mlx5e_flow_steering *fs);

int mlx5e_add_vlan_trap(struct mlx5e_priv *priv, int trap_id, int tir_num);
Expand Down
70 changes: 36 additions & 34 deletions drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,10 @@ static int mlx5e_vport_context_update_vlans(struct mlx5e_priv *priv)
for_each_set_bit(vlan, priv->fs->vlan->active_cvlans, VLAN_N_VID)
list_size++;

max_list_size = 1 << MLX5_CAP_GEN(priv->mdev, log_max_vlan_list);
max_list_size = 1 << MLX5_CAP_GEN(priv->fs->mdev, log_max_vlan_list);

if (list_size > max_list_size) {
mlx5_core_warn(priv->mdev,
mlx5_core_warn(priv->fs->mdev,
"netdev vlans list size (%d) > (%d) max vport list size, some vlans will be dropped\n",
list_size, max_list_size);
list_size = max_list_size;
Expand All @@ -166,9 +166,9 @@ static int mlx5e_vport_context_update_vlans(struct mlx5e_priv *priv)
vlans[i++] = vlan;
}

err = mlx5_modify_nic_vport_vlans(priv->mdev, vlans, list_size);
err = mlx5_modify_nic_vport_vlans(priv->fs->mdev, vlans, list_size);
if (err)
mlx5_core_err(priv->mdev, "Failed to modify vport vlans list err(%d)\n",
mlx5_core_err(priv->fs->mdev, "Failed to modify vport vlans list err(%d)\n",
err);

kvfree(vlans);
Expand Down Expand Up @@ -250,7 +250,7 @@ static int __mlx5e_add_vlan_rule(struct mlx5e_priv *priv,
if (IS_ERR(*rule_p)) {
err = PTR_ERR(*rule_p);
*rule_p = NULL;
mlx5_core_err(priv->mdev, "%s: add rule failed\n", __func__);
mlx5_core_err(priv->fs->mdev, "%s: add rule failed\n", __func__);
}

return err;
Expand Down Expand Up @@ -362,7 +362,7 @@ int mlx5e_add_vlan_trap(struct mlx5e_priv *priv, int trap_id, int tir_num)
if (IS_ERR(rule)) {
err = PTR_ERR(rule);
priv->fs->vlan->trap_rule = NULL;
mlx5_core_err(priv->mdev, "%s: add VLAN trap rule failed, err %d\n",
mlx5_core_err(priv->fs->mdev, "%s: add VLAN trap rule failed, err %d\n",
__func__, err);
return err;
}
Expand All @@ -388,7 +388,7 @@ int mlx5e_add_mac_trap(struct mlx5e_priv *priv, int trap_id, int tir_num)
if (IS_ERR(rule)) {
err = PTR_ERR(rule);
priv->fs->l2.trap_rule = NULL;
mlx5_core_err(priv->mdev, "%s: add MAC trap rule failed, err %d\n",
mlx5_core_err(priv->fs->mdev, "%s: add MAC trap rule failed, err %d\n",
__func__, err);
return err;
}
Expand Down Expand Up @@ -549,22 +549,22 @@ static void mlx5e_execute_l2_action(struct mlx5e_priv *priv,
case MLX5E_ACTION_ADD:
mlx5e_add_l2_flow_rule(priv, &hn->ai, MLX5E_FULLMATCH);
if (!is_multicast_ether_addr(mac_addr)) {
l2_err = mlx5_mpfs_add_mac(priv->mdev, mac_addr);
l2_err = mlx5_mpfs_add_mac(priv->fs->mdev, mac_addr);
hn->mpfs = !l2_err;
}
hn->action = MLX5E_ACTION_NONE;
break;

case MLX5E_ACTION_DEL:
if (!is_multicast_ether_addr(mac_addr) && hn->mpfs)
l2_err = mlx5_mpfs_del_mac(priv->mdev, mac_addr);
l2_err = mlx5_mpfs_del_mac(priv->fs->mdev, mac_addr);
mlx5e_del_l2_flow_rule(priv, &hn->ai);
mlx5e_del_l2_from_hash(hn);
break;
}

if (l2_err)
mlx5_core_warn(priv->mdev, "MPFS, failed to %s mac %pM, err(%d)\n",
mlx5_core_warn(priv->fs->mdev, "MPFS, failed to %s mac %pM, err(%d)\n",
action == MLX5E_ACTION_ADD ? "add" : "del", mac_addr, l2_err);
}

Expand Down Expand Up @@ -629,15 +629,15 @@ static void mlx5e_vport_context_update_addr_list(struct mlx5e_priv *priv,

size = is_uc ? 0 : (priv->fs->l2.broadcast_enabled ? 1 : 0);
max_size = is_uc ?
1 << MLX5_CAP_GEN(priv->mdev, log_max_current_uc_list) :
1 << MLX5_CAP_GEN(priv->mdev, log_max_current_mc_list);
1 << MLX5_CAP_GEN(priv->fs->mdev, log_max_current_uc_list) :
1 << MLX5_CAP_GEN(priv->fs->mdev, log_max_current_mc_list);

addr_list = is_uc ? priv->fs->l2.netdev_uc : priv->fs->l2.netdev_mc;
mlx5e_for_each_hash_node(hn, tmp, addr_list, hi)
size++;

if (size > max_size) {
mlx5_core_warn(priv->mdev,
mlx5_core_warn(priv->fs->mdev,
"mdev %s list size (%d) > (%d) max vport list size, some addresses will be dropped\n",
is_uc ? "UC" : "MC", size, max_size);
size = max_size;
Expand All @@ -652,10 +652,10 @@ static void mlx5e_vport_context_update_addr_list(struct mlx5e_priv *priv,
mlx5e_fill_addr_array(priv, list_type, addr_array, size);
}

err = mlx5_modify_nic_vport_mac_list(priv->mdev, list_type, addr_array, size);
err = mlx5_modify_nic_vport_mac_list(priv->fs->mdev, list_type, addr_array, size);
out:
if (err)
mlx5_core_err(priv->mdev,
mlx5_core_err(priv->fs->mdev,
"Failed to modify vport %s list err(%d)\n",
is_uc ? "UC" : "MC", err);
kfree(addr_array);
Expand All @@ -667,7 +667,7 @@ static void mlx5e_vport_context_update(struct mlx5e_priv *priv)

mlx5e_vport_context_update_addr_list(priv, MLX5_NVPRT_LIST_TYPE_UC);
mlx5e_vport_context_update_addr_list(priv, MLX5_NVPRT_LIST_TYPE_MC);
mlx5_modify_nic_vport_promisc(priv->mdev, 0,
mlx5_modify_nic_vport_promisc(priv->fs->mdev, 0,
ea->allmulti_enabled,
ea->promisc_enabled);
}
Expand Down Expand Up @@ -725,7 +725,7 @@ static int mlx5e_add_promisc_rule(struct mlx5e_priv *priv)
if (IS_ERR(*rule_p)) {
err = PTR_ERR(*rule_p);
*rule_p = NULL;
mlx5_core_err(priv->mdev, "%s: add promiscuous rule failed\n", __func__);
mlx5_core_err(priv->fs->mdev, "%s: add promiscuous rule failed\n", __func__);
}
kvfree(spec);
return err;
Expand All @@ -745,7 +745,7 @@ static int mlx5e_create_promisc_table(struct mlx5e_priv *priv)
ft->t = mlx5_create_auto_grouped_flow_table(priv->fs->ns, &ft_attr);
if (IS_ERR(ft->t)) {
err = PTR_ERR(ft->t);
mlx5_core_err(priv->mdev, "fail to create promisc table err=%d\n", err);
mlx5_core_err(priv->fs->mdev, "fail to create promisc table err=%d\n", err);
return err;
}

Expand Down Expand Up @@ -805,7 +805,7 @@ void mlx5e_set_rx_mode_work(struct work_struct *work)
if (err)
enable_promisc = false;
if (!priv->channels.params.vlan_strip_disable && !err)
mlx5_core_warn_once(priv->mdev,
mlx5_core_warn_once(priv->fs->mdev,
"S-tagged traffic will be dropped while C-tag vlan stripping is enabled\n");
}
if (enable_allmulti)
Expand Down Expand Up @@ -861,7 +861,7 @@ static void mlx5e_set_inner_ttc_params(struct mlx5e_priv *priv,
int tt;

memset(ttc_params, 0, sizeof(*ttc_params));
ttc_params->ns = mlx5_get_flow_namespace(priv->mdev,
ttc_params->ns = mlx5_get_flow_namespace(priv->fs->mdev,
MLX5_FLOW_NAMESPACE_KERNEL);
ft_attr->level = MLX5E_INNER_TTC_FT_LEVEL;
ft_attr->prio = MLX5E_NIC_PRIO;
Expand All @@ -884,7 +884,7 @@ void mlx5e_set_ttc_params(struct mlx5e_priv *priv,
int tt;

memset(ttc_params, 0, sizeof(*ttc_params));
ttc_params->ns = mlx5_get_flow_namespace(priv->mdev,
ttc_params->ns = mlx5_get_flow_namespace(priv->fs->mdev,
MLX5_FLOW_NAMESPACE_KERNEL);
ft_attr->level = MLX5E_TTC_FT_LEVEL;
ft_attr->prio = MLX5E_NIC_PRIO;
Expand All @@ -898,7 +898,7 @@ void mlx5e_set_ttc_params(struct mlx5e_priv *priv,
}

ttc_params->inner_ttc = tunnel;
if (!tunnel || !mlx5_tunnel_inner_ft_supported(priv->mdev))
if (!tunnel || !mlx5_tunnel_inner_ft_supported(priv->fs->mdev))
return;

for (tt = 0; tt < MLX5_NUM_TUNNEL_TT; tt++) {
Expand Down Expand Up @@ -957,7 +957,7 @@ static int mlx5e_add_l2_flow_rule(struct mlx5e_priv *priv,

ai->rule = mlx5_add_flow_rules(ft, spec, &flow_act, &dest, 1);
if (IS_ERR(ai->rule)) {
mlx5_core_err(priv->mdev, "%s: add l2 rule(mac:%pM) failed\n",
mlx5_core_err(priv->fs->mdev, "%s: add l2 rule(mac:%pM) failed\n",
__func__, mv_dmac);
err = PTR_ERR(ai->rule);
ai->rule = NULL;
Expand Down Expand Up @@ -1227,7 +1227,7 @@ static void mlx5e_destroy_vlan_table(struct mlx5e_priv *priv)

static void mlx5e_destroy_inner_ttc_table(struct mlx5e_priv *priv)
{
if (!mlx5_tunnel_inner_ft_supported(priv->mdev))
if (!mlx5_tunnel_inner_ft_supported(priv->fs->mdev))
return;
mlx5_destroy_ttc_table(priv->fs->inner_ttc);
}
Expand All @@ -1241,11 +1241,11 @@ static int mlx5e_create_inner_ttc_table(struct mlx5e_priv *priv)
{
struct ttc_params ttc_params = {};

if (!mlx5_tunnel_inner_ft_supported(priv->mdev))
if (!mlx5_tunnel_inner_ft_supported(priv->fs->mdev))
return 0;

mlx5e_set_inner_ttc_params(priv, &ttc_params);
priv->fs->inner_ttc = mlx5_create_inner_ttc_table(priv->mdev,
priv->fs->inner_ttc = mlx5_create_inner_ttc_table(priv->fs->mdev,
&ttc_params);
if (IS_ERR(priv->fs->inner_ttc))
return PTR_ERR(priv->fs->inner_ttc);
Expand All @@ -1257,7 +1257,7 @@ int mlx5e_create_ttc_table(struct mlx5e_priv *priv)
struct ttc_params ttc_params = {};

mlx5e_set_ttc_params(priv, &ttc_params, true);
priv->fs->ttc = mlx5_create_ttc_table(priv->mdev, &ttc_params);
priv->fs->ttc = mlx5_create_ttc_table(priv->fs->mdev, &ttc_params);
if (IS_ERR(priv->fs->ttc))
return PTR_ERR(priv->fs->ttc);
return 0;
Expand All @@ -1267,43 +1267,43 @@ int mlx5e_create_flow_steering(struct mlx5e_priv *priv)
{
int err;

priv->fs->ns = mlx5_get_flow_namespace(priv->mdev,
priv->fs->ns = mlx5_get_flow_namespace(priv->fs->mdev,
MLX5_FLOW_NAMESPACE_KERNEL);

if (!priv->fs->ns)
return -EOPNOTSUPP;

err = mlx5e_arfs_create_tables(priv);
if (err) {
mlx5_core_err(priv->mdev, "Failed to create arfs tables, err=%d\n",
mlx5_core_err(priv->fs->mdev, "Failed to create arfs tables, err=%d\n",
err);
priv->netdev->hw_features &= ~NETIF_F_NTUPLE;
}

err = mlx5e_create_inner_ttc_table(priv);
if (err) {
mlx5_core_err(priv->mdev,
mlx5_core_err(priv->fs->mdev,
"Failed to create inner ttc table, err=%d\n", err);
goto err_destroy_arfs_tables;
}

err = mlx5e_create_ttc_table(priv);
if (err) {
mlx5_core_err(priv->mdev, "Failed to create ttc table, err=%d\n",
mlx5_core_err(priv->fs->mdev, "Failed to create ttc table, err=%d\n",
err);
goto err_destroy_inner_ttc_table;
}

err = mlx5e_create_l2_table(priv);
if (err) {
mlx5_core_err(priv->mdev, "Failed to create l2 table, err=%d\n",
mlx5_core_err(priv->fs->mdev, "Failed to create l2 table, err=%d\n",
err);
goto err_destroy_ttc_table;
}

err = mlx5e_create_vlan_table(priv);
if (err) {
mlx5_core_err(priv->mdev, "Failed to create vlan table, err=%d\n",
mlx5_core_err(priv->fs->mdev, "Failed to create vlan table, err=%d\n",
err);
goto err_destroy_l2_table;
}
Expand Down Expand Up @@ -1367,7 +1367,8 @@ static void mlx5e_fs_tc_free(struct mlx5e_flow_steering *fs)
mlx5e_tc_table_free(fs->tc);
}

struct mlx5e_flow_steering *mlx5e_fs_init(const struct mlx5e_profile *profile)
struct mlx5e_flow_steering *mlx5e_fs_init(const struct mlx5e_profile *profile,
struct mlx5_core_dev *mdev)
{
struct mlx5e_flow_steering *fs;
int err;
Expand All @@ -1376,6 +1377,7 @@ struct mlx5e_flow_steering *mlx5e_fs_init(const struct mlx5e_profile *profile)
if (!fs)
goto err;

fs->mdev = mdev;
if (mlx5e_profile_feature_cap(profile, FS_VLAN)) {
err = mlx5e_fs_vlan_alloc(fs);
if (err)
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/mellanox/mlx5/core/en_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5020,7 +5020,7 @@ static int mlx5e_nic_init(struct mlx5_core_dev *mdev,

mlx5e_timestamp_init(priv);

fs = mlx5e_fs_init(priv->profile);
fs = mlx5e_fs_init(priv->profile, mdev);
if (!fs) {
err = -ENOMEM;
mlx5_core_err(mdev, "FS initialization failed, %d\n", err);
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@ static int mlx5e_init_rep_rx(struct mlx5e_priv *priv)
struct mlx5_core_dev *mdev = priv->mdev;
int err;

priv->fs = mlx5e_fs_init(priv->profile);
priv->fs = mlx5e_fs_init(priv->profile, mdev);
if (!priv->fs) {
netdev_err(priv->netdev, "FS allocation failed\n");
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ static int mlx5i_init_rx(struct mlx5e_priv *priv)
struct mlx5_core_dev *mdev = priv->mdev;
int err;

priv->fs = mlx5e_fs_init(priv->profile);
priv->fs = mlx5e_fs_init(priv->profile, mdev);
if (!priv->fs) {
netdev_err(priv->netdev, "FS allocation failed\n");
return -ENOMEM;
Expand Down

0 comments on commit 7bb7071

Please sign in to comment.