Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa9add64 authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds
Browse files

mm/memcg: apply add/del_page to lruvec 



Take lruvec further: pass it instead of zone to add_page_to_lru_list() and
del_page_from_lru_list(); and pagevec_lru_move_fn() pass lruvec down to
its target functions.

This cleanup eliminates a swathe of cruft in memcontrol.c, including
mem_cgroup_lru_add_list(), mem_cgroup_lru_del_list() and
mem_cgroup_lru_move_lists() - which never actually touched the lists.

In their place, mem_cgroup_page_lruvec() to decide the lruvec, previously
a side-effect of add, and mem_cgroup_update_lru_size() to maintain the
lru_size stats.

Whilst these are simplifications in their own right, the goal is to bring
the evaluation of lruvec next to the spin_locking of the lrus, in
preparation for a future patch.

Signed-off-by: default avatarHugh Dickins <hughd@google.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Acked-by: default avatarKonstantin Khlebnikov <khlebnikov@openvz.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 75b00af7

include/linux/memcontrol.h

+7 −25
Original line number Diff line number Diff line
@@ -63,11 +63,7 @@ extern int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm, 
					gfp_t gfp_mask);



struct lruvec *mem_cgroup_zone_lruvec(struct zone *, struct mem_cgroup *);

struct lruvec *mem_cgroup_lru_add_list(struct zone *, struct page *,

				       enum lru_list);

void mem_cgroup_lru_del_list(struct page *, enum lru_list);

struct lruvec *mem_cgroup_lru_move_lists(struct zone *, struct page *,

					 enum lru_list, enum lru_list);

struct lruvec *mem_cgroup_page_lruvec(struct page *, struct zone *);



/* For coalescing uncharge for reducing memcg' overhead*/

extern void mem_cgroup_uncharge_start(void);
@@ -122,8 +118,7 @@ int mem_cgroup_inactive_anon_is_low(struct lruvec *lruvec); 
int mem_cgroup_inactive_file_is_low(struct lruvec *lruvec);

int mem_cgroup_select_victim_node(struct mem_cgroup *memcg);

unsigned long mem_cgroup_get_lru_size(struct lruvec *lruvec, enum lru_list);

struct zone_reclaim_stat*

mem_cgroup_get_reclaim_stat_from_page(struct page *page);

void mem_cgroup_update_lru_size(struct lruvec *, enum lru_list, int);

extern void mem_cgroup_print_oom_info(struct mem_cgroup *memcg,

					struct task_struct *p);

extern void mem_cgroup_replace_page_cache(struct page *oldpage,
@@ -250,21 +245,8 @@ static inline struct lruvec *mem_cgroup_zone_lruvec(struct zone *zone, 
	return &zone->lruvec;

}



static inline struct lruvec *mem_cgroup_lru_add_list(struct zone *zone,

						     struct page *page,

						     enum lru_list lru)

{

	return &zone->lruvec;

}



static inline void mem_cgroup_lru_del_list(struct page *page, enum lru_list lru)

{

}



static inline struct lruvec *mem_cgroup_lru_move_lists(struct zone *zone,

						       struct page *page,

						       enum lru_list from,

						       enum lru_list to)

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

						    struct zone *zone)

{

	return &zone->lruvec;

}
@@ -345,10 +327,10 @@ mem_cgroup_get_lru_size(struct lruvec *lruvec, enum lru_list lru) 
	return 0;

}



static inline struct zone_reclaim_stat*

mem_cgroup_get_reclaim_stat_from_page(struct page *page)

static inline void

mem_cgroup_update_lru_size(struct lruvec *lruvec, enum lru_list lru,

			      int increment)

{

	return NULL;

}



static inline void

include/linux/mm_inline.h

+10 −10
Original line number Diff line number Diff line
@@ -21,22 +21,22 @@ static inline int page_is_file_cache(struct page *page) 
	return !PageSwapBacked(page);

}



static __always_inline void

add_page_to_lru_list(struct zone *zone, struct page *page, enum lru_list lru)

static __always_inline void add_page_to_lru_list(struct page *page,

				struct lruvec *lruvec, enum lru_list lru)

{

	struct lruvec *lruvec;



	lruvec = mem_cgroup_lru_add_list(zone, page, lru);

	int nr_pages = hpage_nr_pages(page);

	mem_cgroup_update_lru_size(lruvec, lru, nr_pages);

	list_add(&page->lru, &lruvec->lists[lru]);

	__mod_zone_page_state(zone, NR_LRU_BASE + lru, hpage_nr_pages(page));

	__mod_zone_page_state(lruvec_zone(lruvec), NR_LRU_BASE + lru, nr_pages);

}



static __always_inline void

del_page_from_lru_list(struct zone *zone, struct page *page, enum lru_list lru)

static __always_inline void del_page_from_lru_list(struct page *page,

				struct lruvec *lruvec, enum lru_list lru)

{

	mem_cgroup_lru_del_list(page, lru);

	int nr_pages = hpage_nr_pages(page);

	mem_cgroup_update_lru_size(lruvec, lru, -nr_pages);

	list_del(&page->lru);

	__mod_zone_page_state(zone, NR_LRU_BASE + lru, -hpage_nr_pages(page));

	__mod_zone_page_state(lruvec_zone(lruvec), NR_LRU_BASE + lru, -nr_pages);

}



/**

include/linux/swap.h

+2 −2
Original line number Diff line number Diff line
@@ -221,8 +221,8 @@ extern unsigned int nr_free_pagecache_pages(void); 
/* linux/mm/swap.c */

extern void __lru_cache_add(struct page *, enum lru_list lru);

extern void lru_cache_add_lru(struct page *, enum lru_list lru);

extern void lru_add_page_tail(struct zone* zone,

			      struct page *page, struct page *page_tail);

extern void lru_add_page_tail(struct page *page, struct page *page_tail,

			      struct lruvec *lruvec);

extern void activate_page(struct page *);

extern void mark_page_accessed(struct page *);

extern void lru_add_drain(void);

mm/compaction.c

+4 −1
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ isolate_migratepages_range(struct zone *zone, struct compact_control *cc, 
	unsigned long nr_scanned = 0, nr_isolated = 0;

	struct list_head *migratelist = &cc->migratepages;

	isolate_mode_t mode = 0;

	struct lruvec *lruvec;



	/*

	 * Ensure that there are not too many pages isolated from the LRU
@@ -328,6 +329,8 @@ isolate_migratepages_range(struct zone *zone, struct compact_control *cc, 
		if (cc->mode != COMPACT_SYNC)

			mode |= ISOLATE_ASYNC_MIGRATE;



		lruvec = mem_cgroup_page_lruvec(page, zone);



		/* Try isolate the page */

		if (__isolate_lru_page(page, mode) != 0)

			continue;
@@ -335,7 +338,7 @@ isolate_migratepages_range(struct zone *zone, struct compact_control *cc, 
		VM_BUG_ON(PageTransCompound(page));



		/* Successfully isolated */

		del_page_from_lru_list(zone, page, page_lru(page));

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

		list_add(&page->lru, migratelist);

		cc->nr_migratepages++;

		nr_isolated++;

mm/huge_memory.c

+5 −3
Original line number Diff line number Diff line
@@ -1231,10 +1231,13 @@ static void __split_huge_page_refcount(struct page *page) 
{

	int i;

	struct zone *zone = page_zone(page);

	struct lruvec *lruvec;

	int tail_count = 0;



	/* prevent PageLRU to go away from under us, and freeze lru stats */

	spin_lock_irq(&zone->lru_lock);

	lruvec = mem_cgroup_page_lruvec(page, zone);



	compound_lock(page);

	/* complete memcg works before add pages to LRU */

	mem_cgroup_split_huge_fixup(page);
@@ -1309,13 +1312,12 @@ static void __split_huge_page_refcount(struct page *page) 
		BUG_ON(!PageDirty(page_tail));

		BUG_ON(!PageSwapBacked(page_tail));





		lru_add_page_tail(zone, page, page_tail);

		lru_add_page_tail(page, page_tail, lruvec);

	}

	atomic_sub(tail_count, &page->_count);

	BUG_ON(atomic_read(&page->_count) <= 0);



	__dec_zone_page_state(page, NR_ANON_TRANSPARENT_HUGEPAGES);

	__mod_zone_page_state(zone, NR_ANON_TRANSPARENT_HUGEPAGES, -1);

	__mod_zone_page_state(zone, NR_ANON_PAGES, HPAGE_PMD_NR);



	ClearPageCompound(page);