From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=95.215.58.15 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793797749; b=uMmzjhN6x5Mj5W7+A7Hfyi6g0TmUd4L2AuJgWvTVcM1QyNS48QCNDIMOKlDm/Ant0TNn O4r9m9+q258l7pSF0xTl2KfbVgsJCkZXl0SNokH4mzCTiaZ+wMGYExpODQjwTIZWPXt5b 6Lpt9pMCrvopvZcpzm7Ay8RjPnap9NEi/1TRYhfoFvZ9qhI+uDONirNjwkqHiQadJ6YkX YG2R1dOkhCGUj1yzOYJXQsN7UaSLp8+J7opysw9Bbf+QBCuZCXgYuQK7T7ao6ZYuvVgVm fsNxGnr6wcBKclCNwW/MLF5vbvy66a7pMZ0shWuBK7hQS8UWrVnM04SpxvMQQDkJHhg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793797749; h=DMARC-Filter:X-Envelope-To:DKIM-Signature:X-Envelope-To:Received: X-Mizu-Trace-ID:X-Migadu-Flow:From:To:Cc:Subject:Date:Message-Id: X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=mMj9DsaokfZtgsqnV6TFbPevB3nCiHX8pv9BJn7VaUQ=; b=N5gWYhEF+woZIvJKfuKRDXxmUOIuUC8Y3EuCGA9KQyhQ1Y+AeAOanX7bBlTTV3d/ON3I 66mm7LF0uJ0G3cRvmGYnU8Irnjju+MAL+9JMGkvjExJO3GSjlVjt2WY+/2/iGYo/yCB5r kOH580mDZ+5y/5PWFwgZTCrQIEoR5kxLv5In0yQza75OkarsOjs2X2yH8k/CA8yFUrx3D sAsJDHZDhThO6+Vl2rcSS47xXkMKZsdtYKPpZk7CAmO0rzOpmf3yDEl0TRxcGfhFNcdTr oH37NmxYSudohZkE0VhBJtWAoyfh8b5oOS3PWC7k8KOAMw1TbecO1A7N/CL0ihDQOxA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=qI+ArD6G; arc=none smtp.remote-ip=95.215.58.15 Received: from mta1.migadu.com (out-15.mta1.migadu.com [95.215.58.15]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C1470606A33F for ; Wed, 4 Nov 2026 13:09:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org C1470606A33F Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=qI+ArD6G X-Envelope-To: cgroups@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=3mp35FVnC01ZETH9MQAgpB4MjCtcUcbT1L9D0SvFH00=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1793797745; v=1; x=1794402545; b=qI+ArD6GB3vrgT+gZub3OCA5td7KP2iUh8p2fDpW6hXaaLiTOJNrI74PCTJjG/vCFtEIx5iI HsRySXzw+cexcTIOVPOKK+XAHT5DM2fRyIGYO3+QgSLxr0i3B0EUAFuBOaVim/2rrRt5R2YqFk+ jVmgcvdKaBqrrTxqzIxW5VKc= X-Envelope-To: cgroups@vger.kernel.org Received: by smtp.migadu.com with ESMTPS id 2c69226caf1c61eb; Wed, 04 Nov 2026 13:09:05 +0000 X-Mizu-Trace-ID: 2c69226caf1c61eb X-Migadu-Flow: FLOW_OUT From: Ridong Chen To: Andrew Morton , Johannes Weiner , Steven Rostedt , Masami Hiramatsu , Roman Gushchin , Dave Chinner Cc: David Hildenbrand , Michal Hocko , Qi Zheng , Shakeel Butt , Lorenzo Stoakes , Mathieu Desnoyers , Muchun Song , Kairui Song , Barry Song , Axel Rasmussen , Yuanchu Xie , Wei Xu , Baoquan He , Baolin Wang , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org, cgroups@vger.kernel.org (open list:CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)), bpf@vger.kernel.org (open list:BPF [MISC]:Keyword:(?:\b|_)bpf(?:\b|_)), Ridong Chen , Ridong Chen Subject: [PATCH v7 2/7] mm/vmscan: move vmscan tracepoints to a local header Date: Wed, 4 Nov 2026 21:08:12 +0800 Message-Id: <20261104130817.849089-3-ridong.chen@linux.dev> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20261104130817.849089-1-ridong.chen@linux.dev> References: <20261104130817.849089-1-ridong.chen@linux.dev> X-Mailing-List: cgroups@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Ridong Chen 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/fuse/fuse_trace.h, fs/gfs2/trace_gfs2.h, fs/lockd/trace.h). As they do, set TRACE_INCLUDE_PATH to "." and add mm/ to the include path of vmscan.o, the only user that defines CREATE_TRACE_POINTS. No functional change. Reviewed-by: Barry Song Reviewed-by: Baoquan He Acked-by: Muchun Song Signed-off-by: Ridong Chen --- MAINTAINERS | 3 ++- mm/Makefile | 1 + mm/shrinker.c | 2 +- include/trace/events/vmscan.h => mm/trace_vmscan.h | 4 ++++ mm/vmscan.c | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) rename include/trace/events/vmscan.h => mm/trace_vmscan.h (99%) diff --git a/MAINTAINERS b/MAINTAINERS index d63d8b215277..828e81ea671b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17641,6 +17641,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 @@ -17804,7 +17805,7 @@ R: Shakeel Butt R: Lorenzo Stoakes L: linux-mm@kvack.org S: Maintained -F: include/trace/events/vmscan.h +F: mm/trace_vmscan.h F: mm/vmscan.c F: mm/workingset.c diff --git a/mm/Makefile b/mm/Makefile index 2a3ec53d62ee..277b97f7f8d7 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -32,6 +32,7 @@ KCOV_INSTRUMENT_vmstat.o := n KCOV_INSTRUMENT_failslab.o := n CFLAGS_init-mm.o += -Wno-override-init +CFLAGS_vmscan.o += -I$(src) mmu-y := nommu.o mmu-$(CONFIG_MMU) := highmem.o memory.o mincore.o \ diff --git a/mm/shrinker.c b/mm/shrinker.c index 4fb424e721bc..4fbdade6d2f6 100644 --- a/mm/shrinker.c +++ b/mm/shrinker.c @@ -3,7 +3,7 @@ #include #include #include -#include +#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..ad90f0e9bf2e 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 . +#define TRACE_INCLUDE_FILE trace_vmscan #include diff --git a/mm/vmscan.c b/mm/vmscan.c index 7db6be53f3a9..35d4e912660f 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -71,7 +71,7 @@ #include "swap.h" #define CREATE_TRACE_POINTS -#include +#include "trace_vmscan.h" struct scan_control { /* How many pages shrink_list() should reclaim */ -- 2.34.1