From 148774f9cf99ca6bb5d14a273bdac4d1b6af4ad4 Mon Sep 17 00:00:00 2001 From: Shakeel Butt Date: Tue, 15 Oct 2024 14:37:21 -0700 Subject: [PATCH] memcg-add-tracing-for-memcg-stat-updates-v2 use unsigned long type for memcg_rstat_events, per Yosry Link: https://lkml.kernel.org/r/20241015213721.3804209-1-shakeel.butt@linux.dev Signed-off-by: Shakeel Butt Acked-by: Roman Gushchin Reviewed-by: Yosry Ahmed Acked-by: Johannes Weiner Cc: Michal Hocko Cc: Muchun Song Cc: JP Kobryn Cc: Steven Rostedt (Google) Signed-off-by: Andrew Morton --- include/trace/events/memcg.h | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/include/trace/events/memcg.h b/include/trace/events/memcg.h index 913db9aba580..8667e57816d2 100644 --- a/include/trace/events/memcg.h +++ b/include/trace/events/memcg.h @@ -9,7 +9,7 @@ #include -DECLARE_EVENT_CLASS(memcg_rstat, +DECLARE_EVENT_CLASS(memcg_rstat_stats, TP_PROTO(struct mem_cgroup *memcg, int item, int val), @@ -31,23 +31,45 @@ DECLARE_EVENT_CLASS(memcg_rstat, __entry->id, __entry->item, __entry->val) ); -DEFINE_EVENT(memcg_rstat, mod_memcg_state, +DEFINE_EVENT(memcg_rstat_stats, mod_memcg_state, TP_PROTO(struct mem_cgroup *memcg, int item, int val), TP_ARGS(memcg, item, val) ); -DEFINE_EVENT(memcg_rstat, mod_memcg_lruvec_state, +DEFINE_EVENT(memcg_rstat_stats, mod_memcg_lruvec_state, TP_PROTO(struct mem_cgroup *memcg, int item, int val), TP_ARGS(memcg, item, val) ); -DEFINE_EVENT(memcg_rstat, count_memcg_events, +DECLARE_EVENT_CLASS(memcg_rstat_events, - TP_PROTO(struct mem_cgroup *memcg, int item, int val), + TP_PROTO(struct mem_cgroup *memcg, int item, unsigned long val), + + TP_ARGS(memcg, item, val), + + TP_STRUCT__entry( + __field(u64, id) + __field(int, item) + __field(unsigned long, val) + ), + + TP_fast_assign( + __entry->id = cgroup_id(memcg->css.cgroup); + __entry->item = item; + __entry->val = val; + ), + + TP_printk("memcg_id=%llu item=%d val=%lu", + __entry->id, __entry->item, __entry->val) +); + +DEFINE_EVENT(memcg_rstat_events, count_memcg_events, + + TP_PROTO(struct mem_cgroup *memcg, int item, unsigned long val), TP_ARGS(memcg, item, val) ); -- 2.50.1