[PATCH RFC 2/4] mm/vmscan: move vmscan tracepoints to a local header
flat view
COLD28d
SUPERSEDED
From: Ridong Chen <ridong.chen@linux.dev>
Date: 2026-09-21 11:46:51
Also in:
cgroups, linux-mm, lkml
Subsystem:
memory management, memory management - mglru (multi-gen lru), memory management - reclaim, shrinker, the rest · Maintainers:
Andrew Morton, Johannes Weiner, Dave Chinner, Linus Torvalds
Revision rfc of 3 in this series.
Revisions (3)
- rfc current
- v2 [diff vs current]
- v3 [diff vs current]
From: Ridong Chen <redacted> Move include/trace/events/vmscan.h to mm/trace_vmscan.h so that the tracepoints can be extended to reference vmscan-internal structures such as struct scan_control, which is not visible outside mm/. This mirrors what several other subsystems already do with their trace headers (e.g. fs/ext2, kernel/trace/trace_benchmark). No functional change. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Ridong Chen <redacted> --- MAINTAINERS | 2 ++ mm/shrinker.c | 2 +- include/trace/events/vmscan.h => mm/trace_vmscan.h | 4 ++++ mm/vmscan.c | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) rename include/trace/events/vmscan.h => mm/trace_vmscan.h (99%)
diff --git a/MAINTAINERS b/MAINTAINERS
index e26b963d4001..c1dbb35273c4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS@@ -17227,6 +17227,7 @@ F: Documentation/admin-guide/mm/multigen_lru.rst F: Documentation/mm/multigen_lru.rst F: include/linux/mm_inline.h F: include/linux/mmzone.h +F: mm/trace_vmscan.h F: mm/vmscan.c F: mm/workingset.c
@@ -17374,6 +17375,7 @@ R: Shakeel Butt <shakeel.butt@linux.dev> R: Lorenzo Stoakes <ljs@kernel.org> L: linux-mm@kvack.org S: Maintained +F: mm/trace_vmscan.h F: mm/vmscan.c F: mm/workingset.c
diff --git a/mm/shrinker.c b/mm/shrinker.c
index 7ec2a9704f6f..3c3e87c4b61c 100644
--- a/mm/shrinker.c
+++ b/mm/shrinker.c@@ -3,7 +3,7 @@ #include <linux/rwsem.h> #include <linux/shrinker.h> #include <linux/rculist.h> -#include <trace/events/vmscan.h> +#include "trace_vmscan.h" #include "internal.h"
diff --git a/include/trace/events/vmscan.h b/mm/trace_vmscan.h
similarity index 99%
rename from include/trace/events/vmscan.h
rename to mm/trace_vmscan.h
index 8a872990b4be..c5d824fef554 100644
--- a/include/trace/events/vmscan.h
+++ b/mm/trace_vmscan.h@@ -648,4 +648,8 @@ TRACE_EVENT(mm_vmscan_kswapd_clear_hopeless, #endif /* _TRACE_VMSCAN_H */ /* This part must be outside protection */ +#undef TRACE_INCLUDE_FILE +#undef TRACE_INCLUDE_PATH +#define TRACE_INCLUDE_PATH ../../mm +#define TRACE_INCLUDE_FILE trace_vmscan #include <trace/define_trace.h>
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 91295070ca33..0eb7fa8e1d43 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c@@ -71,7 +71,7 @@ #include "swap.h" #define CREATE_TRACE_POINTS -#include <trace/events/vmscan.h> +#include "trace_vmscan.h" struct scan_control { /* How many pages shrink_list() should reclaim */
--
2.34.1