From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C0C5D606D81F for ; Wed, 4 Nov 2026 13:09:20 +0000 (UTC) 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=DT7hAhra Received: by kanga.kvack.org (Postfix) id D53D86B05D4; Wed, 4 Nov 2026 08:09:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CFE066B05D5; Wed, 4 Nov 2026 08:09:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BEC6A6B05D6; Wed, 4 Nov 2026 08:09:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 9D1B86B05D4 for ; Wed, 4 Nov 2026 08:09:19 -0500 (EST) Received: from smtpin27.hostedemail.com (lb01a-stub [10.200.18.249]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 20148C0186 for ; Wed, 4 Nov 2026 13:09:19 +0000 (UTC) X-FDA: 85397467638.27.DC16EB8 Received: from mta0.migadu.com (out-155.mta0.migadu.com [91.218.175.155]) by imf02.hostedemail.com (Postfix) with ESMTP id 0133280006 for ; Wed, 4 Nov 2026 13:09:16 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=DT7hAhra; spf=pass (imf02.hostedemail.com: domain of ridong.chen@linux.dev designates 91.218.175.155 as permitted sender) smtp.mailfrom=ridong.chen@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; a=rsa-sha256; d=hostedemail.com; s=arc-20220608; cv=none; t=1793797757; b=hej7cfDHT1AG52ivmu8Vym0uVstV3zlKGWDu7Gf9FYm7paLipAzYxsgUtTfXvj5W+4OPv9 fakCrIummfRJuvjtVwg3JqZmmbDXEl90D9zlc95loJcs6AxFJpRGpyErio+1Q96trKbtkA jxx7wj/yVyTjnQzg8M6kl3j/ZjLMt8A= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=DT7hAhra; spf=pass (imf02.hostedemail.com: domain of ridong.chen@linux.dev designates 91.218.175.155 as permitted sender) smtp.mailfrom=ridong.chen@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1793797757; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Zvfr2SUwypM35r5h1eYbTjTbvmwGPZokIKsFS6JGOKg=; b=udxda3rzdXOR+PuVfk77Qf7B9Z0zKjsCVFY3jUetL9LP6j88K91/Ht1UHFAJuH9JSZSk0V 34cR2AgqD1k906k+3lg2F3WH0xhq5ooHa+A5+FP1ftrWSvMgUTym8JNV/eZ9iPV82/INV+ 3RFCFmvugFA1s6eifv3s/eGt181J+No= X-Envelope-To: linux-mm@kvack.org DKIM-Signature: a=rsa-sha256; bh=LgDYTWwrf+1eTwVnRyGsWmj/PoANDpmtbGlSmOVMAl8=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1793797755; v=1; x=1794402555; b=DT7hAhraYTsTXq8lVhjY88R9tFOjCDXTn78NheROyC5LC0mnBScZBwDhWDAh+1LvoNikPNRp aW6aGyRUw8EX40On+p818Hqn5T+SysheozMQzecc2+4JmDCQwTISh8sUzN27I8jLi8BXz+py2r+ vWJGYFuCytyQIUPc8cP3XVDs= X-Envelope-To: linux-mm@kvack.org Received: by smtp.migadu.com with ESMTPS id d450e0a6301e7072; Wed, 04 Nov 2026 13:09:15 +0000 X-Mizu-Trace-ID: d450e0a6301e7072 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 3/7] mm/vmscan: move struct scan_control to a dedicated header Date: Wed, 4 Nov 2026 21:08:13 +0800 Message-Id: <20261104130817.849089-4-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-Archived-By: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: dog5iqyzmtih1fb1waezm5rib9fwuziz X-Rspam-User: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 0133280006 X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-HE-Tag: 1793797756-215767 X-HE-Meta: U2FsdGVkX19RbS3drTHg/CZA1JKUSU3tHOonZoBAEaSoWz8JTDmWqp+5neW2Qj5hSDlBECuCS5Ei/x34u+xpRXVi4iD/fk/0MLmdmqz+7JZylkr8d4Xbbe5Cj7AgGZYR4chD5mDp3lpovahZG87KvnrNpv8CvKRoIcSTpK8+hZMAU/tb4p6YSMLF0uzDht/OY1+btPqfUC8P7fDcl2NRXRnbeG/Cl/Bpuj+MTnKEp/g49xe1Wnvms7eaNWlsTwM3Y4ml86HRAJZ+IvteNA9tRLY9lJ/cEb4UxtsNeQ/LN+tZtToY7SpRBAvsaHcsgEu8+knLRQ6AmCxes2Rn4UCtpwJmFmyy/i2d496KlxsJqMoe2LYBiS82EmwYKt6h5l90tMlM5H0Bjx3nfFAxZNssZWKYav+NCeRPFK9OybdFMVHHS3uQX9+CpWJgUzZhJbTE4bF6IKqWRiCKHNNs1fJ6cq272MtramNuCsfTG951BsiClg457Mw+1ILdINMDFWxQU0AiqzGZouPPcI6YiuMnJnYtj1lj3ydKGJKMJcp/oJUJi78c/AnNqdRYFbhg1Nx+Hv4J/e549QMN+kkB4s/xRDTYqzPCkdc4qEkwSwdOXPFJnqUQU4wRKr1Hd1iR42H/COjia7PSMcYbdE95wn1hscSvU7W01mBQb82VsEZMHXguhUdvUfWyb18KOnRdjeDiNPLzYL7MzmedeSuYIgXCMeQD5OZvNJV2BIr6QF4Rj95jlgAQ0rTWNGUsHrcVl/USWoPBGWiAv8D1AbO74UspPtU+G6BCzA56heYTz83U8EzzcRhitkjuadmi/DjQvRxRFwLTJ3j2IL4XR6ZhuhICaY59Ms95ZHQTvROrZPT8cR/VvJII1Uhe+QtQwgT1syMHPmUlcU/She30d4tIKJMNjANi2QqTk9UtbaHW1fcvgEoSLjXlJ/drgXxemsne6qU0vVHKrZc0gpQTCeDyCGN bJyCi4Z1 Iph+z+r9qKhzr8ZMvisS25yRN/pXmqZ7RbhbEt06rEMybO0KlkZP8cjAM+VE7wNRPIxc1/9ztbn9tzmXj1KJ52MvljaQgG0Blv/cZXdXmkfPLc1bI3i2eJNKUwSyLD1HnL7jk2Gg+PmqFjj48btB4m1VmyuOXv0a0qvX29jiT6jtFpJaA22scw9V0+cBLALCgN4/hkBPsjZpn+oKSV1QlnYuvSVX6+AilrqbOfVo10wM8/yl8r4+DX6xoZrLwvHk8iR81hHkZHzp3FLYstfRuIse+i5grDY4s70XAetJO13JQ0HBAzgkyqsdXrkX6HcbkUj+GAGOwVLogJcSl85lxbXEOM5Xyik254nuwB4MFHdx8shw= Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 From: Ridong Chen The definition of struct scan_control has lived inline at the top of mm/vmscan.c. Move it out to a new mm/vmscan.h so the reclaim-internal state can be referenced from other reclaim translation units without duplicating the definition. The header uses an ordinary include guard and pulls in only what the struct needs (nodemask_t, gfp_t and struct reclaim_state). mm/trace_vmscan.h includes the new header directly so that any translation unit pulling in the trace events (mm/vmscan.c, mm/shrinker.c) sees the full definition of struct scan_control regardless of include order. No functional change. Acked-by: Muchun Song Reviewed-by: Baoquan He Signed-off-by: Ridong Chen --- MAINTAINERS | 2 + mm/trace_vmscan.h | 2 + mm/vmscan.c | 108 ------------------------------------------ mm/vmscan.h | 118 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 122 insertions(+), 108 deletions(-) create mode 100644 mm/vmscan.h diff --git a/MAINTAINERS b/MAINTAINERS index 828e81ea671b..82823440247d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17643,6 +17643,7 @@ F: include/linux/mm_inline.h F: include/linux/mmzone.h F: mm/trace_vmscan.h F: mm/vmscan.c +F: mm/vmscan.h F: mm/workingset.c MEMORY MANAGEMENT - MIGRATION @@ -17807,6 +17808,7 @@ L: linux-mm@kvack.org S: Maintained F: mm/trace_vmscan.h F: mm/vmscan.c +F: mm/vmscan.h F: mm/workingset.c MEMORY MANAGEMENT - RMAP (REVERSE MAPPING) diff --git a/mm/trace_vmscan.h b/mm/trace_vmscan.h index ad90f0e9bf2e..3917e1b62dfa 100644 --- a/mm/trace_vmscan.h +++ b/mm/trace_vmscan.h @@ -11,6 +11,8 @@ #include #include +#include "vmscan.h" + #define RECLAIM_WB_ANON 0x0001u #define RECLAIM_WB_FILE 0x0002u #define RECLAIM_WB_MIXED 0x0010u diff --git a/mm/vmscan.c b/mm/vmscan.c index 35d4e912660f..d9c3c5d020ed 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -73,114 +73,6 @@ #define CREATE_TRACE_POINTS #include "trace_vmscan.h" -struct scan_control { - /* How many pages shrink_list() should reclaim */ - unsigned long nr_to_reclaim; - - /* - * Nodemask of nodes allowed by the caller. If NULL, all nodes - * are scanned. - */ - const nodemask_t *nodemask; - - /* - * The memory cgroup that hit its limit and as a result is the - * primary target of this reclaim invocation. - */ - struct mem_cgroup *target_mem_cgroup; - - /* - * Scan pressure balancing between anon and file LRUs - */ - unsigned long anon_cost; - unsigned long file_cost; - - /* Swappiness value for proactive reclaim. Always use sc_swappiness()! */ - int *proactive_swappiness; - - /* Can active folios be deactivated as part of reclaim? */ -#define DEACTIVATE_ANON 1 -#define DEACTIVATE_FILE 2 - unsigned int may_deactivate:2; - unsigned int force_deactivate:1; - unsigned int skipped_deactivate:1; - - /* zone_reclaim_mode, boost reclaim */ - unsigned int may_writepage:1; - - /* zone_reclaim_mode */ - unsigned int may_unmap:1; - - /* zone_reclaim_mode, boost reclaim, cgroup restrictions */ - unsigned int may_swap:1; - - /* Not allow cache_trim_mode to be turned on as part of reclaim? */ - unsigned int no_cache_trim_mode:1; - - /* Has cache_trim_mode failed at least once? */ - unsigned int cache_trim_mode_failed:1; - - /* Proactive reclaim invoked by userspace */ - unsigned int proactive:1; - - /* - * Cgroup memory below memory.low is protected as long as we - * don't threaten to OOM. If any cgroup is reclaimed at - * reduced force or passed over entirely due to its memory.low - * setting (memcg_low_skipped), and nothing is reclaimed as a - * result, then go back for one more cycle that reclaims the protected - * memory (memcg_low_reclaim) to avert OOM. - */ - unsigned int memcg_low_reclaim:1; - unsigned int memcg_low_skipped:1; - - /* Shared cgroup tree walk failed, rescan the whole tree */ - unsigned int memcg_full_walk:1; - - unsigned int hibernation_mode:1; - - /* One of the zones is ready for compaction */ - unsigned int compaction_ready:1; - - /* There is easily reclaimable cold cache in the current node */ - unsigned int cache_trim_mode:1; - - /* The file folios on the current node are dangerously low */ - unsigned int file_is_tiny:1; - - /* Always discard instead of demoting to lower tier memory */ - unsigned int no_demotion:1; - - /* Allocation order */ - s8 order; - - /* Scan (total_size >> priority) pages at once */ - s8 priority; - - /* The highest zone to isolate folios for reclaim from */ - s8 reclaim_idx; - - /* This context's GFP mask */ - gfp_t gfp_mask; - - /* Incremented by the number of inactive pages that were scanned */ - unsigned long nr_scanned; - - /* Number of pages freed so far during a call to shrink_zones() */ - unsigned long nr_reclaimed; - - struct { - unsigned int dirty; - unsigned int congested; - unsigned int writeback; - unsigned int immediate; - unsigned int taken; - } nr; - - /* for recording the reclaimed slab by now */ - struct reclaim_state reclaim_state; -}; - #ifdef ARCH_HAS_PREFETCHW static inline void prefetchw_prev_lru_folio(struct folio *folio, struct list_head *base) diff --git a/mm/vmscan.h b/mm/vmscan.h new file mode 100644 index 000000000000..adb22e80d760 --- /dev/null +++ b/mm/vmscan.h @@ -0,0 +1,118 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _MM_VMSCAN_H +#define _MM_VMSCAN_H + +#include +#include +#include +#include + +struct scan_control { + /* How many pages shrink_list() should reclaim */ + unsigned long nr_to_reclaim; + + /* + * Nodemask of nodes allowed by the caller. If NULL, all nodes + * are scanned. + */ + const nodemask_t *nodemask; + + /* + * The memory cgroup that hit its limit and as a result is the + * primary target of this reclaim invocation. + */ + struct mem_cgroup *target_mem_cgroup; + + /* + * Scan pressure balancing between anon and file LRUs + */ + unsigned long anon_cost; + unsigned long file_cost; + + /* Swappiness value for proactive reclaim. Always use sc_swappiness()! */ + int *proactive_swappiness; + + /* Can active folios be deactivated as part of reclaim? */ +#define DEACTIVATE_ANON 1 +#define DEACTIVATE_FILE 2 + unsigned int may_deactivate:2; + unsigned int force_deactivate:1; + unsigned int skipped_deactivate:1; + + /* zone_reclaim_mode, boost reclaim */ + unsigned int may_writepage:1; + + /* zone_reclaim_mode */ + unsigned int may_unmap:1; + + /* zone_reclaim_mode, boost reclaim, cgroup restrictions */ + unsigned int may_swap:1; + + /* Not allow cache_trim_mode to be turned on as part of reclaim? */ + unsigned int no_cache_trim_mode:1; + + /* Has cache_trim_mode failed at least once? */ + unsigned int cache_trim_mode_failed:1; + + /* Proactive reclaim invoked by userspace */ + unsigned int proactive:1; + + /* + * Cgroup memory below memory.low is protected as long as we + * don't threaten to OOM. If any cgroup is reclaimed at + * reduced force or passed over entirely due to its memory.low + * setting (memcg_low_skipped), and nothing is reclaimed as a + * result, then go back for one more cycle that reclaims the protected + * memory (memcg_low_reclaim) to avert OOM. + */ + unsigned int memcg_low_reclaim:1; + unsigned int memcg_low_skipped:1; + + /* Shared cgroup tree walk failed, rescan the whole tree */ + unsigned int memcg_full_walk:1; + + unsigned int hibernation_mode:1; + + /* One of the zones is ready for compaction */ + unsigned int compaction_ready:1; + + /* There is easily reclaimable cold cache in the current node */ + unsigned int cache_trim_mode:1; + + /* The file folios on the current node are dangerously low */ + unsigned int file_is_tiny:1; + + /* Always discard instead of demoting to lower tier memory */ + unsigned int no_demotion:1; + + /* Allocation order */ + s8 order; + + /* Scan (total_size >> priority) pages at once */ + s8 priority; + + /* The highest zone to isolate folios for reclaim from */ + s8 reclaim_idx; + + /* This context's GFP mask */ + gfp_t gfp_mask; + + /* Incremented by the number of inactive pages that were scanned */ + unsigned long nr_scanned; + + /* Number of pages freed so far during a call to shrink_zones() */ + unsigned long nr_reclaimed; + + struct { + unsigned int dirty; + unsigned int congested; + unsigned int writeback; + unsigned int immediate; + unsigned int taken; + } nr; + + /* for recording the reclaimed slab by now */ + struct reclaim_state reclaim_state; +}; + +#endif /* _MM_VMSCAN_H */ -- 2.34.1