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

Commit 4b02108a authored by KOSAKI Motohiro's avatar KOSAKI Motohiro Committed by Linus Torvalds
Browse files

mm: oom analysis: add shmem vmstat 



Recently we encountered OOM problems due to memory use of the GEM cache.
Generally a large amuont of Shmem/Tmpfs pages tend to create a memory
shortage problem.

We often use the following calculation to determine the amount of shmem
pages:

shmem = NR_ACTIVE_ANON + NR_INACTIVE_ANON - NR_ANON_PAGES

however the expression does not consider isolated and mlocked pages.

This patch adds explicit accounting for pages used by shmem and tmpfs.

Signed-off-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Acked-by: default avatarRik van Riel <riel@redhat.com>
Reviewed-by: default avatarChristoph Lameter <cl@linux-foundation.org>
Acked-by: default avatarWu Fengguang <fengguang.wu@intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c6a7f572

drivers/base/node.c

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ static ssize_t node_read_meminfo(struct sys_device * dev, 
		       "Node %d FilePages:      %8lu kB\n"

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

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

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

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

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

		       "Node %d NFS_Unstable:   %8lu kB\n"
@@ -117,6 +118,7 @@ static ssize_t node_read_meminfo(struct sys_device * dev, 
		       nid, K(node_page_state(nid, NR_FILE_PAGES)),

		       nid, K(node_page_state(nid, NR_FILE_MAPPED)),

		       nid, K(node_page_state(nid, NR_ANON_PAGES)),

		       nid, K(node_page_state(nid, NR_SHMEM)),

		       nid, node_page_state(nid, NR_KERNEL_STACK) *

				THREAD_SIZE / 1024,

		       nid, K(node_page_state(nid, NR_PAGETABLE)),

fs/proc/meminfo.c

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) 
		"Writeback:      %8lu kB\n"

		"AnonPages:      %8lu kB\n"

		"Mapped:         %8lu kB\n"

		"Shmem:          %8lu kB\n"

		"Slab:           %8lu kB\n"

		"SReclaimable:   %8lu kB\n"

		"SUnreclaim:     %8lu kB\n"
@@ -125,6 +126,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) 
		K(global_page_state(NR_WRITEBACK)),

		K(global_page_state(NR_ANON_PAGES)),

		K(global_page_state(NR_FILE_MAPPED)),

		K(global_page_state(NR_SHMEM)),

		K(global_page_state(NR_SLAB_RECLAIMABLE) +

				global_page_state(NR_SLAB_UNRECLAIMABLE)),

		K(global_page_state(NR_SLAB_RECLAIMABLE)),

include/linux/mmzone.h

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ enum zone_stat_item { 
	NR_BOUNCE,

	NR_VMSCAN_WRITE,

	NR_WRITEBACK_TEMP,	/* Writeback using temporary buffers */

	NR_SHMEM,		/* shmem pages (included tmpfs/GEM pages) */

#ifdef CONFIG_NUMA

	NUMA_HIT,		/* allocated in intended node */

	NUMA_MISS,		/* allocated in non intended node */

mm/filemap.c

+4 −0
Original line number Diff line number Diff line
@@ -119,6 +119,8 @@ void __remove_from_page_cache(struct page *page) 
	page->mapping = NULL;

	mapping->nrpages--;

	__dec_zone_page_state(page, NR_FILE_PAGES);

	if (PageSwapBacked(page))

		__dec_zone_page_state(page, NR_SHMEM);

	BUG_ON(page_mapped(page));



	/*
@@ -431,6 +433,8 @@ int add_to_page_cache_locked(struct page *page, struct address_space *mapping, 
		if (likely(!error)) {

			mapping->nrpages++;

			__inc_zone_page_state(page, NR_FILE_PAGES);

			if (PageSwapBacked(page))

				__inc_zone_page_state(page, NR_SHMEM);

			spin_unlock_irq(&mapping->tree_lock);

		} else {

			page->mapping = NULL;

mm/migrate.c

+4 −1
Original line number Diff line number Diff line
@@ -312,7 +312,10 @@ static int migrate_page_move_mapping(struct address_space *mapping, 
	 */

	__dec_zone_page_state(page, NR_FILE_PAGES);

	__inc_zone_page_state(newpage, NR_FILE_PAGES);



	if (PageSwapBacked(page)) {

		__dec_zone_page_state(page, NR_SHMEM);

		__inc_zone_page_state(newpage, NR_SHMEM);

	}

	spin_unlock_irq(&mapping->tree_lock);



	return 0;