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

Commit 4f98a2fe authored by Rik van Riel's avatar Rik van Riel Committed by Linus Torvalds
Browse files

vmscan: split LRU lists into anon & file sets 



Split the LRU lists in two, one set for pages that are backed by real file
systems ("file") and one for pages that are backed by memory and swap
("anon").  The latter includes tmpfs.

The advantage of doing this is that the VM will not have to scan over lots
of anonymous pages (which we generally do not want to swap out), just to
find the page cache pages that it should evict.

This patch has the infrastructure and a basic policy to balance how much
we scan the anon lists and how much we scan the file lists.  The big
policy changes are in separate patches.

[lee.schermerhorn@hp.com: collect lru meminfo statistics from correct offset]
[kosaki.motohiro@jp.fujitsu.com: prevent incorrect oom under split_lru]
[kosaki.motohiro@jp.fujitsu.com: fix pagevec_move_tail() doesn't treat unevictable page]
[hugh@veritas.com: memcg swapbacked pages active]
[hugh@veritas.com: splitlru: BDI_CAP_SWAP_BACKED]
[akpm@linux-foundation.org: fix /proc/vmstat units]
[nishimura@mxp.nes.nec.co.jp: memcg: fix handling of shmem migration]
[kosaki.motohiro@jp.fujitsu.com: adjust Quicklists field of /proc/meminfo]
[kosaki.motohiro@jp.fujitsu.com: fix style issue of get_scan_ratio()]
Signed-off-by: default avatarRik van Riel <riel@redhat.com>
Signed-off-by: default avatarLee Schermerhorn <Lee.Schermerhorn@hp.com>
Signed-off-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
Signed-off-by: default avatarDaisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b2e18538

drivers/base/node.c

+33 −23
Original line number Diff line number Diff line
@@ -66,6 +66,10 @@ static ssize_t node_read_meminfo(struct sys_device * dev, 
		       "Node %d MemUsed:        %8lu kB\n"

		       "Node %d Active:         %8lu kB\n"

		       "Node %d Inactive:       %8lu kB\n"

		       "Node %d Active(anon):   %8lu kB\n"

		       "Node %d Inactive(anon): %8lu kB\n"

		       "Node %d Active(file):   %8lu kB\n"

		       "Node %d Inactive(file): %8lu kB\n"

#ifdef CONFIG_HIGHMEM

		       "Node %d HighTotal:      %8lu kB\n"

		       "Node %d HighFree:       %8lu kB\n"
@@ -87,8 +91,14 @@ static ssize_t node_read_meminfo(struct sys_device * dev, 
		       nid, K(i.totalram),

		       nid, K(i.freeram),

		       nid, K(i.totalram - i.freeram),

		       nid, K(node_page_state(nid, NR_ACTIVE)),

		       nid, K(node_page_state(nid, NR_INACTIVE)),

		       nid, K(node_page_state(nid, NR_ACTIVE_ANON) +

				node_page_state(nid, NR_ACTIVE_FILE)),

		       nid, K(node_page_state(nid, NR_INACTIVE_ANON) +

				node_page_state(nid, NR_INACTIVE_FILE)),

		       nid, K(node_page_state(nid, NR_ACTIVE_ANON)),

		       nid, K(node_page_state(nid, NR_INACTIVE_ANON)),

		       nid, K(node_page_state(nid, NR_ACTIVE_FILE)),

		       nid, K(node_page_state(nid, NR_INACTIVE_FILE)),

#ifdef CONFIG_HIGHMEM

		       nid, K(i.totalhigh),

		       nid, K(i.freehigh),

fs/cifs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -1791,7 +1791,7 @@ static void cifs_copy_cache_pages(struct address_space *mapping, 
		SetPageUptodate(page);

		unlock_page(page);

		if (!pagevec_add(plru_pvec, page))

			__pagevec_lru_add(plru_pvec);

			__pagevec_lru_add_file(plru_pvec);

		data += PAGE_CACHE_SIZE;

	}

	return;
@@ -1925,7 +1925,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, 
		bytes_read = 0;

	}



	pagevec_lru_add(&lru_pvec);

	pagevec_lru_add_file(&lru_pvec);



/* need to free smb_read_data buf before exit */

	if (smb_read_data) {

fs/nfs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -1517,7 +1517,7 @@ static int nfs_symlink(struct inode *dir, struct dentry *dentry, const char *sym 
	if (!add_to_page_cache(page, dentry->d_inode->i_mapping, 0,

							GFP_KERNEL)) {

		pagevec_add(&lru_pvec, page);

		pagevec_lru_add(&lru_pvec);

		pagevec_lru_add_file(&lru_pvec);

		SetPageUptodate(page);

		unlock_page(page);

	} else

fs/ntfs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ static inline int __ntfs_grab_cache_pages(struct address_space *mapping, 
			pages[nr] = *cached_page;

			page_cache_get(*cached_page);

			if (unlikely(!pagevec_add(lru_pvec, *cached_page)))

				__pagevec_lru_add(lru_pvec);

				__pagevec_lru_add_file(lru_pvec);

			*cached_page = NULL;

		}

		index++;
@@ -2084,7 +2084,7 @@ err_out: 
						OSYNC_METADATA|OSYNC_DATA);

		}

  	}

	pagevec_lru_add(&lru_pvec);

	pagevec_lru_add_file(&lru_pvec);

	ntfs_debug("Done.  Returning %s (written 0x%lx, status %li).",

			written ? "written" : "status", (unsigned long)written,

			(long)status);

fs/proc/proc_misc.c

+45 −32
Original line number Diff line number Diff line
@@ -136,6 +136,8 @@ static int meminfo_read_proc(char *page, char **start, off_t off, 
	unsigned long allowed;

	struct vmalloc_info vmi;

	long cached;

	unsigned long pages[NR_LRU_LISTS];

	int lru;



/*

 * display in kilobytes.
@@ -154,6 +156,9 @@ static int meminfo_read_proc(char *page, char **start, off_t off, 


	get_vmalloc_info(&vmi);



	for (lru = LRU_BASE; lru < NR_LRU_LISTS; lru++)

		pages[lru] = global_page_state(NR_LRU_BASE + lru);



	/*

	 * Tagged format, for easy grepping and expansion.

	 */
@@ -165,6 +170,10 @@ static int meminfo_read_proc(char *page, char **start, off_t off, 
		"SwapCached:     %8lu kB\n"

		"Active:         %8lu kB\n"

		"Inactive:       %8lu kB\n"

		"Active(anon):   %8lu kB\n"

		"Inactive(anon): %8lu kB\n"

		"Active(file):   %8lu kB\n"

		"Inactive(file): %8lu kB\n"

#ifdef CONFIG_HIGHMEM

		"HighTotal:      %8lu kB\n"

		"HighFree:       %8lu kB\n"
@@ -197,8 +206,12 @@ static int meminfo_read_proc(char *page, char **start, off_t off, 
		K(i.bufferram),

		K(cached),

		K(total_swapcache_pages),

		K(global_page_state(NR_ACTIVE)),

		K(global_page_state(NR_INACTIVE)),

		K(pages[LRU_ACTIVE_ANON]   + pages[LRU_ACTIVE_FILE]),

		K(pages[LRU_INACTIVE_ANON] + pages[LRU_INACTIVE_FILE]),

		K(pages[LRU_ACTIVE_ANON]),

		K(pages[LRU_INACTIVE_ANON]),

		K(pages[LRU_ACTIVE_FILE]),

		K(pages[LRU_INACTIVE_FILE]),

#ifdef CONFIG_HIGHMEM

		K(i.totalhigh),

		K(i.freehigh),