mlxsw: spectrum_matchall: Split sampling support between ASICs

Sampling of ingress packets is supported using a dedicated sampling
mechanism on all Spectrum ASICs. However, Spectrum-2 and later ASICs
support more sophisticated sampling by mirroring packets to the CPU.

As a preparation for more advanced sampling configurations, split the
sampling operations between Spectrum-1 and later ASICs.

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.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 dbf95e52b341d23ffdb91b09ea8b8ad1d28082aa..93b15b8c007e6d5b5f8ecf75a83c700515715464 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -2804,6 +2804,7 @@ static int mlxsw_sp1_init(struct mlxsw_core *mlxsw_core,
        mlxsw_sp->span_ops = &mlxsw_sp1_span_ops;
        mlxsw_sp->policer_core_ops = &mlxsw_sp1_policer_core_ops;
        mlxsw_sp->trap_ops = &mlxsw_sp1_trap_ops;
+       mlxsw_sp->mall_ops = &mlxsw_sp1_mall_ops;
        mlxsw_sp->listeners = mlxsw_sp1_listener;
        mlxsw_sp->listeners_count = ARRAY_SIZE(mlxsw_sp1_listener);
        mlxsw_sp->lowest_shaper_bs = MLXSW_REG_QEEC_LOWEST_SHAPER_BS_SP1;
@@ -2833,6 +2834,7 @@ static int mlxsw_sp2_init(struct mlxsw_core *mlxsw_core,
        mlxsw_sp->span_ops = &mlxsw_sp2_span_ops;
        mlxsw_sp->policer_core_ops = &mlxsw_sp2_policer_core_ops;
        mlxsw_sp->trap_ops = &mlxsw_sp2_trap_ops;
+       mlxsw_sp->mall_ops = &mlxsw_sp2_mall_ops;
        mlxsw_sp->lowest_shaper_bs = MLXSW_REG_QEEC_LOWEST_SHAPER_BS_SP2;
 
        return mlxsw_sp_init(mlxsw_core, mlxsw_bus_info, extack);
@@ -2860,6 +2862,7 @@ static int mlxsw_sp3_init(struct mlxsw_core *mlxsw_core,
        mlxsw_sp->span_ops = &mlxsw_sp3_span_ops;
        mlxsw_sp->policer_core_ops = &mlxsw_sp2_policer_core_ops;
        mlxsw_sp->trap_ops = &mlxsw_sp2_trap_ops;
+       mlxsw_sp->mall_ops = &mlxsw_sp2_mall_ops;
        mlxsw_sp->lowest_shaper_bs = MLXSW_REG_QEEC_LOWEST_SHAPER_BS_SP3;
 
        return mlxsw_sp_init(mlxsw_core, mlxsw_bus_info, extack);

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
index d9d9e1f488f94e7ba2498b8e87ad9ea263badf55..1ec9a3c48a424698c31afd3f2cb22ba8cf7c4df2 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@ -179,6 +179,7 @@ struct mlxsw_sp {
        const struct mlxsw_sp_span_ops *span_ops;
        const struct mlxsw_sp_policer_core_ops *policer_core_ops;
        const struct mlxsw_sp_trap_ops *trap_ops;
+       const struct mlxsw_sp_mall_ops *mall_ops;
        const struct mlxsw_listener *listeners;
        size_t listeners_count;
        u32 lowest_shaper_bs;
@@ -1033,6 +1034,16 @@ extern const struct mlxsw_afk_ops mlxsw_sp1_afk_ops;
 extern const struct mlxsw_afk_ops mlxsw_sp2_afk_ops;
 
 /* spectrum_matchall.c */
+struct mlxsw_sp_mall_ops {
+       int (*sample_add)(struct mlxsw_sp *mlxsw_sp,
+                         struct mlxsw_sp_port *mlxsw_sp_port, u32 rate);
+       void (*sample_del)(struct mlxsw_sp *mlxsw_sp,
+                          struct mlxsw_sp_port *mlxsw_sp_port);
+};
+
+extern const struct mlxsw_sp_mall_ops mlxsw_sp1_mall_ops;
+extern const struct mlxsw_sp_mall_ops mlxsw_sp2_mall_ops;
+
 enum mlxsw_sp_mall_action_type {
        MLXSW_SP_MALL_ACTION_TYPE_MIRROR,
        MLXSW_SP_MALL_ACTION_TYPE_SAMPLE,

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_matchall.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_matchall.c
index 2b7652b4b0bb45558c9014613242e80381b7feb6..ad1209df81ea4b01f65db44816773f6ef0d09d56 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_matchall.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_matchall.c
@@ -96,6 +96,7 @@ static int
 mlxsw_sp_mall_port_sample_add(struct mlxsw_sp_port *mlxsw_sp_port,
                              struct mlxsw_sp_mall_entry *mall_entry)
 {
+       struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
        int err;
 
        if (rtnl_dereference(mlxsw_sp_port->sample)) {
@@ -104,8 +105,8 @@ mlxsw_sp_mall_port_sample_add(struct mlxsw_sp_port *mlxsw_sp_port,
        }
        rcu_assign_pointer(mlxsw_sp_port->sample, &mall_entry->sample);
 
-       err = mlxsw_sp_mall_port_sample_set(mlxsw_sp_port, true,
-                                           mall_entry->sample.rate);
+       err = mlxsw_sp->mall_ops->sample_add(mlxsw_sp, mlxsw_sp_port,
+                                            mall_entry->sample.rate);
        if (err)
                goto err_port_sample_set;
        return 0;
@@ -118,10 +119,12 @@ err_port_sample_set:
 static void
 mlxsw_sp_mall_port_sample_del(struct mlxsw_sp_port *mlxsw_sp_port)
 {
+       struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
+
        if (!mlxsw_sp_port->sample)
                return;
 
-       mlxsw_sp_mall_port_sample_set(mlxsw_sp_port, false, 1);
+       mlxsw_sp->mall_ops->sample_del(mlxsw_sp, mlxsw_sp_port);
        RCU_INIT_POINTER(mlxsw_sp_port->sample, NULL);
 }
 
@@ -356,3 +359,26 @@ int mlxsw_sp_mall_prio_get(struct mlxsw_sp_flow_block *block, u32 chain_index,
        *p_max_prio = block->mall.max_prio;
        return 0;
 }
+
+static int mlxsw_sp1_mall_sample_add(struct mlxsw_sp *mlxsw_sp,
+                                    struct mlxsw_sp_port *mlxsw_sp_port,
+                                    u32 rate)
+{
+       return mlxsw_sp_mall_port_sample_set(mlxsw_sp_port, true, rate);
+}
+
+static void mlxsw_sp1_mall_sample_del(struct mlxsw_sp *mlxsw_sp,
+                                     struct mlxsw_sp_port *mlxsw_sp_port)
+{
+       mlxsw_sp_mall_port_sample_set(mlxsw_sp_port, false, 1);
+}
+
+const struct mlxsw_sp_mall_ops mlxsw_sp1_mall_ops = {
+       .sample_add = mlxsw_sp1_mall_sample_add,
+       .sample_del = mlxsw_sp1_mall_sample_del,
+};
+
+const struct mlxsw_sp_mall_ops mlxsw_sp2_mall_ops = {
+       .sample_add = mlxsw_sp1_mall_sample_add,
+       .sample_del = mlxsw_sp1_mall_sample_del,
+};