mlxsw: spectrum_dpipe: Add support for controlling neighbor counters

Add support for controlling neighbor counters via dpipe.

Signed-off-by: Arkadi Sharshevsky <arkadis@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_dpipe.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c
index 94d954bbee16a15280f8d28e78df01b81cfa409f..3c8599f14bff0c8ba22ad9d837869ce1b1183f56 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c
@@ -599,6 +599,38 @@ mlxsw_sp_dpipe_table_host4_entries_dump(void *priv, bool counters_enabled,
                                                      dump_ctx, AF_INET);
 }
 
+static void
+mlxsw_sp_dpipe_table_host_counters_update(struct mlxsw_sp *mlxsw_sp,
+                                         bool enable, int type)
+{
+       int i;
+
+       rtnl_lock();
+       for (i = 0; i < MLXSW_CORE_RES_GET(mlxsw_sp->core, MAX_RIFS); i++) {
+               struct mlxsw_sp_rif *rif = mlxsw_sp_rif_by_index(mlxsw_sp, i);
+               struct mlxsw_sp_neigh_entry *neigh_entry;
+
+               if (!rif)
+                       continue;
+               mlxsw_sp_rif_neigh_for_each(neigh_entry, rif) {
+                       if (mlxsw_sp_neigh_entry_type(neigh_entry) != type)
+                               continue;
+                       mlxsw_sp_neigh_entry_counter_update(mlxsw_sp,
+                                                           neigh_entry,
+                                                           enable);
+               }
+       }
+       rtnl_unlock();
+}
+
+static int mlxsw_sp_dpipe_table_host4_counters_update(void *priv, bool enable)
+{
+       struct mlxsw_sp *mlxsw_sp = priv;
+
+       mlxsw_sp_dpipe_table_host_counters_update(mlxsw_sp, enable, AF_INET);
+       return 0;
+}
+
 static u64
 mlxsw_sp_dpipe_table_host_size_get(struct mlxsw_sp *mlxsw_sp, int type)
 {
@@ -634,6 +666,7 @@ static struct devlink_dpipe_table_ops mlxsw_sp_host4_ops = {
        .matches_dump = mlxsw_sp_dpipe_table_host4_matches_dump,
        .actions_dump = mlxsw_sp_dpipe_table_host4_actions_dump,
        .entries_dump = mlxsw_sp_dpipe_table_host4_entries_dump,
+       .counters_set_update = mlxsw_sp_dpipe_table_host4_counters_update,
        .size_get = mlxsw_sp_dpipe_table_host4_size_get,
 };
 

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index abccd84235ebd7786803f95c349039ea84e1c727..377d85cff7fab9204c4d0c4b37bb606bf4cfa6c8 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -1429,6 +1429,18 @@ mlxsw_sp_neigh_entry_update(struct mlxsw_sp *mlxsw_sp,
        }
 }
 
+void
+mlxsw_sp_neigh_entry_counter_update(struct mlxsw_sp *mlxsw_sp,
+                                   struct mlxsw_sp_neigh_entry *neigh_entry,
+                                   bool adding)
+{
+       if (adding)
+               mlxsw_sp_neigh_counter_alloc(mlxsw_sp, neigh_entry);
+       else
+               mlxsw_sp_neigh_counter_free(mlxsw_sp, neigh_entry);
+       mlxsw_sp_neigh_entry_update(mlxsw_sp, neigh_entry, true);
+}
+
 struct mlxsw_sp_neigh_event_work {
        struct work_struct work;
        struct mlxsw_sp *mlxsw_sp;

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h
index aafae469be3af3a74263c48951663d5e27a460e6..fb0f971c670cb9c5084170c78a0fae3d34340957 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h
@@ -72,5 +72,9 @@ u32 mlxsw_sp_neigh4_entry_dip(struct mlxsw_sp_neigh_entry *neigh_entry);
 int mlxsw_sp_neigh_counter_get(struct mlxsw_sp *mlxsw_sp,
                               struct mlxsw_sp_neigh_entry *neigh_entry,
                               u64 *p_counter);
+void
+mlxsw_sp_neigh_entry_counter_update(struct mlxsw_sp *mlxsw_sp,
+                                   struct mlxsw_sp_neigh_entry *neigh_entry,
+                                   bool adding);
 
 #endif /* _MLXSW_ROUTER_H_*/