mlx5: implement ethtool::get_fec_stats

[sfrench/cifs-2.6.git] / drivers / net / ethernet / mellanox / mlx5 / core / en_fs.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
index cf1d3c9c88af3f21b9f80c19913ccf2d0ba96ad7..0d571a0c76d90aec5c70e5497292f3de33776d3c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
@@ -38,6 +38,7 @@
 #include "en.h"
 #include "en_rep.h"
 #include "lib/mpfs.h"
+#include "en/ptp.h"
 
 static int mlx5e_add_l2_flow_rule(struct mlx5e_priv *priv,
                                  struct mlx5e_l2_rule *ai, int type);
@@ -107,6 +108,29 @@ static void mlx5e_del_l2_from_hash(struct mlx5e_l2_hash_node *hn)
        kfree(hn);
 }
 
+struct mlx5e_vlan_table {
+       struct mlx5e_flow_table         ft;
+       DECLARE_BITMAP(active_cvlans, VLAN_N_VID);
+       DECLARE_BITMAP(active_svlans, VLAN_N_VID);
+       struct mlx5_flow_handle *active_cvlans_rule[VLAN_N_VID];
+       struct mlx5_flow_handle *active_svlans_rule[VLAN_N_VID];
+       struct mlx5_flow_handle *untagged_rule;
+       struct mlx5_flow_handle *any_cvlan_rule;
+       struct mlx5_flow_handle *any_svlan_rule;
+       struct mlx5_flow_handle *trap_rule;
+       bool                    cvlan_filter_disabled;
+};
+
+unsigned long *mlx5e_vlan_get_active_svlans(struct mlx5e_vlan_table *vlan)
+{
+       return vlan->active_svlans;
+}
+
+struct mlx5_flow_table *mlx5e_vlan_get_flowtable(struct mlx5e_vlan_table *vlan)
+{
+       return vlan->ft.t;
+}
+
 static int mlx5e_vport_context_update_vlans(struct mlx5e_priv *priv)
 {
        struct net_device *ndev = priv->netdev;
@@ -118,7 +142,7 @@ static int mlx5e_vport_context_update_vlans(struct mlx5e_priv *priv)
        int i;
 
        list_size = 0;
-       for_each_set_bit(vlan, priv->fs.vlan.active_cvlans, VLAN_N_VID)
+       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);
@@ -135,7 +159,7 @@ static int mlx5e_vport_context_update_vlans(struct mlx5e_priv *priv)
                return -ENOMEM;
 
        i = 0;
-       for_each_set_bit(vlan, priv->fs.vlan.active_cvlans, VLAN_N_VID) {
+       for_each_set_bit(vlan, priv->fs.vlan->active_cvlans, VLAN_N_VID) {
                if (i >= list_size)
                        break;
                vlans[i++] = vlan;
@@ -162,7 +186,7 @@ static int __mlx5e_add_vlan_rule(struct mlx5e_priv *priv,
                                 enum mlx5e_vlan_rule_type rule_type,
                                 u16 vid, struct mlx5_flow_spec *spec)
 {
-       struct mlx5_flow_table *ft = priv->fs.vlan.ft.t;
+       struct mlx5_flow_table *ft = priv->fs.vlan->ft.t;
        struct mlx5_flow_destination dest = {};
        struct mlx5_flow_handle **rule_p;
        MLX5_DECLARE_FLOW_ACT(flow_act);
@@ -179,24 +203,24 @@ static int __mlx5e_add_vlan_rule(struct mlx5e_priv *priv,
                 * disabled in match value means both S & C tags
                 * don't exist (untagged of both)
                 */
-               rule_p = &priv->fs.vlan.untagged_rule;
+               rule_p = &priv->fs.vlan->untagged_rule;
                MLX5_SET_TO_ONES(fte_match_param, spec->match_criteria,
                                 outer_headers.cvlan_tag);
                break;
        case MLX5E_VLAN_RULE_TYPE_ANY_CTAG_VID:
-               rule_p = &priv->fs.vlan.any_cvlan_rule;
+               rule_p = &priv->fs.vlan->any_cvlan_rule;
                MLX5_SET_TO_ONES(fte_match_param, spec->match_criteria,
                                 outer_headers.cvlan_tag);
                MLX5_SET(fte_match_param, spec->match_value, outer_headers.cvlan_tag, 1);
                break;
        case MLX5E_VLAN_RULE_TYPE_ANY_STAG_VID:
-               rule_p = &priv->fs.vlan.any_svlan_rule;
+               rule_p = &priv->fs.vlan->any_svlan_rule;
                MLX5_SET_TO_ONES(fte_match_param, spec->match_criteria,
                                 outer_headers.svlan_tag);
                MLX5_SET(fte_match_param, spec->match_value, outer_headers.svlan_tag, 1);
                break;
        case MLX5E_VLAN_RULE_TYPE_MATCH_STAG_VID:
-               rule_p = &priv->fs.vlan.active_svlans_rule[vid];
+               rule_p = &priv->fs.vlan->active_svlans_rule[vid];
                MLX5_SET_TO_ONES(fte_match_param, spec->match_criteria,
                                 outer_headers.svlan_tag);
                MLX5_SET(fte_match_param, spec->match_value, outer_headers.svlan_tag, 1);
@@ -206,7 +230,7 @@ static int __mlx5e_add_vlan_rule(struct mlx5e_priv *priv,
                         vid);
                break;
        default: /* MLX5E_VLAN_RULE_TYPE_MATCH_CTAG_VID */
-               rule_p = &priv->fs.vlan.active_cvlans_rule[vid];
+               rule_p = &priv->fs.vlan->active_cvlans_rule[vid];
                MLX5_SET_TO_ONES(fte_match_param, spec->match_criteria,
                                 outer_headers.cvlan_tag);
                MLX5_SET(fte_match_param, spec->match_value, outer_headers.cvlan_tag, 1);
@@ -256,33 +280,33 @@ static void mlx5e_del_vlan_rule(struct mlx5e_priv *priv,
 {
        switch (rule_type) {
        case MLX5E_VLAN_RULE_TYPE_UNTAGGED:
-               if (priv->fs.vlan.untagged_rule) {
-                       mlx5_del_flow_rules(priv->fs.vlan.untagged_rule);
-                       priv->fs.vlan.untagged_rule = NULL;
+               if (priv->fs.vlan->untagged_rule) {
+                       mlx5_del_flow_rules(priv->fs.vlan->untagged_rule);
+                       priv->fs.vlan->untagged_rule = NULL;
                }
                break;
        case MLX5E_VLAN_RULE_TYPE_ANY_CTAG_VID:
-               if (priv->fs.vlan.any_cvlan_rule) {
-                       mlx5_del_flow_rules(priv->fs.vlan.any_cvlan_rule);
-                       priv->fs.vlan.any_cvlan_rule = NULL;
+               if (priv->fs.vlan->any_cvlan_rule) {
+                       mlx5_del_flow_rules(priv->fs.vlan->any_cvlan_rule);
+                       priv->fs.vlan->any_cvlan_rule = NULL;
                }
                break;
        case MLX5E_VLAN_RULE_TYPE_ANY_STAG_VID:
-               if (priv->fs.vlan.any_svlan_rule) {
-                       mlx5_del_flow_rules(priv->fs.vlan.any_svlan_rule);
-                       priv->fs.vlan.any_svlan_rule = NULL;
+               if (priv->fs.vlan->any_svlan_rule) {
+                       mlx5_del_flow_rules(priv->fs.vlan->any_svlan_rule);
+                       priv->fs.vlan->any_svlan_rule = NULL;
                }
                break;
        case MLX5E_VLAN_RULE_TYPE_MATCH_STAG_VID:
-               if (priv->fs.vlan.active_svlans_rule[vid]) {
-                       mlx5_del_flow_rules(priv->fs.vlan.active_svlans_rule[vid]);
-                       priv->fs.vlan.active_svlans_rule[vid] = NULL;
+               if (priv->fs.vlan->active_svlans_rule[vid]) {
+                       mlx5_del_flow_rules(priv->fs.vlan->active_svlans_rule[vid]);
+                       priv->fs.vlan->active_svlans_rule[vid] = NULL;
                }
                break;
        case MLX5E_VLAN_RULE_TYPE_MATCH_CTAG_VID:
-               if (priv->fs.vlan.active_cvlans_rule[vid]) {
-                       mlx5_del_flow_rules(priv->fs.vlan.active_cvlans_rule[vid]);
-                       priv->fs.vlan.active_cvlans_rule[vid] = NULL;
+               if (priv->fs.vlan->active_cvlans_rule[vid]) {
+                       mlx5_del_flow_rules(priv->fs.vlan->active_cvlans_rule[vid]);
+                       priv->fs.vlan->active_cvlans_rule[vid] = NULL;
                }
                mlx5e_vport_context_update_vlans(priv);
                break;
@@ -329,27 +353,27 @@ mlx5e_add_trap_rule(struct mlx5_flow_table *ft, int trap_id, int tir_num)
 
 int mlx5e_add_vlan_trap(struct mlx5e_priv *priv, int trap_id, int tir_num)
 {
-       struct mlx5_flow_table *ft = priv->fs.vlan.ft.t;
+       struct mlx5_flow_table *ft = priv->fs.vlan->ft.t;
        struct mlx5_flow_handle *rule;
        int err;
 
        rule = mlx5e_add_trap_rule(ft, trap_id, tir_num);
        if (IS_ERR(rule)) {
                err = PTR_ERR(rule);
-               priv->fs.vlan.trap_rule = NULL;
+               priv->fs.vlan->trap_rule = NULL;
                netdev_err(priv->netdev, "%s: add VLAN trap rule failed, err %d\n",
                           __func__, err);
                return err;
        }
-       priv->fs.vlan.trap_rule = rule;
+       priv->fs.vlan->trap_rule = rule;
        return 0;
 }
 
 void mlx5e_remove_vlan_trap(struct mlx5e_priv *priv)
 {
-       if (priv->fs.vlan.trap_rule) {
-               mlx5_del_flow_rules(priv->fs.vlan.trap_rule);
-               priv->fs.vlan.trap_rule = NULL;
+       if (priv->fs.vlan->trap_rule) {
+               mlx5_del_flow_rules(priv->fs.vlan->trap_rule);
+               priv->fs.vlan->trap_rule = NULL;
        }
 }
 
@@ -381,10 +405,10 @@ void mlx5e_remove_mac_trap(struct mlx5e_priv *priv)
 
 void mlx5e_enable_cvlan_filter(struct mlx5e_priv *priv)
 {
-       if (!priv->fs.vlan.cvlan_filter_disabled)
+       if (!priv->fs.vlan->cvlan_filter_disabled)
                return;
 
-       priv->fs.vlan.cvlan_filter_disabled = false;
+       priv->fs.vlan->cvlan_filter_disabled = false;
        if (priv->netdev->flags & IFF_PROMISC)
                return;
        mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_CTAG_VID, 0);
@@ -392,10 +416,10 @@ void mlx5e_enable_cvlan_filter(struct mlx5e_priv *priv)
 
 void mlx5e_disable_cvlan_filter(struct mlx5e_priv *priv)
 {
-       if (priv->fs.vlan.cvlan_filter_disabled)
+       if (priv->fs.vlan->cvlan_filter_disabled)
                return;
 
-       priv->fs.vlan.cvlan_filter_disabled = true;
+       priv->fs.vlan->cvlan_filter_disabled = true;
        if (priv->netdev->flags & IFF_PROMISC)
                return;
        mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_CTAG_VID, 0);
@@ -405,11 +429,11 @@ static int mlx5e_vlan_rx_add_cvid(struct mlx5e_priv *priv, u16 vid)
 {
        int err;
 
-       set_bit(vid, priv->fs.vlan.active_cvlans);
+       set_bit(vid, priv->fs.vlan->active_cvlans);
 
        err = mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_MATCH_CTAG_VID, vid);
        if (err)
-               clear_bit(vid, priv->fs.vlan.active_cvlans);
+               clear_bit(vid, priv->fs.vlan->active_cvlans);
 
        return err;
 }
@@ -419,11 +443,11 @@ static int mlx5e_vlan_rx_add_svid(struct mlx5e_priv *priv, u16 vid)
        struct net_device *netdev = priv->netdev;
        int err;
 
-       set_bit(vid, priv->fs.vlan.active_svlans);
+       set_bit(vid, priv->fs.vlan->active_svlans);
 
        err = mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_MATCH_STAG_VID, vid);
        if (err) {
-               clear_bit(vid, priv->fs.vlan.active_svlans);
+               clear_bit(vid, priv->fs.vlan->active_svlans);
                return err;
        }
 
@@ -455,10 +479,10 @@ int mlx5e_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid)
                return 0; /* no vlan table for uplink rep */
 
        if (be16_to_cpu(proto) == ETH_P_8021Q) {
-               clear_bit(vid, priv->fs.vlan.active_cvlans);
+               clear_bit(vid, priv->fs.vlan->active_cvlans);
                mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_MATCH_CTAG_VID, vid);
        } else if (be16_to_cpu(proto) == ETH_P_8021AD) {
-               clear_bit(vid, priv->fs.vlan.active_svlans);
+               clear_bit(vid, priv->fs.vlan->active_svlans);
                mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_MATCH_STAG_VID, vid);
                netdev_update_features(dev);
        }
@@ -472,14 +496,14 @@ static void mlx5e_add_vlan_rules(struct mlx5e_priv *priv)
 
        mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_UNTAGGED, 0);
 
-       for_each_set_bit(i, priv->fs.vlan.active_cvlans, VLAN_N_VID) {
+       for_each_set_bit(i, priv->fs.vlan->active_cvlans, VLAN_N_VID) {
                mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_MATCH_CTAG_VID, i);
        }
 
-       for_each_set_bit(i, priv->fs.vlan.active_svlans, VLAN_N_VID)
+       for_each_set_bit(i, priv->fs.vlan->active_svlans, VLAN_N_VID)
                mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_MATCH_STAG_VID, i);
 
-       if (priv->fs.vlan.cvlan_filter_disabled)
+       if (priv->fs.vlan->cvlan_filter_disabled)
                mlx5e_add_any_vid_rules(priv);
 }
 
@@ -489,11 +513,11 @@ static void mlx5e_del_vlan_rules(struct mlx5e_priv *priv)
 
        mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_UNTAGGED, 0);
 
-       for_each_set_bit(i, priv->fs.vlan.active_cvlans, VLAN_N_VID) {
+       for_each_set_bit(i, priv->fs.vlan->active_cvlans, VLAN_N_VID) {
                mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_MATCH_CTAG_VID, i);
        }
 
-       for_each_set_bit(i, priv->fs.vlan.active_svlans, VLAN_N_VID)
+       for_each_set_bit(i, priv->fs.vlan->active_svlans, VLAN_N_VID)
                mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_MATCH_STAG_VID, i);
 
        WARN_ON_ONCE(!(test_bit(MLX5E_STATE_DESTROYING, &priv->state)));
@@ -503,7 +527,7 @@ static void mlx5e_del_vlan_rules(struct mlx5e_priv *priv)
        /* must be called after DESTROY bit is set and
         * set_rx_mode is called and flushed
         */
-       if (priv->fs.vlan.cvlan_filter_disabled)
+       if (priv->fs.vlan->cvlan_filter_disabled)
                mlx5e_del_any_vid_rules(priv);
 }
 
@@ -1691,10 +1715,15 @@ static int mlx5e_create_vlan_table_groups(struct mlx5e_flow_table *ft)
 
 static int mlx5e_create_vlan_table(struct mlx5e_priv *priv)
 {
-       struct mlx5e_flow_table *ft = &priv->fs.vlan.ft;
        struct mlx5_flow_table_attr ft_attr = {};
+       struct mlx5e_flow_table *ft;
        int err;
 
+       priv->fs.vlan = kvzalloc(sizeof(*priv->fs.vlan), GFP_KERNEL);
+       if (!priv->fs.vlan)
+               return -ENOMEM;
+
+       ft = &priv->fs.vlan->ft;
        ft->num_groups = 0;
 
        ft_attr.max_fte = MLX5E_VLAN_TABLE_SIZE;
@@ -1702,12 +1731,11 @@ static int mlx5e_create_vlan_table(struct mlx5e_priv *priv)
        ft_attr.prio = MLX5E_NIC_PRIO;
 
        ft->t = mlx5_create_flow_table(priv->fs.ns, &ft_attr);
-
        if (IS_ERR(ft->t)) {
                err = PTR_ERR(ft->t);
-               ft->t = NULL;
-               return err;
+               goto err_free_t;
        }
+
        ft->g = kcalloc(MLX5E_NUM_VLAN_GROUPS, sizeof(*ft->g), GFP_KERNEL);
        if (!ft->g) {
                err = -ENOMEM;
@@ -1726,7 +1754,9 @@ err_free_g:
        kfree(ft->g);
 err_destroy_vlan_table:
        mlx5_destroy_flow_table(ft->t);
-       ft->t = NULL;
+err_free_t:
+       kvfree(priv->fs.vlan);
+       priv->fs.vlan = NULL;
 
        return err;
 }
@@ -1734,7 +1764,8 @@ err_destroy_vlan_table:
 static void mlx5e_destroy_vlan_table(struct mlx5e_priv *priv)
 {
        mlx5e_del_vlan_rules(priv);
-       mlx5e_destroy_flow_table(&priv->fs.vlan.ft);
+       mlx5e_destroy_flow_table(&priv->fs.vlan->ft);
+       kvfree(priv->fs.vlan);
 }
 
 int mlx5e_create_flow_steering(struct mlx5e_priv *priv)
@@ -1792,10 +1823,16 @@ int mlx5e_create_flow_steering(struct mlx5e_priv *priv)
                goto err_destroy_l2_table;
        }
 
+       err = mlx5e_ptp_alloc_rx_fs(priv);
+       if (err)
+               goto err_destory_vlan_table;
+
        mlx5e_ethtool_init_steering(priv);
 
        return 0;
 
+err_destory_vlan_table:
+       mlx5e_destroy_vlan_table(priv);
 err_destroy_l2_table:
        mlx5e_destroy_l2_table(priv);
 err_destroy_ttc_table:
@@ -1810,6 +1847,7 @@ err_destroy_arfs_tables:
 
 void mlx5e_destroy_flow_steering(struct mlx5e_priv *priv)
 {
+       mlx5e_ptp_free_rx_fs(priv);
        mlx5e_destroy_vlan_table(priv);
        mlx5e_destroy_l2_table(priv);
        mlx5e_destroy_ttc_table(priv, &priv->fs.ttc);