Commit a984226f authored by Muchun Song's avatar Muchun Song Committed by Linus Torvalds
Browse files

mm: memcontrol: remove the pgdata parameter of mem_cgroup_page_lruvec 

All the callers of mem_cgroup_page_lruvec() just pass page_pgdat(page) as
the 2nd parameter to it (except isolate_migratepages_block()).  But for
isolate_migratepages_block(), the page_pgdat(page) is also equal to the
local variable of @pgdat.  So mem_cgroup_page_lruvec() do not need the
pgdat parameter.  Just remove it to simplify the code.

Link: https://lkml.kernel.org/r/20210417043538.9793-4-songmuchun@bytedance.com


Signed-off-by: default avatarMuchun Song <songmuchun@bytedance.com>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Reviewed-by: default avatarShakeel Butt <shakeelb@google.com>
Acked-by: default avatarRoman Gushchin <guro@fb.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Xiongchun Duan <duanxiongchun@bytedance.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2884b6b7

include/linux/memcontrol.h

+5 −5
Original line number Diff line number Diff line
@@ -743,13 +743,12 @@ static inline struct lruvec *mem_cgroup_lruvec(struct mem_cgroup *memcg, 
/**

 * mem_cgroup_page_lruvec - return lruvec for isolating/putting an LRU page

 * @page: the page

 * @pgdat: pgdat of the page

 *

 * This function relies on page->mem_cgroup being stable.

 */

static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page,

						struct pglist_data *pgdat)

static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page)

{

	pg_data_t *pgdat = page_pgdat(page);

	struct mem_cgroup *memcg = page_memcg(page);



	VM_WARN_ON_ONCE_PAGE(!memcg && !mem_cgroup_disabled(), page);
@@ -1221,9 +1220,10 @@ static inline struct lruvec *mem_cgroup_lruvec(struct mem_cgroup *memcg, 
	return &pgdat->__lruvec;

}



static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page,

						    struct pglist_data *pgdat)

static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page)

{

	pg_data_t *pgdat = page_pgdat(page);



	return &pgdat->__lruvec;

}

mm/compaction.c

+1 −1
Original line number Diff line number Diff line
@@ -1028,7 +1028,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, 
		if (!TestClearPageLRU(page))

			goto isolate_fail_put;



		lruvec = mem_cgroup_page_lruvec(page, pgdat);

		lruvec = mem_cgroup_page_lruvec(page);



		/* If we already hold the lock, we can skip some rechecking */

		if (lruvec != locked) {

mm/memcontrol.c

+3 −6
Original line number Diff line number Diff line
@@ -1199,9 +1199,8 @@ void lruvec_memcg_debug(struct lruvec *lruvec, struct page *page) 
struct lruvec *lock_page_lruvec(struct page *page)

{

	struct lruvec *lruvec;

	struct pglist_data *pgdat = page_pgdat(page);



	lruvec = mem_cgroup_page_lruvec(page, pgdat);

	lruvec = mem_cgroup_page_lruvec(page);

	spin_lock(&lruvec->lru_lock);



	lruvec_memcg_debug(lruvec, page);
@@ -1212,9 +1211,8 @@ struct lruvec *lock_page_lruvec(struct page *page) 
struct lruvec *lock_page_lruvec_irq(struct page *page)

{

	struct lruvec *lruvec;

	struct pglist_data *pgdat = page_pgdat(page);



	lruvec = mem_cgroup_page_lruvec(page, pgdat);

	lruvec = mem_cgroup_page_lruvec(page);

	spin_lock_irq(&lruvec->lru_lock);



	lruvec_memcg_debug(lruvec, page);
@@ -1225,9 +1223,8 @@ struct lruvec *lock_page_lruvec_irq(struct page *page) 
struct lruvec *lock_page_lruvec_irqsave(struct page *page, unsigned long *flags)

{

	struct lruvec *lruvec;

	struct pglist_data *pgdat = page_pgdat(page);



	lruvec = mem_cgroup_page_lruvec(page, pgdat);

	lruvec = mem_cgroup_page_lruvec(page);

	spin_lock_irqsave(&lruvec->lru_lock, *flags);



	lruvec_memcg_debug(lruvec, page);

mm/swap.c

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ void lru_note_cost(struct lruvec *lruvec, bool file, unsigned int nr_pages) 


void lru_note_cost_page(struct page *page)

{

	lru_note_cost(mem_cgroup_page_lruvec(page, page_pgdat(page)),

	lru_note_cost(mem_cgroup_page_lruvec(page),

		      page_is_file_lru(page), thp_nr_pages(page));

}

mm/workingset.c

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ void workingset_activation(struct page *page) 
	memcg = page_memcg_rcu(page);

	if (!mem_cgroup_disabled() && !memcg)

		goto out;

	lruvec = mem_cgroup_page_lruvec(page, page_pgdat(page));

	lruvec = mem_cgroup_page_lruvec(page);

	workingset_age_nonresident(lruvec, thp_nr_pages(page));

out:

	rcu_read_unlock();