Commit 0995d7e5 authored Apr 29, 2021 by Matthew Wilcox (Oracle)

mm/workingset: Convert workingset_refault() to take a folio



This nets us 178 bytes of savings from removing calls to compound_head.
The three callers all grow a little, but each of them will be converted
to use folios soon, so that's fine.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Howells <dhowells@redhat.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>

parent 9bf70167

include/linux/swap.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -329,7 +329,7 @@ static inline swp_entry_t folio_swap_entry(struct folio *folio)
		/* linux/mm/workingset.c */
		void workingset_age_nonresident(struct lruvec *lruvec, unsigned long nr_pages);
		void workingset_eviction(struct page page, struct mem_cgroup *target_memcg);
		void workingset_refault(struct page page, void shadow);
		void workingset_refault(struct folio folio, void shadow);
		void workingset_activation(struct folio *folio);

		/* Only track the nodes of mappings with shadow entries */
		@@ -350,7 +350,7 @@ extern unsigned long nr_free_buffer_pages(void);
		/* linux/mm/swap.c */
		extern void lru_note_cost(struct lruvec *lruvec, bool file,
		unsigned int nr_pages);
		extern void lru_note_cost_page(struct page *);
		extern void lru_note_cost_folio(struct folio *);
		extern void lru_cache_add(struct page *);
		void mark_page_accessed(struct page *);
		void folio_mark_accessed(struct folio *);

include/linux/vmstat.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -597,12 +597,6 @@ static inline void mod_lruvec_page_state(struct page *page,

		#endif /* CONFIG_MEMCG */

		static inline void inc_lruvec_state(struct lruvec *lruvec,
		enum node_stat_item idx)
		{
		mod_lruvec_state(lruvec, idx, 1);
		}

		static inline void __inc_lruvec_page_state(struct page *page,
		enum node_stat_item idx)
		{

mm/filemap.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -998,7 +998,7 @@ int add_to_page_cache_lru(struct page page, struct address_space mapping,
		*/
		WARN_ON_ONCE(PageActive(page));
		if (!(gfp_mask & __GFP_WRITE) && shadow)
		workingset_refault(page, shadow);
		workingset_refault(page_folio(page), shadow);
		lru_cache_add(page);
		}
		return ret;

mm/memory.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3539,7 +3539,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)

		shadow = get_shadow_from_swap_cache(entry);
		if (shadow)
		workingset_refault(page, shadow);
		workingset_refault(page_folio(page),
		shadow);

		lru_cache_add(page);

mm/swap.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -293,11 +293,10 @@ void lru_note_cost(struct lruvec *lruvec, bool file, unsigned int nr_pages)
		} while ((lruvec = parent_lruvec(lruvec)));
		}

		void lru_note_cost_page(struct page *page)
		void lru_note_cost_folio(struct folio *folio)
		{
		struct folio *folio = page_folio(page);
		lru_note_cost(folio_lruvec(folio),
		page_is_file_lru(page), thp_nr_pages(page));
		lru_note_cost(folio_lruvec(folio), folio_is_file_lru(folio),
		folio_nr_pages(folio));
		}

		static void __folio_activate(struct folio folio, struct lruvec lruvec)