From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=95.215.58.219 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793583510; b=Bbu0KKHYvhe/Q3VlieCUBNUpfZUqrrqdMSvHHousFl484RcFoTsk27mc/GNWSqLPX/TD /JrMvtMGFPcIVnHPuZpCSGMUGB8d7RSIoglzdh9fq1idj3PEd5Qe1c/ApWc0rQ2Y6DdRR jnzcy24EiCchQeiXuYMTvaps68uAzZnuSMjD4UzRv38o53EQMmgjlgDFEORvSleXYYLHw I/GkObEwLHIHbpLUVKR5iH1ydxT9+EEzkySXXSte44uJ4wK7FEIxon0MCJLP+f1Q4jKNS 7yaBLpNl9DHXskzjsSmpwahUER91VsuF0CI1oEnPX71NwRDQ+N0uU+1G0BlVRr33x5g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793583510; h=DMARC-Filter:X-Envelope-To:DKIM-Signature:X-Envelope-To:Received: X-Mizu-Trace-ID:X-Migadu-Flow:Date:From:To:Cc:Subject:Message-ID: References:MIME-Version:Content-Type:Content-Disposition:In-Reply-To; bh=7BO+2l3cgL7JHer1ORyq5HwVzOnSR8fUjlI8lNnXx5Q=; b=NfYc0IHiPUxc+9bodD+je6IozbeCx7wBWeVQngyj40Z4B6XLh0yjYrQ38rDZW12L7rUc ifwnwatwqWXRqZTyN0lmp71OweNOcMryQfTd7Umm10CPdl/8eyGkQ7M6cL15ttlMftc1V Q1eZI0sCo29A0MbyPJx09ESTmdt/QCZL+f8IY8PjeVQLHNlEzaso/lDLCb5Gna8peCPWp cUo5noNTnNbMpow2N2osKwtbgzCyidrd0Q4G2nM4aIy6VDsoP3PLXq8udy2o3HcEFMi+J lFNyLTe8ibLjebwdyhhaUp0M6IRz8N2jixZ5lEjrnguCFHR9ptgl1FZrmZOREmD4WDw== 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=HmAw0eVp; arc=none smtp.remote-ip=95.215.58.219 Received: from mta1.migadu.com (out-219.mta1.migadu.com [95.215.58.219]) (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 258F0606A329 for ; Mon, 2 Nov 2026 01:38:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 258F0606A329 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=HmAw0eVp X-Envelope-To: cgroups@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=g1FggnIgcCQnDNhXHN5uinyRfEc/8X25vOiWkoW0Se4=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1793583508; v=1; x=1794188308; b=HmAw0eVpn7bvdijbrdFksDnNhvYSi6v5iijQGaRr8Davn6PyHIjOwLjQjIpB1vpuN2gyK3Bt 8cAdeu3jZvEfyIIW6GB9fpGzm0/pm8G6kkl5cWHj0XlRJEAOO5WOLs3OD3vVos4e39EYvfSW7wx 7WAmLpNd3NJ8rkc5SCNk/5HY= X-Envelope-To: cgroups@vger.kernel.org Received: by mta11.migadu.com with ESMTPS id d5eaad83a3702ba8; Mon, 02 Nov 2026 01:38:28 +0000 X-Mizu-Trace-ID: d5eaad83a3702ba8 X-Migadu-Flow: FLOW_OUT Date: Mon, 2 Nov 2026 09:38:18 +0800 From: Baoquan He To: Ridong Chen Cc: Steven Rostedt , Masami Hiramatsu , Andrew Morton , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Dave Chinner , Mathieu Desnoyers , Muchun Song , Qi Zheng , Kairui Song , Barry Song , Axel Rasmussen , Yuanchu Xie , Wei Xu , Baolin Wang , David Hildenbrand , Lorenzo Stoakes , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-mm@kvack.org, "open list:CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)" , "open list:BPF [MISC]:Keyword:(?:b|_)bpf(?:b|_)" , Ridong Chen Subject: Re: [PATCH v5 3/6] mm/vmscan: move struct scan_control to a dedicated header Message-ID: References: <20261031090041.58574-1-ridong.chen@linux.dev> <20261031090041.58574-4-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-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20261031090041.58574-4-ridong.chen@linux.dev> On 10/31/26 at 05:00pm, Ridong Chen wrote: > 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. > > 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 Reviewed-by: Baoquan He > > diff --git a/MAINTAINERS b/MAINTAINERS > index 2ad01107fa05..724791bb779f 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -17655,6 +17655,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 > @@ -17805,6 +17806,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 79d2d614afd0..49677464fc9a 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.43.0 >