mm: remove activate_page() from unuse_pte() (cc2828b2) · Commits · 戴 / test

We don't initially add anon pages to active lruvec after commit ("mm/vmscan: protect the workingset on anonymous LRU"). Remove activate_page() from unuse_pte(), which seems to be missed by the commit. And make the function static while we are at it. Before the commit, we called lru_cache_add_active_or_unevictable() to add new ksm pages to active lruvec. Therefore, activate_page() wasn't necessary for them in the first place. Signed-off-by:

Yu Zhao <yuzhao@google.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Reviewed-by:

Yang Shi <shy828301@gmail.com> Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com> Cc: Huang Ying <ying.huang@intel.com> Cc: David Hildenbrand <david@redhat.com> Cc: Michal Hocko <mhocko@suse.com> Cc: Qian Cai <cai@lca.pw> Cc: Mel Gorman <mgorman@techsingularity.net> Cc: Nicholas Piggin <npiggin@gmail.com> Cc: Hugh Dickins <hughd@google.com> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Link: http://lkml.kernel.org/r/20200818184704.3625199-1-yuzhao@google.com Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

include/linux/swap.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -340,7 +340,6 @@ extern void lru_note_cost_page(struct page *);
		extern void lru_cache_add(struct page *);
		extern void lru_add_page_tail(struct page page, struct page page_tail,
		struct lruvec lruvec, struct list_head head);
		extern void activate_page(struct page *);
		extern void mark_page_accessed(struct page *);
		extern void lru_add_drain(void);
		extern void lru_add_drain_cpu(int cpu);

mm/swap.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -348,7 +348,7 @@ static bool need_activate_page_drain(int cpu)
		return pagevec_count(&per_cpu(lru_pvecs.activate_page, cpu)) != 0;
		}

		void activate_page(struct page *page)
		static void activate_page(struct page *page)
		{
		page = compound_head(page);
		if (PageLRU(page) && !PageActive(page) && !PageUnevictable(page)) {
		@@ -368,7 +368,7 @@ static inline void activate_page_drain(int cpu)
		{
		}

		void activate_page(struct page *page)
		static void activate_page(struct page *page)
		{
		pg_data_t *pgdat = page_pgdat(page);

mm/swapfile.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -1929,11 +1929,6 @@ static int unuse_pte(struct vm_area_struct vma, pmd_t pmd,
		lru_cache_add_inactive_or_unevictable(page, vma);
		}
		swap_free(entry);
		/*
		* Move the page to the active list so it is not
		* immediately swapped out again after swapon.
		*/
		activate_page(page);
		out:
		pte_unmap_unlock(pte, ptl);
		if (page != swapcache) {

Admin message