net/mlx5: E-switch, Enable vport QoS on demand

Vports' QoS is not commonly used but consume SW/HW resources, which
becomes an issue on BlueField SoC systems.
Don't enable QoS on vports by default on eswitch mode change and enable
when it's going to be used by one of the top level users:
- configuring TC matchall filter with police action;
- setting rate with legacy NDO API;
- calling devlink ops->rate_leaf_*() callbacks.

Disable vport QoS on vport cleanup.

Signed-off-by: Dmytro Linkin <dlinkin@nvidia.com>
Reviewed-by: Parav Pandit <parav@nvidia.com>
Reviewed-by: Mark Bloch <mbloch@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c
index df277a6cddc0b47fc4b794e6c3522eb84c31f818..2b52f7c09152896194efa2498d2a327815d6a79a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c
@@ -522,9 +522,7 @@ int mlx5_eswitch_set_vport_rate(struct mlx5_eswitch *esw, u16 vport,
                return PTR_ERR(evport);
 
        mutex_lock(&esw->state_lock);
-       err = mlx5_esw_qos_set_vport_min_rate(esw, evport, min_rate, NULL);
-       if (!err)
-               err = mlx5_esw_qos_set_vport_max_rate(esw, evport, max_rate, NULL);
+       err = mlx5_esw_qos_set_vport_rate(esw, evport, max_rate, min_rate);
        mutex_unlock(&esw->state_lock);
        return err;
 }

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c
index c6cc67cb4f6add88e0b1f24f00c6112fd8c521d1..304abc2930868e2c736d276217bbf85c3ca18156 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c
@@ -204,10 +204,8 @@ static int esw_qos_normalize_groups_min_rate(struct mlx5_eswitch *esw, u32 divid
        return 0;
 }
 
-int mlx5_esw_qos_set_vport_min_rate(struct mlx5_eswitch *esw,
-                                   struct mlx5_vport *evport,
-                                   u32 min_rate,
-                                   struct netlink_ext_ack *extack)
+static int esw_qos_set_vport_min_rate(struct mlx5_eswitch *esw, struct mlx5_vport *evport,
+                                     u32 min_rate, struct netlink_ext_ack *extack)
 {
        u32 fw_max_bw_share, previous_min_rate;
        bool min_rate_supported;
@@ -231,10 +229,8 @@ int mlx5_esw_qos_set_vport_min_rate(struct mlx5_eswitch *esw,
        return err;
 }
 
-int mlx5_esw_qos_set_vport_max_rate(struct mlx5_eswitch *esw,
-                                   struct mlx5_vport *evport,
-                                   u32 max_rate,
-                                   struct netlink_ext_ack *extack)
+static int esw_qos_set_vport_max_rate(struct mlx5_eswitch *esw, struct mlx5_vport *evport,
+                                     u32 max_rate, struct netlink_ext_ack *extack)
 {
        u32 act_max_rate = max_rate;
        bool max_rate_supported;
@@ -605,8 +601,8 @@ unlock:
        mutex_unlock(&esw->state_lock);
 }
 
-int mlx5_esw_qos_vport_enable(struct mlx5_eswitch *esw, struct mlx5_vport *vport,
-                             u32 max_rate, u32 bw_share)
+static int esw_qos_vport_enable(struct mlx5_eswitch *esw, struct mlx5_vport *vport,
+                               u32 max_rate, u32 bw_share)
 {
        int err;
 
@@ -615,7 +611,7 @@ int mlx5_esw_qos_vport_enable(struct mlx5_eswitch *esw, struct mlx5_vport *vport
                return 0;
 
        if (vport->qos.enabled)
-               return -EEXIST;
+               return 0;
 
        vport->qos.group = esw->qos.group0;
 
@@ -645,31 +641,55 @@ void mlx5_esw_qos_vport_disable(struct mlx5_eswitch *esw, struct mlx5_vport *vpo
                esw_warn(esw->dev, "E-Switch destroy TSAR vport element failed (vport=%d,err=%d)\n",
                         vport->vport, err);
 
-       vport->qos.enabled = false;
+       memset(&vport->qos, 0, sizeof(vport->qos));
        trace_mlx5_esw_vport_qos_destroy(vport);
 }
 
+int mlx5_esw_qos_set_vport_rate(struct mlx5_eswitch *esw, struct mlx5_vport *vport,
+                               u32 min_rate, u32 max_rate)
+{
+       int err;
+
+       lockdep_assert_held(&esw->state_lock);
+       err = esw_qos_vport_enable(esw, vport, 0, 0);
+       if (err)
+               return err;
+
+       err = esw_qos_set_vport_min_rate(esw, vport, min_rate, NULL);
+       if (!err)
+               err = esw_qos_set_vport_max_rate(esw, vport, max_rate, NULL);
+
+       return err;
+}
+
 int mlx5_esw_qos_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;
        u32 bitmask;
+       int err;
 
        vport = mlx5_eswitch_get_vport(esw, vport_num);
        if (IS_ERR(vport))
                return PTR_ERR(vport);
 
-       if (!vport->qos.enabled)
-               return -EOPNOTSUPP;
-
-       MLX5_SET(scheduling_context, ctx, max_average_bw, rate_mbps);
-       bitmask = MODIFY_SCHEDULING_ELEMENT_IN_MODIFY_BITMASK_MAX_AVERAGE_BW;
+       mutex_lock(&esw->state_lock);
+       if (!vport->qos.enabled) {
+               /* Eswitch QoS wasn't enabled yet. Enable it and vport QoS. */
+               err = esw_qos_vport_enable(esw, vport, rate_mbps, vport->qos.bw_share);
+       } else {
+               MLX5_SET(scheduling_context, ctx, max_average_bw, rate_mbps);
+
+               bitmask = MODIFY_SCHEDULING_ELEMENT_IN_MODIFY_BITMASK_MAX_AVERAGE_BW;
+               err = mlx5_modify_scheduling_element_cmd(esw->dev,
+                                                        SCHEDULING_HIERARCHY_E_SWITCH,
+                                                        ctx,
+                                                        vport->qos.esw_tsar_ix,
+                                                        bitmask);
+       }
+       mutex_unlock(&esw->state_lock);
 
-       return mlx5_modify_scheduling_element_cmd(esw->dev,
-                                                 SCHEDULING_HIERARCHY_E_SWITCH,
-                                                 ctx,
-                                                 vport->qos.esw_tsar_ix,
-                                                 bitmask);
+       return err;
 }
 
 #define MLX5_LINKSPEED_UNIT 125000 /* 1Mbps in Bps */
@@ -728,7 +748,12 @@ int mlx5_esw_devlink_rate_leaf_tx_share_set(struct devlink_rate *rate_leaf, void
                return err;
 
        mutex_lock(&esw->state_lock);
-       err = mlx5_esw_qos_set_vport_min_rate(esw, vport, tx_share, extack);
+       err = esw_qos_vport_enable(esw, vport, 0, 0);
+       if (err)
+               goto unlock;
+
+       err = esw_qos_set_vport_min_rate(esw, vport, tx_share, extack);
+unlock:
        mutex_unlock(&esw->state_lock);
        return err;
 }
@@ -749,7 +774,12 @@ int mlx5_esw_devlink_rate_leaf_tx_max_set(struct devlink_rate *rate_leaf, void *
                return err;
 
        mutex_lock(&esw->state_lock);
-       err = mlx5_esw_qos_set_vport_max_rate(esw, vport, tx_max, extack);
+       err = esw_qos_vport_enable(esw, vport, 0, 0);
+       if (err)
+               goto unlock;
+
+       err = esw_qos_set_vport_max_rate(esw, vport, tx_max, extack);
+unlock:
        mutex_unlock(&esw->state_lock);
        return err;
 }
@@ -846,7 +876,9 @@ int mlx5_esw_qos_vport_update_group(struct mlx5_eswitch *esw,
        int err;
 
        mutex_lock(&esw->state_lock);
-       err = esw_qos_vport_update_group(esw, vport, group, extack);
+       err = esw_qos_vport_enable(esw, vport, 0, 0);
+       if (!err)
+               err = esw_qos_vport_update_group(esw, vport, group, extack);
        mutex_unlock(&esw->state_lock);
        return err;
 }

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.h b/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.h
index 28451abe2d2f104f1178d32abc4782a5109f3bff..91b66c1b98818374b4c6ea9c8462768616a08cc9 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.h
@@ -6,18 +6,10 @@
 
 #ifdef CONFIG_MLX5_ESWITCH
 
-int mlx5_esw_qos_set_vport_min_rate(struct mlx5_eswitch *esw,
-                                   struct mlx5_vport *evport,
-                                   u32 min_rate,
-                                   struct netlink_ext_ack *extack);
-int mlx5_esw_qos_set_vport_max_rate(struct mlx5_eswitch *esw,
-                                   struct mlx5_vport *evport,
-                                   u32 max_rate,
-                                   struct netlink_ext_ack *extack);
+int mlx5_esw_qos_set_vport_rate(struct mlx5_eswitch *esw, struct mlx5_vport *evport,
+                               u32 max_rate, u32 min_rate);
 void mlx5_esw_qos_create(struct mlx5_eswitch *esw);
 void mlx5_esw_qos_destroy(struct mlx5_eswitch *esw);
-int mlx5_esw_qos_vport_enable(struct mlx5_eswitch *esw, struct mlx5_vport *vport,
-                             u32 max_rate, u32 bw_share);
 void mlx5_esw_qos_vport_disable(struct mlx5_eswitch *esw, struct mlx5_vport *vport);
 
 int mlx5_esw_devlink_rate_leaf_tx_share_set(struct devlink_rate *rate_leaf, void *priv,

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index ec5b1641d40c1e56c36c45cde2b7e2e9a24d52b0..2d188f462028bceb943558b53506d60a307ab7e3 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -781,9 +781,6 @@ static int esw_vport_setup(struct mlx5_eswitch *esw, struct mlx5_vport *vport)
        if (err)
                return err;
 
-       /* Attach vport to the eswitch rate limiter */
-       mlx5_esw_qos_vport_enable(esw, vport, vport->qos.max_rate, vport->qos.bw_share);
-
        if (mlx5_esw_is_manager_vport(esw, vport_num))
                return 0;
 
@@ -1746,8 +1743,10 @@ int mlx5_eswitch_get_vport_config(struct mlx5_eswitch *esw,
        ivi->qos = evport->info.qos;
        ivi->spoofchk = evport->info.spoofchk;
        ivi->trusted = evport->info.trusted;
-       ivi->min_tx_rate = evport->qos.min_rate;
-       ivi->max_tx_rate = evport->qos.max_rate;
+       if (evport->qos.enabled) {
+               ivi->min_tx_rate = evport->qos.min_rate;
+               ivi->max_tx_rate = evport->qos.max_rate;
+       }
        mutex_unlock(&esw->state_lock);
 
        return 0;