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

Commit 972d1a7b authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[PATCH] ZVC: Support NR_SLAB_RECLAIMABLE / NR_SLAB_UNRECLAIMABLE 



Remove the atomic counter for slab_reclaim_pages and replace the counter
and NR_SLAB with two ZVC counter that account for unreclaimable and
reclaimable slab pages: NR_SLAB_RECLAIMABLE and NR_SLAB_UNRECLAIMABLE.

Change the check in vmscan.c to refer to to NR_SLAB_RECLAIMABLE.  The
intend seems to be to check for slab pages that could be freed.

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8417bba4

arch/i386/mm/pgtable.c

+3 −1
Original line number Diff line number Diff line
@@ -60,7 +60,9 @@ void show_mem(void) 
	printk(KERN_INFO "%lu pages writeback\n",

					global_page_state(NR_WRITEBACK));

	printk(KERN_INFO "%lu pages mapped\n", global_page_state(NR_FILE_MAPPED));

	printk(KERN_INFO "%lu pages slab\n", global_page_state(NR_SLAB));

	printk(KERN_INFO "%lu pages slab\n",

		global_page_state(NR_SLAB_RECLAIMABLE) +

		global_page_state(NR_SLAB_UNRECLAIMABLE));

	printk(KERN_INFO "%lu pages pagetables\n",

					global_page_state(NR_PAGETABLE));

}

drivers/base/node.c

+7 −2
Original line number Diff line number Diff line
@@ -68,7 +68,9 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) 
		       "Node %d PageTables:   %8lu kB\n"

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

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

		       "Node %d Slab:         %8lu kB\n",

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

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

		       "Node %d SUnreclaim:   %8lu kB\n",

		       nid, K(i.totalram),

		       nid, K(i.freeram),

		       nid, K(i.totalram - i.freeram),
@@ -88,7 +90,10 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) 
		       nid, K(node_page_state(nid, NR_PAGETABLE)),

		       nid, K(node_page_state(nid, NR_UNSTABLE_NFS)),

		       nid, K(node_page_state(nid, NR_BOUNCE)),

		       nid, K(node_page_state(nid, NR_SLAB)));

		       nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE) +

				node_page_state(nid, NR_SLAB_UNRECLAIMABLE)),

		       nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE)),

		       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE)));

	n += hugetlb_report_node_meminfo(nid, buf + n);

	return n;

}

fs/proc/proc_misc.c

+6 −1
Original line number Diff line number Diff line
@@ -170,6 +170,8 @@ static int meminfo_read_proc(char *page, char **start, off_t off, 
		"AnonPages:    %8lu kB\n"

		"Mapped:       %8lu kB\n"

		"Slab:         %8lu kB\n"

		"SReclaimable: %8lu kB\n"

		"SUnreclaim:   %8lu kB\n"

		"PageTables:   %8lu kB\n"

		"NFS_Unstable: %8lu kB\n"

		"Bounce:       %8lu kB\n"
@@ -197,7 +199,10 @@ static int meminfo_read_proc(char *page, char **start, off_t off, 
		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_SLAB)),

		K(global_page_state(NR_SLAB_RECLAIMABLE) +

				global_page_state(NR_SLAB_UNRECLAIMABLE)),

		K(global_page_state(NR_SLAB_RECLAIMABLE)),

		K(global_page_state(NR_SLAB_UNRECLAIMABLE)),

		K(global_page_state(NR_PAGETABLE)),

		K(global_page_state(NR_UNSTABLE_NFS)),

		K(global_page_state(NR_BOUNCE)),

include/linux/mmzone.h

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ enum zone_stat_item { 
	NR_FILE_MAPPED,	/* pagecache pages mapped into pagetables.

			   only modified from process context */

	NR_FILE_PAGES,

	NR_SLAB,	/* Pages used by slab allocator */

	NR_SLAB_RECLAIMABLE,

	NR_SLAB_UNRECLAIMABLE,

	NR_PAGETABLE,	/* used for pagetables */

	NR_FILE_DIRTY,

	NR_WRITEBACK,

include/linux/slab.h

+0 −2
Original line number Diff line number Diff line
@@ -284,8 +284,6 @@ extern kmem_cache_t *fs_cachep; 
extern kmem_cache_t	*sighand_cachep;

extern kmem_cache_t	*bio_cachep;



extern atomic_t slab_reclaim_pages;



#endif	/* __KERNEL__ */



#endif	/* _LINUX_SLAB_H */