mlxsw: spectrum: qdiscs: Support PRIO qdisc offload

Add support for offloading PRIO qdisc as root qdisc.
The support is for up to 8 bands.
Routed packets priority is determined by the DSCP field with the default
translations. Bridged packets priority is determined by the PCP field, if
exist, otherwise it is set to 0.
Since both options have only priorities 0-7, higher priorities mapping are
being ignored.

Signed-off-by: Nogah Frankel <nogahf@mellanox.com>
Reviewed-by: Yuval Mintz <yuvalm@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index 54c7d9202e814cefe36e6c914b2be8baaaa7a09d..f78bfe39496644e7354e005f7fd22162224cd16b 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -1830,6 +1830,8 @@ static int mlxsw_sp_setup_tc(struct net_device *dev, enum tc_setup_type type,
                return mlxsw_sp_setup_tc_block(mlxsw_sp_port, type_data);
        case TC_SETUP_QDISC_RED:
                return mlxsw_sp_setup_tc_red(mlxsw_sp_port, type_data);
+       case TC_SETUP_QDISC_PRIO:
+               return mlxsw_sp_setup_tc_prio(mlxsw_sp_port, type_data);
        default:
                return -EOPNOTSUPP;
        }

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
index b6f475e834740f653f0f8969e829754cce302a3c..16f8fbda0891a2fa4721060fedfd2299adcdfb39 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@ -565,6 +565,8 @@ int mlxsw_sp_tc_qdisc_init(struct mlxsw_sp_port *mlxsw_sp_port);
 void mlxsw_sp_tc_qdisc_fini(struct mlxsw_sp_port *mlxsw_sp_port);
 int mlxsw_sp_setup_tc_red(struct mlxsw_sp_port *mlxsw_sp_port,
                          struct tc_red_qopt_offload *p);
+int mlxsw_sp_setup_tc_prio(struct mlxsw_sp_port *mlxsw_sp_port,
+                          struct tc_prio_qopt_offload *p);
 
 /* spectrum_fid.c */
 int mlxsw_sp_fid_flood_set(struct mlxsw_sp_fid *fid,

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c
index 971f689dd833b3708f94b219bfce9c8a617a8f51..4dd20540fe5eb87acf750cee302217c0f2b5e4d9 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c
@@ -41,9 +41,12 @@
 #include "spectrum.h"
 #include "reg.h"
 
+#define MLXSW_SP_PRIO_BAND_TO_TCLASS(band) (IEEE_8021QAZ_MAX_TCS - band - 1)
+
 enum mlxsw_sp_qdisc_type {
        MLXSW_SP_QDISC_NO_QDISC,
        MLXSW_SP_QDISC_RED,
+       MLXSW_SP_QDISC_PRIO,
 };
 
 struct mlxsw_sp_qdisc_ops {
@@ -403,6 +406,85 @@ int mlxsw_sp_setup_tc_red(struct mlxsw_sp_port *mlxsw_sp_port,
        }
 }
 
+static int
+mlxsw_sp_qdisc_prio_destroy(struct mlxsw_sp_port *mlxsw_sp_port,
+                           struct mlxsw_sp_qdisc *mlxsw_sp_qdisc)
+{
+       int i;
+
+       for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++)
+               mlxsw_sp_port_prio_tc_set(mlxsw_sp_port, i,
+                                         MLXSW_SP_PORT_DEFAULT_TCLASS);
+
+       return 0;
+}
+
+static int
+mlxsw_sp_qdisc_prio_check_params(struct mlxsw_sp_port *mlxsw_sp_port,
+                                struct mlxsw_sp_qdisc *mlxsw_sp_qdisc,
+                                void *params)
+{
+       struct tc_prio_qopt_offload_params *p = params;
+
+       if (p->bands > IEEE_8021QAZ_MAX_TCS)
+               return -EOPNOTSUPP;
+
+       return 0;
+}
+
+static int
+mlxsw_sp_qdisc_prio_replace(struct mlxsw_sp_port *mlxsw_sp_port,
+                           struct mlxsw_sp_qdisc *mlxsw_sp_qdisc,
+                           void *params)
+{
+       struct tc_prio_qopt_offload_params *p = params;
+       int tclass, i;
+       int err;
+
+       for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) {
+               tclass = MLXSW_SP_PRIO_BAND_TO_TCLASS(p->priomap[i]);
+               err = mlxsw_sp_port_prio_tc_set(mlxsw_sp_port, i, tclass);
+               if (err)
+                       return err;
+       }
+
+       return 0;
+}
+
+static struct mlxsw_sp_qdisc_ops mlxsw_sp_qdisc_ops_prio = {
+       .type = MLXSW_SP_QDISC_PRIO,
+       .check_params = mlxsw_sp_qdisc_prio_check_params,
+       .replace = mlxsw_sp_qdisc_prio_replace,
+       .destroy = mlxsw_sp_qdisc_prio_destroy,
+};
+
+int mlxsw_sp_setup_tc_prio(struct mlxsw_sp_port *mlxsw_sp_port,
+                          struct tc_prio_qopt_offload *p)
+{
+       struct mlxsw_sp_qdisc *mlxsw_sp_qdisc;
+
+       if (p->parent != TC_H_ROOT)
+               return -EOPNOTSUPP;
+
+       mlxsw_sp_qdisc = mlxsw_sp_port->root_qdisc;
+       if (p->command == TC_PRIO_REPLACE)
+               return mlxsw_sp_qdisc_replace(mlxsw_sp_port, p->handle,
+                                             mlxsw_sp_qdisc,
+                                             &mlxsw_sp_qdisc_ops_prio,
+                                             &p->replace_params);
+
+       if (!mlxsw_sp_qdisc_compare(mlxsw_sp_qdisc, p->handle,
+                                   MLXSW_SP_QDISC_PRIO))
+               return -EOPNOTSUPP;
+
+       switch (p->command) {
+       case TC_PRIO_DESTROY:
+               return mlxsw_sp_qdisc_destroy(mlxsw_sp_port, mlxsw_sp_qdisc);
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+
 int mlxsw_sp_tc_qdisc_init(struct mlxsw_sp_port *mlxsw_sp_port)
 {
        mlxsw_sp_port->root_qdisc = kzalloc(sizeof(*mlxsw_sp_port->root_qdisc),