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

Commit 5dc35979 authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by Linus Torvalds
Browse files

mm/vmscan: push lruvec pointer into isolate_lru_pages() 



Move the mem_cgroup_zone_lruvec() call from isolate_lru_pages() into
shrink_[in]active_list().  Further patches push it to shrink_zone() step
by step.

Signed-off-by: default avatarKonstantin Khlebnikov <khlebnikov@openvz.org>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarHugh Dickins <hughd@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7f5e86c2

mm/vmscan.c

+8 −8
Original line number Diff line number Diff line
@@ -1027,7 +1027,7 @@ int __isolate_lru_page(struct page *page, isolate_mode_t mode) 
 * Appropriate locks must be held before calling this function.

 *

 * @nr_to_scan:	The number of pages to look through on the list.

 * @mz:		The mem_cgroup_zone to pull pages from.

 * @lruvec:	The LRU vector to pull pages from.

 * @dst:	The temp list to put pages on to.

 * @nr_scanned:	The number of pages that were scanned.

 * @sc:		The scan_control struct for this reclaim session
@@ -1037,17 +1037,15 @@ int __isolate_lru_page(struct page *page, isolate_mode_t mode) 
 * returns how many pages were moved onto *@dst.

 */

static unsigned long isolate_lru_pages(unsigned long nr_to_scan,

		struct mem_cgroup_zone *mz, struct list_head *dst,

		struct lruvec *lruvec, struct list_head *dst,

		unsigned long *nr_scanned, struct scan_control *sc,

		isolate_mode_t mode, enum lru_list lru)

{

	struct lruvec *lruvec;

	struct list_head *src;

	unsigned long nr_taken = 0;

	unsigned long scan;

	int file = is_file_lru(lru);



	lruvec = mem_cgroup_zone_lruvec(mz->zone, mz->mem_cgroup);

	src = &lruvec->lists[lru];



	for (scan = 0; scan < nr_to_scan && !list_empty(src); scan++) {
@@ -1274,6 +1272,7 @@ shrink_inactive_list(unsigned long nr_to_scan, struct mem_cgroup_zone *mz, 
	int file = is_file_lru(lru);

	struct zone *zone = mz->zone;

	struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(mz);

	struct lruvec *lruvec = mem_cgroup_zone_lruvec(zone, mz->mem_cgroup);



	while (unlikely(too_many_isolated(zone, file, sc))) {

		congestion_wait(BLK_RW_ASYNC, HZ/10);
@@ -1292,8 +1291,8 @@ shrink_inactive_list(unsigned long nr_to_scan, struct mem_cgroup_zone *mz, 


	spin_lock_irq(&zone->lru_lock);



	nr_taken = isolate_lru_pages(nr_to_scan, mz, &page_list, &nr_scanned,

				     sc, isolate_mode, lru);

	nr_taken = isolate_lru_pages(nr_to_scan, lruvec, &page_list,

				     &nr_scanned, sc, isolate_mode, lru);

	if (global_reclaim(sc)) {

		zone->pages_scanned += nr_scanned;

		if (current_is_kswapd())
@@ -1444,6 +1443,7 @@ static void shrink_active_list(unsigned long nr_to_scan, 
	isolate_mode_t isolate_mode = 0;

	int file = is_file_lru(lru);

	struct zone *zone = mz->zone;

	struct lruvec *lruvec = mem_cgroup_zone_lruvec(zone, mz->mem_cgroup);



	lru_add_drain();
@@ -1454,8 +1454,8 @@ static void shrink_active_list(unsigned long nr_to_scan, 


	spin_lock_irq(&zone->lru_lock);



	nr_taken = isolate_lru_pages(nr_to_scan, mz, &l_hold, &nr_scanned, sc,

				     isolate_mode, lru);

	nr_taken = isolate_lru_pages(nr_to_scan, lruvec, &l_hold,

				     &nr_scanned, sc, isolate_mode, lru);

	if (global_reclaim(sc))

		zone->pages_scanned += nr_scanned;