net/mlx5: E-Switch, add ingress rate support

Use the scheduling elements to implement ingress rate limiter on an
eswitch ports ingress traffic. Since the ingress of eswitch port is the
egress of VF port, we control eswitch ingress by controlling VF egress.

Configuration is done using the ports' representor net devices.

Please note that burst size configuration is not supported by devices
ConnectX-5 and earlier generations.

Configuration examples:
tc:
tc filter add dev enp59s0f0_0 root protocol ip matchall action police rate 1mbit burst 20k

ovs:
ovs-vsctl set interface eth0 ingress_policing_rate=1000

Signed-off-by: Eli Cohen <eli@mellanox.com>
Reviewed-by: Paul Blakey <paulb@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index 6edf0aeb1e266f0b7a911fc00528e5bdd1390b51..bf6f4835457e026e19f051e542e51216ccd656bb 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@ -1156,6 +1156,23 @@ mlx5e_rep_setup_tc_cls_flower(struct mlx5e_priv *priv,
        }
 }
 
+static
+int mlx5e_rep_setup_tc_cls_matchall(struct mlx5e_priv *priv,
+                                   struct tc_cls_matchall_offload *ma)
+{
+       switch (ma->command) {
+       case TC_CLSMATCHALL_REPLACE:
+               return mlx5e_tc_configure_matchall(priv, ma);
+       case TC_CLSMATCHALL_DESTROY:
+               return mlx5e_tc_delete_matchall(priv, ma);
+       case TC_CLSMATCHALL_STATS:
+               mlx5e_tc_stats_matchall(priv, ma);
+               return 0;
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+
 static int mlx5e_rep_setup_tc_cb(enum tc_setup_type type, void *type_data,
                                 void *cb_priv)
 {
@@ -1165,6 +1182,8 @@ static int mlx5e_rep_setup_tc_cb(enum tc_setup_type type, void *type_data,
        switch (type) {
        case TC_SETUP_CLSFLOWER:
                return mlx5e_rep_setup_tc_cls_flower(priv, type_data, flags);
+       case TC_SETUP_CLSMATCHALL:
+               return mlx5e_rep_setup_tc_cls_matchall(priv, type_data);
        default:
                return -EOPNOTSUPP;
        }

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
index 10fafd5fa17b4d9f4a04e9036622297a23e9314b..43eeebe9c8d2d3b1fc0d7b6d23d5dbdd6dd050a2 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
@@ -88,6 +88,7 @@ struct mlx5e_rep_priv {
        struct mlx5_flow_handle *vport_rx_rule;
        struct list_head       vport_sqs_list;
        struct mlx5_rep_uplink_priv uplink_priv; /* valid for uplink rep */
+       struct rtnl_link_stats64 prev_vf_vport_stats;
        struct devlink_port dl_port;
 };
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index f3ed028d50176b2af3bbc39f52aa169ff8153d92..dc5fc3350b65f30ab063af34341f01aab062b908 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -3638,6 +3638,106 @@ errout:
        return err;
 }
 
+static int apply_police_params(struct mlx5e_priv *priv, u32 rate,
+                              struct netlink_ext_ack *extack)
+{
+       struct mlx5e_rep_priv *rpriv = priv->ppriv;
+       struct mlx5_eswitch *esw;
+       u16 vport_num;
+       u32 rate_mbps;
+       int err;
+
+       esw = priv->mdev->priv.eswitch;
+       /* rate is given in bytes/sec.
+        * First convert to bits/sec and then round to the nearest mbit/secs.
+        * mbit means million bits.
+        * Moreover, if rate is non zero we choose to configure to a minimum of
+        * 1 mbit/sec.
+        */
+       rate_mbps = rate ? max_t(u32, (rate * 8 + 500000) / 1000000, 1) : 0;
+       vport_num = rpriv->rep->vport;
+
+       err = mlx5_esw_modify_vport_rate(esw, vport_num, rate_mbps);
+       if (err)
+               NL_SET_ERR_MSG_MOD(extack, "failed applying action to hardware");
+
+       return err;
+}
+
+static int scan_tc_matchall_fdb_actions(struct mlx5e_priv *priv,
+                                       struct flow_action *flow_action,
+                                       struct netlink_ext_ack *extack)
+{
+       struct mlx5e_rep_priv *rpriv = priv->ppriv;
+       const struct flow_action_entry *act;
+       int err;
+       int i;
+
+       if (!flow_action_has_entries(flow_action)) {
+               NL_SET_ERR_MSG_MOD(extack, "matchall called with no action");
+               return -EINVAL;
+       }
+
+       if (!flow_offload_has_one_action(flow_action)) {
+               NL_SET_ERR_MSG_MOD(extack, "matchall policing support only a single action");
+               return -EOPNOTSUPP;
+       }
+
+       flow_action_for_each(i, act, flow_action) {
+               switch (act->id) {
+               case FLOW_ACTION_POLICE:
+                       err = apply_police_params(priv, act->police.rate_bytes_ps, extack);
+                       if (err)
+                               return err;
+
+                       rpriv->prev_vf_vport_stats = priv->stats.vf_vport;
+                       break;
+               default:
+                       NL_SET_ERR_MSG_MOD(extack, "mlx5 supports only police action for matchall");
+                       return -EOPNOTSUPP;
+               }
+       }
+
+       return 0;
+}
+
+int mlx5e_tc_configure_matchall(struct mlx5e_priv *priv,
+                               struct tc_cls_matchall_offload *ma)
+{
+       struct netlink_ext_ack *extack = ma->common.extack;
+       int prio = TC_H_MAJ(ma->common.prio) >> 16;
+
+       if (prio != 1) {
+               NL_SET_ERR_MSG_MOD(extack, "only priority 1 is supported");
+               return -EINVAL;
+       }
+
+       return scan_tc_matchall_fdb_actions(priv, &ma->rule->action, extack);
+}
+
+int mlx5e_tc_delete_matchall(struct mlx5e_priv *priv,
+                            struct tc_cls_matchall_offload *ma)
+{
+       struct netlink_ext_ack *extack = ma->common.extack;
+
+       return apply_police_params(priv, 0, extack);
+}
+
+void mlx5e_tc_stats_matchall(struct mlx5e_priv *priv,
+                            struct tc_cls_matchall_offload *ma)
+{
+       struct mlx5e_rep_priv *rpriv = priv->ppriv;
+       struct rtnl_link_stats64 cur_stats;
+       u64 dbytes;
+       u64 dpkts;
+
+       cur_stats = priv->stats.vf_vport;
+       dpkts = cur_stats.rx_packets - rpriv->prev_vf_vport_stats.rx_packets;
+       dbytes = cur_stats.rx_bytes - rpriv->prev_vf_vport_stats.rx_bytes;
+       rpriv->prev_vf_vport_stats = cur_stats;
+       flow_stats_update(&ma->stats, dpkts, dbytes, jiffies);
+}
+
 static void mlx5e_tc_hairpin_update_dead_peer(struct mlx5e_priv *priv,
                                              struct mlx5e_priv *peer_priv)
 {

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
index 1cb66bf769975e059192c3582398b11d3a945350..20f045e96c92efd28adf2fca05a1e370c5f8f02a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
@@ -63,6 +63,13 @@ int mlx5e_delete_flower(struct net_device *dev, struct mlx5e_priv *priv,
 int mlx5e_stats_flower(struct net_device *dev, struct mlx5e_priv *priv,
                       struct flow_cls_offload *f, unsigned long flags);
 
+int mlx5e_tc_configure_matchall(struct mlx5e_priv *priv,
+                               struct tc_cls_matchall_offload *f);
+int mlx5e_tc_delete_matchall(struct mlx5e_priv *priv,
+                            struct tc_cls_matchall_offload *f);
+void mlx5e_tc_stats_matchall(struct mlx5e_priv *priv,
+                            struct tc_cls_matchall_offload *ma);
+
 struct mlx5e_encap_entry;
 void mlx5e_tc_encap_flows_add(struct mlx5e_priv *priv,
                              struct mlx5e_encap_entry *e);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index f4ace5f8e8845f54f6548facfc15479a462313a8..5fbebee7254d1899ee99192bd87224c983df2877 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -1585,6 +1585,22 @@ static int esw_vport_qos_config(struct mlx5_eswitch *esw,
        return 0;
 }
 
+int mlx5_esw_modify_vport_rate(struct mlx5_eswitch *esw, u16 vport_num,
+                              u32 rate_mbps)
+{
+       u32 ctx[MLX5_ST_SZ_DW(scheduling_context)] = {};
+       struct mlx5_vport *vport;
+
+       vport = mlx5_eswitch_get_vport(esw, vport_num);
+       MLX5_SET(scheduling_context, ctx, max_average_bw, rate_mbps);
+
+       return mlx5_modify_scheduling_element_cmd(esw->dev,
+                                                 SCHEDULING_HIERARCHY_E_SWITCH,
+                                                 ctx,
+                                                 vport->qos.esw_tsar_ix,
+                                                 MODIFY_SCHEDULING_ELEMENT_IN_MODIFY_BITMASK_MAX_AVERAGE_BW);
+}
+
 static void node_guid_gen_from_mac(u64 *node_guid, u8 mac[ETH_ALEN])
 {
        ((u8 *)node_guid)[7] = mac[0];

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
index 4a03fdadb47e3ab8ed130d7506f4e1251f863524..804912e38dee21036faba79eb7925ccf7499d82c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
@@ -261,6 +261,8 @@ void esw_vport_disable_ingress_acl(struct mlx5_eswitch *esw,
                                   struct mlx5_vport *vport);
 void esw_vport_del_ingress_acl_modify_metadata(struct mlx5_eswitch *esw,
                                               struct mlx5_vport *vport);
+int mlx5_esw_modify_vport_rate(struct mlx5_eswitch *esw, u16 vport_num,
+                              u32 rate_mbps);
 
 /* E-Switch API */
 int mlx5_eswitch_init(struct mlx5_core_dev *dev);