Commit c7c7b80c authored by Alex Shi's avatar Alex Shi Committed by Linus Torvalds
Browse files

mm/swap.c: fold vm event PGROTATED into pagevec_move_tail_fn 

Fold the PGROTATED event collection into pagevec_move_tail_fn call back
func like other funcs does in pagevec_lru_move_fn.  Thus we could save
func call pagevec_move_tail().  Now all usage of pagevec_lru_move_fn are
same and no needs of its 3rd parameter.

It's just simply the calling. No functional change.

[lkp@intel.com: found a build issue in the original patch, thanks]

Link: https://lkml.kernel.org/r/1604566549-62481-10-git-send-email-alex.shi@linux.alibaba.com


Signed-off-by: default avatarAlex Shi <alex.shi@linux.alibaba.com>
Acked-by: default avatarHugh Dickins <hughd@google.com>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Alexander Duyck <alexander.duyck@gmail.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: "Chen, Rong A" <rong.a.chen@intel.com>
Cc: Daniel Jordan <daniel.m.jordan@oracle.com>
Cc: "Huang, Ying" <ying.huang@intel.com>
Cc: Jann Horn <jannh@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Kirill A. Shutemov <kirill@shutemov.name>
Cc: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mika Penttilä <mika.penttila@nextfour.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Shakeel Butt <shakeelb@google.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Yang Shi <yang.shi@linux.alibaba.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 20ad50d6

mm/swap.c

+23 −42
Original line number Diff line number Diff line
@@ -204,8 +204,7 @@ int get_kernel_page(unsigned long start, int write, struct page **pages) 
EXPORT_SYMBOL_GPL(get_kernel_page);



static void pagevec_lru_move_fn(struct pagevec *pvec,

	void (*move_fn)(struct page *page, struct lruvec *lruvec, void *arg),

	void *arg)

	void (*move_fn)(struct page *page, struct lruvec *lruvec))

{

	int i;

	struct pglist_data *pgdat = NULL;
@@ -224,7 +223,7 @@ static void pagevec_lru_move_fn(struct pagevec *pvec, 
		}



		lruvec = mem_cgroup_page_lruvec(page, pgdat);

		(*move_fn)(page, lruvec, arg);

		(*move_fn)(page, lruvec);

	}

	if (pgdat)

		spin_unlock_irqrestore(&pgdat->lru_lock, flags);
@@ -232,35 +231,22 @@ static void pagevec_lru_move_fn(struct pagevec *pvec, 
	pagevec_reinit(pvec);

}



static void pagevec_move_tail_fn(struct page *page, struct lruvec *lruvec,

				 void *arg)

static void pagevec_move_tail_fn(struct page *page, struct lruvec *lruvec)

{

	int *pgmoved = arg;



	if (PageLRU(page) && !PageUnevictable(page)) {

		del_page_from_lru_list(page, lruvec, page_lru(page));

		ClearPageActive(page);

		add_page_to_lru_list_tail(page, lruvec, page_lru(page));

		(*pgmoved) += thp_nr_pages(page);

	}

		__count_vm_events(PGROTATED, thp_nr_pages(page));

	}



/*

 * pagevec_move_tail() must be called with IRQ disabled.

 * Otherwise this may cause nasty races.

 */

static void pagevec_move_tail(struct pagevec *pvec)

{

	int pgmoved = 0;



	pagevec_lru_move_fn(pvec, pagevec_move_tail_fn, &pgmoved);

	__count_vm_events(PGROTATED, pgmoved);

}



/*

 * Writeback is about to end against a page which has been marked for immediate

 * reclaim.  If it still appears to be reclaimable, move it to the tail of the

 * inactive list.

 *

 * rotate_reclaimable_page() must disable IRQs, to prevent nasty races.

 */

void rotate_reclaimable_page(struct page *page)

{
@@ -273,7 +259,7 @@ void rotate_reclaimable_page(struct page *page) 
		local_lock_irqsave(&lru_rotate.lock, flags);

		pvec = this_cpu_ptr(&lru_rotate.pvec);

		if (!pagevec_add(pvec, page) || PageCompound(page))

			pagevec_move_tail(pvec);

			pagevec_lru_move_fn(pvec, pagevec_move_tail_fn);

		local_unlock_irqrestore(&lru_rotate.lock, flags);

	}

}
@@ -315,8 +301,7 @@ void lru_note_cost_page(struct page *page) 
		      page_is_file_lru(page), thp_nr_pages(page));

}



static void __activate_page(struct page *page, struct lruvec *lruvec,

			    void *arg)

static void __activate_page(struct page *page, struct lruvec *lruvec)

{

	if (PageLRU(page) && !PageActive(page) && !PageUnevictable(page)) {

		int lru = page_lru_base_type(page);
@@ -340,7 +325,7 @@ static void activate_page_drain(int cpu) 
	struct pagevec *pvec = &per_cpu(lru_pvecs.activate_page, cpu);



	if (pagevec_count(pvec))

		pagevec_lru_move_fn(pvec, __activate_page, NULL);

		pagevec_lru_move_fn(pvec, __activate_page);

}



static bool need_activate_page_drain(int cpu)
@@ -358,7 +343,7 @@ static void activate_page(struct page *page) 
		pvec = this_cpu_ptr(&lru_pvecs.activate_page);

		get_page(page);

		if (!pagevec_add(pvec, page) || PageCompound(page))

			pagevec_lru_move_fn(pvec, __activate_page, NULL);

			pagevec_lru_move_fn(pvec, __activate_page);

		local_unlock(&lru_pvecs.lock);

	}

}
@@ -374,7 +359,7 @@ static void activate_page(struct page *page) 


	page = compound_head(page);

	spin_lock_irq(&pgdat->lru_lock);

	__activate_page(page, mem_cgroup_page_lruvec(page, pgdat), NULL);

	__activate_page(page, mem_cgroup_page_lruvec(page, pgdat));

	spin_unlock_irq(&pgdat->lru_lock);

}

#endif
@@ -525,8 +510,7 @@ void lru_cache_add_inactive_or_unevictable(struct page *page, 
 * be write it out by flusher threads as this is much more effective

 * than the single-page writeout from reclaim.

 */

static void lru_deactivate_file_fn(struct page *page, struct lruvec *lruvec,

			      void *arg)

static void lru_deactivate_file_fn(struct page *page, struct lruvec *lruvec)

{

	int lru;

	bool active;
@@ -573,8 +557,7 @@ static void lru_deactivate_file_fn(struct page *page, struct lruvec *lruvec, 
	}

}



static void lru_deactivate_fn(struct page *page, struct lruvec *lruvec,

			    void *arg)

static void lru_deactivate_fn(struct page *page, struct lruvec *lruvec)

{

	if (PageLRU(page) && PageActive(page) && !PageUnevictable(page)) {

		int lru = page_lru_base_type(page);
@@ -591,8 +574,7 @@ static void lru_deactivate_fn(struct page *page, struct lruvec *lruvec, 
	}

}



static void lru_lazyfree_fn(struct page *page, struct lruvec *lruvec,

			    void *arg)

static void lru_lazyfree_fn(struct page *page, struct lruvec *lruvec)

{

	if (PageLRU(page) && PageAnon(page) && PageSwapBacked(page) &&

	    !PageSwapCache(page) && !PageUnevictable(page)) {
@@ -636,21 +618,21 @@ void lru_add_drain_cpu(int cpu) 


		/* No harm done if a racing interrupt already did this */

		local_lock_irqsave(&lru_rotate.lock, flags);

		pagevec_move_tail(pvec);

		pagevec_lru_move_fn(pvec, pagevec_move_tail_fn);

		local_unlock_irqrestore(&lru_rotate.lock, flags);

	}



	pvec = &per_cpu(lru_pvecs.lru_deactivate_file, cpu);

	if (pagevec_count(pvec))

		pagevec_lru_move_fn(pvec, lru_deactivate_file_fn, NULL);

		pagevec_lru_move_fn(pvec, lru_deactivate_file_fn);



	pvec = &per_cpu(lru_pvecs.lru_deactivate, cpu);

	if (pagevec_count(pvec))

		pagevec_lru_move_fn(pvec, lru_deactivate_fn, NULL);

		pagevec_lru_move_fn(pvec, lru_deactivate_fn);



	pvec = &per_cpu(lru_pvecs.lru_lazyfree, cpu);

	if (pagevec_count(pvec))

		pagevec_lru_move_fn(pvec, lru_lazyfree_fn, NULL);

		pagevec_lru_move_fn(pvec, lru_lazyfree_fn);



	activate_page_drain(cpu);

}
@@ -679,7 +661,7 @@ void deactivate_file_page(struct page *page) 
		pvec = this_cpu_ptr(&lru_pvecs.lru_deactivate_file);



		if (!pagevec_add(pvec, page) || PageCompound(page))

			pagevec_lru_move_fn(pvec, lru_deactivate_file_fn, NULL);

			pagevec_lru_move_fn(pvec, lru_deactivate_file_fn);

		local_unlock(&lru_pvecs.lock);

	}

}
@@ -701,7 +683,7 @@ void deactivate_page(struct page *page) 
		pvec = this_cpu_ptr(&lru_pvecs.lru_deactivate);

		get_page(page);

		if (!pagevec_add(pvec, page) || PageCompound(page))

			pagevec_lru_move_fn(pvec, lru_deactivate_fn, NULL);

			pagevec_lru_move_fn(pvec, lru_deactivate_fn);

		local_unlock(&lru_pvecs.lock);

	}

}
@@ -723,7 +705,7 @@ void mark_page_lazyfree(struct page *page) 
		pvec = this_cpu_ptr(&lru_pvecs.lru_lazyfree);

		get_page(page);

		if (!pagevec_add(pvec, page) || PageCompound(page))

			pagevec_lru_move_fn(pvec, lru_lazyfree_fn, NULL);

			pagevec_lru_move_fn(pvec, lru_lazyfree_fn);

		local_unlock(&lru_pvecs.lock);

	}

}
@@ -977,8 +959,7 @@ void __pagevec_release(struct pagevec *pvec) 
}

EXPORT_SYMBOL(__pagevec_release);



static void __pagevec_lru_add_fn(struct page *page, struct lruvec *lruvec,

				 void *arg)

static void __pagevec_lru_add_fn(struct page *page, struct lruvec *lruvec)

{

	enum lru_list lru;

	int was_unevictable = TestClearPageUnevictable(page);
@@ -1037,7 +1018,7 @@ static void __pagevec_lru_add_fn(struct page *page, struct lruvec *lruvec, 
 */

void __pagevec_lru_add(struct pagevec *pvec)

{

	pagevec_lru_move_fn(pvec, __pagevec_lru_add_fn, NULL);

	pagevec_lru_move_fn(pvec, __pagevec_lru_add_fn);

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE