From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4B91CCCA46C for ; Mon, 19 Oct 2026 03:53:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4AF9C6B0103; Sun, 18 Oct 2026 23:53:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 489956B0104; Sun, 18 Oct 2026 23:53:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 377036B0105; Sun, 18 Oct 2026 23:53:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 0F4E36B0103 for ; Sun, 18 Oct 2026 23:53:33 -0400 (EDT) Received: from smtpin19.hostedemail.com (lb01a-stub [10.200.18.249]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 7D24C1405A3 for ; Mon, 19 Oct 2026 03:53:32 +0000 (UTC) X-FDA: 85338006264.19.4B5E8B8 Received: from mta1.migadu.com (out-156.mta1.migadu.com [95.215.58.156]) by imf15.hostedemail.com (Postfix) with ESMTP id 6B74FA0003 for ; Mon, 19 Oct 2026 03:53:30 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=K2oR9UGM; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf15.hostedemail.com: domain of ridong.chen@linux.dev designates 95.215.58.156 as permitted sender) smtp.mailfrom=ridong.chen@linux.dev ARC-Seal: i=1; a=rsa-sha256; d=hostedemail.com; s=arc-20220608; cv=none; t=1792382010; b=1OjU3SyckENJq7rkDdbwbVLsGHt2AAwsrgOUw9cp6WPAkYQpj15wrSIm2To5xelEga71QM ABq0K+zux++tZAhSYKlIGa4gU9v5M0kwhYiIXXTA/dj1DNObkFPVXJD9YFUrIjXY+fBQEH EPIO4G6xealPhK99v1h4r2Es2YoK1jY= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=K2oR9UGM; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf15.hostedemail.com: domain of ridong.chen@linux.dev designates 95.215.58.156 as permitted sender) smtp.mailfrom=ridong.chen@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1792382010; 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=LcHpl0Mfj0IB5kJxOqdL06/S370cn6yK6KNylewoyos=; b=G6dZYbiWMwBLJV25CIsD58PZb61MO7xQ1FPRK+Y7pK+0Xg9J8apx6Nde+HXt9Felv6lJBC 3wKT+SC5rphwPgBSVNzqZNxuUcPX0uO80/SCGE2HsEyHvdsGzNC/15f6nTYwexc7cohcm6 gux9PwMyIKRl8cshvtzE/tC87S//DE8= X-Envelope-To: linux-mm@kvack.org DKIM-Signature: a=rsa-sha256; bh=HCgRLK49I/27Xd5v+Pr2aeUyWupcJv4Ntv0I9REz8wk=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1792382009; v=1; x=1792986809; b=K2oR9UGMcJBnspSYImJ60lsukFFYeaC7KJXMvskQA3SIFw8Pqif6jy1JnT8lHiriUCDUbp3r gId82IekB8RVgwN5LP24u3vx49lrvj3pzjozsr+MF7C22tn4VMteYPDTvroWS9ULE46NfLH3/o4 fDQPptSlmZ+mkuynnG3H5NCs= X-Envelope-To: linux-mm@kvack.org Received: by smtp.migadu.com with ESMTPS id 9c7ed3c049b55103; Mon, 19 Oct 2026 03:53:28 +0000 X-Mizu-Trace-ID: 9c7ed3c049b55103 X-Migadu-Flow: FLOW_OUT From: Ridong Chen To: Steven Rostedt , Masami Hiramatsu , Andrew Morton , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Dave Chinner Cc: Mathieu Desnoyers , Muchun Song , Qi Zheng , David Hildenbrand , Lorenzo Stoakes , Kairui Song , Barry Song , Axel Rasmussen , Yuanchu Xie , Wei Xu , Baoquan He , Baolin Wang , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, bpf@vger.kernel.org, Ridong Chen , Ridong Chen Subject: [PATCH v4 3/9] mm/vmscan: move struct scan_control to a dedicated header Date: Mon, 19 Oct 2026 11:52:46 +0800 Message-Id: <20261019035252.2357900-3-ridong.chen@linux.dev> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20261019034426.2354049-1-ridong.chen@linux.dev> References: <20261019034426.2354049-1-ridong.chen@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam07 X-Rspam-User: X-Rspamd-Queue-Id: 6B74FA0003 X-Stat-Signature: jqjcbx7souycc4g1p3i75rm9amxofb4p X-HE-Tag: 1792382010-958007 X-HE-Meta: U2FsdGVkX1+JevJ3I6Kdf49fQljlPlRf3he04rU8mUIVq9g/n/nGDStUxpijiAEYtiEIS4YioVOtAz1kABpCJlORB4Hw0MCl+e8ep0kHNdwKa7n4oV9faImixyULD6rfIBOtDrSmxArNU/ycPK97zIkb8+FvX9FWGsQ+NNUNaoQV6vPxzn/WpAVTX5N2z7iwGCFv3DQmBqxOoR/z6Hrx7DfEkKcgGYO1pKQoyyQ3dOP4QcP1rBWyjAVycR/W7wZzzuA6iHTPP6Ma9qwuacDVS5KPEPCWoIO7Y8mx6J4wzSFqAPMgjhSkKiuszJvHRn1qL8LmZH6ixsPUNeCOz63iEqoYM/4U6U46z9DgqH3wPMKdhPkNO+qdydPc8seJs+O27bwzdaoXqKTmPKzZzeyMnUJUI2m6VHWClsx/9XtZvjYV3EVlApqxFP7NO5F3foIbsAA01PC11BGB1SyNNrh2FCm0LYI5e8gIhWeqYYFgVFUtZ15kqFyjvlhthBtWz8RMt6FN+HLJQpJDFqbqElScU1X800qtwoSoQXtgdJsYeg+BkOnDe1c8B6bBiABq7EfZfwupwRwSDXW80DqdRFdoGxlHjikGfEYH9uH0ircwMio39nhwnf88DYSDWdB4LAwveUyLQXiw8Fhq6PVx7Bjef/XmGCYFHZUR0+4/7sC87lh8Mb9lWLDmFq3P1Ix4izEh/oJJoY4QM5vzFTnOIlWadARMffksYpe0rdGQCtavNJpqnxDA1Yo7r7n4fwLGfKgPTx+jhytz8e3OsKTSYkGdQPNZr25pyNHhEPJSM9o3WnVGEZncOSvaPiDvDcBSEwHBM20qf6ESuEg+NOEcEbra5oExe6JhPNSH55djRXFjdK7/wSEUu67jVg954bB8/FIPN37lt9TK++TZ/YrwfaSA5yvb6bpWA2twBuLniU43rIil2g0PRfUaR5uNPvEALbt9KZZl2cqVSZFakLxVQ0k hxq1ol+4 NBUuPCSCoQY4TWIBoUgjtDWGhRDoKg8jKmXuwXCBLk4VERyLIzPvNBmEYUX9vn3TOeN+Ht0nPNmRhVToMR0/eRLXXVTS/j4VI/AnN77P3RK8L/+Az9l/6gEDVFzxs0QnuvOBaomUfUwrZqKNm3/E6bOI3Yt6zkb8neDWjb6biyn8R7aBG/K2zHVCXxFaQzQ18jKgu9fMqr0LVPFyDssd+e0bv9B2a8vM/HnRrHmOE60I4eEre5RwZzZ8Cx/QGmarA9pr74wZSU9NdoxK093bWYuVsruaBft+jSlyeqTXGYavpgVogTlE9U1ZS6UR7N/dA23uQezYsrPM/eAtttp8f4iKRqguRCbwyxOlah9ATI0w0K5A= Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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. Assisted-by: LLM 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 c41af07e870e..9785aa2b9c6c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17233,6 +17233,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 @@ -17383,6 +17384,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 a3538484f8da..8b8f4049e278 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