mirror of
https://github.com/torvalds/linux.git
synced 2026-09-14 08:01:12 +02:00
mm: move reclaim-internal declarations out of swap.h
Keep include/linux/swap.h focused on swap-facing interfaces by moving MM-internal reclaim and workingset declarations into mm/internal.h. Leave the small set of LRU helper declarations that are used outside mm/ in swap.h so this cleanup does not need a new public header under include/linux/. Link: https://lore.kernel.org/20260708-ch-swap-series-plus-folio-lru-cleanup-v9-3-2bc72b4f8730@gmail.com Signed-off-by: Jianyue Wu <wujianyue000@gmail.com> Suggested-by: Barry Song <baohua@kernel.org> Suggested-by: Baoquan He <bhe@redhat.com> Acked-by: Johannes Weiner <hannes@cmpxchg.org> Cc: Axel Rasmussen <axelrasmussen@google.com> Cc: Baolin Wang <baolin.wang@linux.alibaba.com> Cc: Chris Li <chrisl@kernel.org> Cc: David Hildenbrand <david@kernel.org> Cc: Hugh Dickins <hughd@google.com> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Kairui Song <kasong@tencent.com> Cc: Kemeng Shi <shikemeng@huaweicloud.com> Cc: Liam R. Howlett <liam@infradead.org> Cc: Lorenzo Stoakes <ljs@kernel.org> Cc: Matthew Wilcox (Oracle) <willy@infradead.org> Cc: Michal Hocko <mhocko@kernel.org> Cc: Michal Hocko <mhocko@suse.com> Cc: Mike Rapoport <rppt@kernel.org> Cc: Nhat Pham <nphamcs@gmail.com> Cc: Shakeel Butt <shakeel.butt@linux.dev> Cc: Suren Baghdasaryan <surenb@google.com> Cc: Vlastimil Babka <vbabka@kernel.org> Cc: Wei Xu <weixugc@google.com> Cc: Yuanchu Xie <yuanchu@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Jianyue Wu
Andrew Morton
parent
0ba14428ab
commit
3fe0620fae
|
|
@ -287,39 +287,19 @@ static inline swp_entry_t page_swap_entry(struct page *page)
|
|||
return entry;
|
||||
}
|
||||
|
||||
/* linux/mm/workingset.c */
|
||||
bool workingset_test_recent(void *shadow, bool file, bool *workingset,
|
||||
bool flush);
|
||||
void workingset_age_nonresident(struct lruvec *lruvec, unsigned long nr_pages);
|
||||
void *workingset_eviction(struct folio *folio, struct mem_cgroup *target_memcg);
|
||||
void workingset_refault(struct folio *folio, void *shadow);
|
||||
void workingset_activation(struct folio *folio);
|
||||
|
||||
/* linux/mm/page_alloc.c */
|
||||
extern unsigned long totalreserve_pages;
|
||||
|
||||
/* Definition of global_zone_page_state not available yet */
|
||||
#define nr_free_pages() global_zone_page_state(NR_FREE_PAGES)
|
||||
|
||||
/* linux/mm/folio.c */
|
||||
void folio_add_lru(struct folio *folio);
|
||||
void folio_mark_accessed(struct folio *folio);
|
||||
void lru_add_drain_all(void);
|
||||
|
||||
/* linux/mm/swap.c */
|
||||
void lru_note_cost_unlock_irq(struct lruvec *lruvec, bool file,
|
||||
unsigned int nr_io, unsigned int nr_rotated);
|
||||
void lru_note_cost_refault(struct folio *);
|
||||
void folio_add_lru(struct folio *);
|
||||
void folio_add_lru_vma(struct folio *, struct vm_area_struct *);
|
||||
void mark_page_accessed(struct page *);
|
||||
void folio_mark_accessed(struct folio *);
|
||||
|
||||
static inline bool folio_may_be_lru_cached(struct folio *folio)
|
||||
{
|
||||
/*
|
||||
* Holding PMD-sized folios in per-CPU LRU cache unbalances accounting.
|
||||
* Holding small numbers of low-order mTHP folios in per-CPU LRU cache
|
||||
* will be sensible, but nobody has implemented and tested that yet.
|
||||
*/
|
||||
return !folio_test_large(folio);
|
||||
}
|
||||
/* linux/mm/folio-compat.c */
|
||||
void mark_page_accessed(struct page *page);
|
||||
|
||||
extern atomic_t lru_disable_count;
|
||||
|
||||
|
|
@ -328,42 +308,6 @@ static inline bool lru_cache_disabled(void)
|
|||
return atomic_read(&lru_disable_count);
|
||||
}
|
||||
|
||||
static inline void lru_cache_enable(void)
|
||||
{
|
||||
atomic_dec(&lru_disable_count);
|
||||
}
|
||||
|
||||
extern void lru_cache_disable(void);
|
||||
extern void lru_add_drain(void);
|
||||
extern void lru_add_drain_cpu(int cpu);
|
||||
extern void lru_add_drain_cpu_zone(struct zone *zone);
|
||||
extern void lru_add_drain_all(void);
|
||||
void folio_deactivate(struct folio *folio);
|
||||
void folio_mark_lazyfree(struct folio *folio);
|
||||
|
||||
/* linux/mm/vmscan.c */
|
||||
extern unsigned long zone_reclaimable_pages(struct zone *zone);
|
||||
extern unsigned long try_to_free_pages(struct zonelist *zonelist, int order,
|
||||
gfp_t gfp_mask, const nodemask_t *mask);
|
||||
unsigned long lruvec_lru_size(struct lruvec *lruvec, enum lru_list lru, int zone_idx);
|
||||
|
||||
#define MEMCG_RECLAIM_MAY_SWAP (1 << 1)
|
||||
#define MEMCG_RECLAIM_PROACTIVE (1 << 2)
|
||||
#define MIN_SWAPPINESS 0
|
||||
#define MAX_SWAPPINESS 200
|
||||
|
||||
/* Just reclaim from anon folios in proactive memory reclaim */
|
||||
#define SWAPPINESS_ANON_ONLY (MAX_SWAPPINESS + 1)
|
||||
|
||||
extern unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *memcg,
|
||||
unsigned long nr_pages,
|
||||
gfp_t gfp_mask,
|
||||
unsigned int reclaim_options,
|
||||
int *swappiness);
|
||||
extern unsigned long mem_cgroup_shrink_node(struct mem_cgroup *mem,
|
||||
gfp_t gfp_mask, bool noswap,
|
||||
pg_data_t *pgdat,
|
||||
unsigned long *nr_scanned);
|
||||
extern unsigned long shrink_all_memory(unsigned long nr_pages);
|
||||
extern int vm_swappiness;
|
||||
long remove_mapping(struct address_space *mapping, struct folio *folio);
|
||||
|
|
@ -384,11 +328,6 @@ static inline void reclaim_unregister_node(struct node *node)
|
|||
}
|
||||
#endif /* CONFIG_SYSFS && CONFIG_NUMA */
|
||||
|
||||
#ifdef CONFIG_NUMA
|
||||
extern int sysctl_min_unmapped_ratio;
|
||||
extern int sysctl_min_slab_ratio;
|
||||
#endif
|
||||
|
||||
void check_move_unevictable_folios(struct folio_batch *fbatch);
|
||||
|
||||
extern void __meminit kswapd_run(int nid);
|
||||
|
|
@ -544,7 +483,7 @@ static inline int mem_cgroup_swappiness(struct mem_cgroup *memcg)
|
|||
|
||||
void lru_reparent_memcg(struct mem_cgroup *memcg, struct mem_cgroup *parent, int nid);
|
||||
#else
|
||||
static inline int mem_cgroup_swappiness(struct mem_cgroup *mem)
|
||||
static inline int mem_cgroup_swappiness(struct mem_cgroup *memcg)
|
||||
{
|
||||
return READ_ONCE(vm_swappiness);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,6 +31,73 @@ struct huge_bootmem_page {
|
|||
unsigned long flags;
|
||||
};
|
||||
|
||||
/* mm/workingset.c */
|
||||
bool workingset_test_recent(void *shadow, bool file, bool *workingset,
|
||||
bool flush);
|
||||
void workingset_age_nonresident(struct lruvec *lruvec, unsigned long nr_pages);
|
||||
void *workingset_eviction(struct folio *folio,
|
||||
struct mem_cgroup *target_memcg);
|
||||
void workingset_refault(struct folio *folio, void *shadow);
|
||||
void workingset_activation(struct folio *folio);
|
||||
|
||||
/* mm/folio.c */
|
||||
void lru_note_cost_unlock_irq(struct lruvec *lruvec, bool file,
|
||||
unsigned int nr_io, unsigned int nr_rotated);
|
||||
void lru_note_cost_refault(struct folio *folio);
|
||||
void folio_add_lru_vma(struct folio *folio, struct vm_area_struct *vma);
|
||||
|
||||
static inline bool folio_may_be_lru_cached(struct folio *folio)
|
||||
{
|
||||
/*
|
||||
* Holding PMD-sized folios in per-CPU LRU cache unbalances accounting.
|
||||
* Holding small numbers of low-order mTHP folios in per-CPU LRU cache
|
||||
* will be sensible, but nobody has implemented and tested that yet.
|
||||
*/
|
||||
return !folio_test_large(folio);
|
||||
}
|
||||
|
||||
static inline void lru_cache_enable(void)
|
||||
{
|
||||
atomic_dec(&lru_disable_count);
|
||||
}
|
||||
|
||||
void lru_cache_disable(void);
|
||||
void lru_add_drain(void);
|
||||
void lru_add_drain_cpu(int cpu);
|
||||
void lru_add_drain_cpu_zone(struct zone *zone);
|
||||
void folio_deactivate(struct folio *folio);
|
||||
void folio_mark_lazyfree(struct folio *folio);
|
||||
|
||||
/* mm/vmscan.c */
|
||||
unsigned long zone_reclaimable_pages(struct zone *zone);
|
||||
unsigned long try_to_free_pages(struct zonelist *zonelist, int order,
|
||||
gfp_t gfp_mask, const nodemask_t *mask);
|
||||
unsigned long lruvec_lru_size(struct lruvec *lruvec, enum lru_list lru,
|
||||
int zone_idx);
|
||||
|
||||
#define MEMCG_RECLAIM_MAY_SWAP (1 << 1)
|
||||
#define MEMCG_RECLAIM_PROACTIVE (1 << 2)
|
||||
#define MIN_SWAPPINESS 0
|
||||
#define MAX_SWAPPINESS 200
|
||||
|
||||
/* Just reclaim from anon folios in proactive memory reclaim */
|
||||
#define SWAPPINESS_ANON_ONLY (MAX_SWAPPINESS + 1)
|
||||
|
||||
unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *memcg,
|
||||
unsigned long nr_pages,
|
||||
gfp_t gfp_mask,
|
||||
unsigned int reclaim_options,
|
||||
int *swappiness);
|
||||
unsigned long mem_cgroup_shrink_node(struct mem_cgroup *memcg,
|
||||
gfp_t gfp_mask, bool noswap,
|
||||
pg_data_t *pgdat,
|
||||
unsigned long *nr_scanned);
|
||||
|
||||
#ifdef CONFIG_NUMA
|
||||
extern int sysctl_min_unmapped_ratio;
|
||||
extern int sysctl_min_slab_ratio;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Maintains state across a page table move. The operation assumes both source
|
||||
* and destination VMAs already exist and are specified by the user.
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
#include <linux/memfd.h>
|
||||
#include <linux/pid_namespace.h>
|
||||
#include <uapi/linux/memfd.h>
|
||||
#include "internal.h"
|
||||
#include "swap.h"
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user