From 1f02134847c8bed09b4cda0a53cecce9b1271844 Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Wed, 9 Jul 2025 16:52:30 -0700 Subject: [PATCH] Revert "ANDROID: Add dmabuf RSS trace event" Revert submission 3680024 Reason for revert: replacing with a fixed version Reverted changes: /q/submissionid:3680024 Bug: 430499939 Change-Id: I5ba5cdbabd1e967889b3523abca289fa8e8a3ec9 Signed-off-by: Suren Baghdasaryan --- drivers/dma-buf/dma-buf.c | 5 ----- include/trace/events/kmem.h | 25 ------------------------- 2 files changed, 30 deletions(-) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index 35bea250e08d..71065b03012a 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -31,9 +31,6 @@ #include #include -#ifndef __GENKSYMS__ -#include -#endif #include #include "dma-buf-sysfs-stats.h" @@ -214,7 +211,6 @@ static int new_task_dmabuf_record(struct task_struct *task, struct dma_buf *dmab return -ENOMEM; dmabuf_info->rss += dmabuf->size; - trace_dmabuf_rss_stat(dmabuf_info->rss, dmabuf->size, dmabuf); /* * dmabuf_info->lock protects against concurrent writers, so no * worries about stale rss_hwm between the read and write, and we don't @@ -316,7 +312,6 @@ void dma_buf_unaccount_task(struct dma_buf *dmabuf, struct task_struct *task) list_del(&rec->node); kfree(rec); dmabuf_info->rss -= dmabuf->size; - trace_dmabuf_rss_stat(dmabuf_info->rss, -dmabuf->size, dmabuf); atomic64_dec(&get_dmabuf_ext(dmabuf)->num_unique_refs); } err: diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h index 896f8de946d0..68f5280a41a4 100644 --- a/include/trace/events/kmem.h +++ b/include/trace/events/kmem.h @@ -8,7 +8,6 @@ #include #include #include -#include TRACE_EVENT(kmem_cache_alloc, @@ -488,30 +487,6 @@ TRACE_EVENT(rss_stat, __print_symbolic(__entry->member, TRACE_MM_PAGES), __entry->size) ); - -TRACE_EVENT(dmabuf_rss_stat, - - TP_PROTO(size_t rss, ssize_t rss_delta, struct dma_buf *dmabuf), - - TP_ARGS(rss, rss_delta, dmabuf), - - TP_STRUCT__entry( - __field(size_t, rss) - __field(ssize_t, rss_delta) - __field(unsigned long, i_ino) - ), - - TP_fast_assign( - __entry->rss = rss; - __entry->rss_delta = rss_delta; - __entry->i_ino = file_inode(dmabuf->file)->i_ino; - ), - - TP_printk("rss=%zu delta=%zd i_ino=%lu", - __entry->rss, - __entry->rss_delta, - __entry->i_ino) - ); #endif /* _TRACE_KMEM_H */ /* This part must be outside protection */