mlxsw: spectrum_acl: Add couple of vregion rehash tracepoints

As vregion rehash is happening in delayed work, add some visibility to
the process using a few tracepoints.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
index f2cb37c0d300f1f6fc5785620bcf2c5c9cc4b977..7e225a86e3a800e4d00b6d70a1374fd098f69366 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
@@ -8,6 +8,7 @@
 #include <linux/list.h>
 #include <linux/rhashtable.h>
 #include <linux/netdevice.h>
+#include <trace/events/mlxsw.h>
 
 #include "reg.h"
 #include "core.h"
@@ -1175,6 +1176,8 @@ mlxsw_sp_acl_tcam_vregion_migrate(struct mlxsw_sp *mlxsw_sp,
        struct mlxsw_sp_acl_tcam_region *region2, *unused_region;
        int err;
 
+       trace_mlxsw_sp_acl_tcam_vregion_migrate(mlxsw_sp, vregion);
+
        region2 = mlxsw_sp_acl_tcam_region_create(mlxsw_sp, vregion->tcam,
                                                  vregion, hints_priv);
        if (IS_ERR(region2))
@@ -1219,6 +1222,7 @@ mlxsw_sp_acl_tcam_vregion_rehash(struct mlxsw_sp *mlxsw_sp,
        void *hints_priv;
        int err;
 
+       trace_mlxsw_sp_acl_tcam_vregion_rehash(mlxsw_sp, vregion);
        if (vregion->failed_rollback)
                return -EBUSY;
 
@@ -1233,8 +1237,11 @@ mlxsw_sp_acl_tcam_vregion_rehash(struct mlxsw_sp *mlxsw_sp,
        err = mlxsw_sp_acl_tcam_vregion_migrate(mlxsw_sp, vregion, hints_priv);
        if (err) {
                dev_err(mlxsw_sp->bus_info->dev, "Failed to migrate vregion\n");
-               if (vregion->failed_rollback)
+               if (vregion->failed_rollback) {
+                       trace_mlxsw_sp_acl_tcam_vregion_rehash_dis(mlxsw_sp,
+                                                                  vregion);
                        dev_err(mlxsw_sp->bus_info->dev, "Failed to rollback during vregion migration fail\n");
+               }
        }
 
        ops->region_rehash_hints_put(hints_priv);

diff --git a/include/trace/events/mlxsw.h b/include/trace/events/mlxsw.h
index 6c2bafcade1805e3d8b2308b23015b2ea7d95080..a5ce6df9dc49e6c37fb03d73ead08953030ed591 100644 (file)
--- a/include/trace/events/mlxsw.h
+++ b/include/trace/events/mlxsw.h
@@ -11,6 +11,7 @@
 
 struct mlxsw_sp;
 struct mlxsw_sp_acl_atcam_region;
+struct mlxsw_sp_acl_tcam_vregion;
 
 TRACE_EVENT(mlxsw_sp_acl_atcam_entry_add_ctcam_spill,
        TP_PROTO(const struct mlxsw_sp *mlxsw_sp,
@@ -32,6 +33,66 @@ TRACE_EVENT(mlxsw_sp_acl_atcam_entry_add_ctcam_spill,
                  __entry->mlxsw_sp, __entry->aregion)
 );
 
+TRACE_EVENT(mlxsw_sp_acl_tcam_vregion_rehash,
+       TP_PROTO(const struct mlxsw_sp *mlxsw_sp,
+                const struct mlxsw_sp_acl_tcam_vregion *vregion),
+
+       TP_ARGS(mlxsw_sp, vregion),
+
+       TP_STRUCT__entry(
+               __field(const void *, mlxsw_sp)
+               __field(const void *, vregion)
+       ),
+
+       TP_fast_assign(
+               __entry->mlxsw_sp = mlxsw_sp;
+               __entry->vregion = vregion;
+       ),
+
+       TP_printk("mlxsw_sp %p, vregion %p",
+                 __entry->mlxsw_sp, __entry->vregion)
+);
+
+TRACE_EVENT(mlxsw_sp_acl_tcam_vregion_migrate,
+       TP_PROTO(const struct mlxsw_sp *mlxsw_sp,
+                const struct mlxsw_sp_acl_tcam_vregion *vregion),
+
+       TP_ARGS(mlxsw_sp, vregion),
+
+       TP_STRUCT__entry(
+               __field(const void *, mlxsw_sp)
+               __field(const void *, vregion)
+       ),
+
+       TP_fast_assign(
+               __entry->mlxsw_sp = mlxsw_sp;
+               __entry->vregion = vregion;
+       ),
+
+       TP_printk("mlxsw_sp %p, vregion %p",
+                 __entry->mlxsw_sp, __entry->vregion)
+);
+
+TRACE_EVENT(mlxsw_sp_acl_tcam_vregion_rehash_dis,
+       TP_PROTO(const struct mlxsw_sp *mlxsw_sp,
+                const struct mlxsw_sp_acl_tcam_vregion *vregion),
+
+       TP_ARGS(mlxsw_sp, vregion),
+
+       TP_STRUCT__entry(
+               __field(const void *, mlxsw_sp)
+               __field(const void *, vregion)
+       ),
+
+       TP_fast_assign(
+               __entry->mlxsw_sp = mlxsw_sp;
+               __entry->vregion = vregion;
+       ),
+
+       TP_printk("mlxsw_sp %p, vregion %p",
+                 __entry->mlxsw_sp, __entry->vregion)
+);
+
 #endif /* _MLXSW_TRACEPOINT_H */
 
 /* This part must be outside protection */