From cbf08185402d7d29c5cefe5cc4c69e284d53712c Mon Sep 17 00:00:00 2001 From: Kalesh Singh Date: Wed, 17 Nov 2021 10:24:44 -0800 Subject: [PATCH] Revert "ANDROID: mm: Throttle rss_stat tracepoint" This reverts commit 77dfeaa02dc3cea434aa19cf70537e0d3d3d9b8b. Throttling can now be done using hist triggers and synthetic events Bug: 145972256 Signed-off-by: Kalesh Singh Change-Id: I39c284040e2fdb815cda980f3a40ef188e59287c --- include/linux/mm.h | 9 ++++----- mm/memory.c | 16 ++-------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 46629d1577ab..14187313fa49 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2059,28 +2059,27 @@ static inline unsigned long get_mm_counter(struct mm_struct *mm, int member) return (unsigned long)val; } -void mm_trace_rss_stat(struct mm_struct *mm, int member, long count, - long value); +void mm_trace_rss_stat(struct mm_struct *mm, int member, long count); static inline void add_mm_counter(struct mm_struct *mm, int member, long value) { long count = atomic_long_add_return(value, &mm->rss_stat.count[member]); - mm_trace_rss_stat(mm, member, count, value); + mm_trace_rss_stat(mm, member, count); } static inline void inc_mm_counter(struct mm_struct *mm, int member) { long count = atomic_long_inc_return(&mm->rss_stat.count[member]); - mm_trace_rss_stat(mm, member, count, 1); + mm_trace_rss_stat(mm, member, count); } static inline void dec_mm_counter(struct mm_struct *mm, int member) { long count = atomic_long_dec_return(&mm->rss_stat.count[member]); - mm_trace_rss_stat(mm, member, count, -1); + mm_trace_rss_stat(mm, member, count); } /* Optimized variant when page is already known not to be PageAnon */ diff --git a/mm/memory.c b/mm/memory.c index bac81b873059..4a08af086248 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -168,21 +168,9 @@ static int __init init_zero_pfn(void) } early_initcall(init_zero_pfn); -/* - * Only trace rss_stat when there is a 512kb cross over. - * Smaller changes may be lost unless every small change is - * crossing into or returning to a 512kb boundary. - */ -#define TRACE_MM_COUNTER_THRESHOLD 128 - -void mm_trace_rss_stat(struct mm_struct *mm, int member, long count, - long value) +void mm_trace_rss_stat(struct mm_struct *mm, int member, long count) { - long thresh_mask = ~(TRACE_MM_COUNTER_THRESHOLD - 1); - - /* Threshold roll-over, trace it */ - if ((count & thresh_mask) != ((count - value) & thresh_mask)) - trace_rss_stat(mm, member, count); + trace_rss_stat(mm, member, count); } EXPORT_SYMBOL_GPL(mm_trace_rss_stat);