forked from mirrors/linux
mm: per-node vmstat: show proper vmstats
commit 2ac390370a ("writeback: add
/sys/devices/system/node/<node>/vmstat") added vmstat entry. But
strangely it only show nr_written and nr_dirtied.
# cat /sys/devices/system/node/node20/vmstat
nr_written 0
nr_dirtied 0
Of course, It's not adequate. With this patch, the vmstat show all vm
stastics as /proc/vmstat.
# cat /sys/devices/system/node/node0/vmstat
nr_free_pages 899224
nr_inactive_anon 201
nr_active_anon 17380
nr_inactive_file 31572
nr_active_file 28277
nr_unevictable 0
nr_mlock 0
nr_anon_pages 17321
nr_mapped 8640
nr_file_pages 60107
nr_dirty 33
nr_writeback 0
nr_slab_reclaimable 6850
nr_slab_unreclaimable 7604
nr_page_table_pages 3105
nr_kernel_stack 175
nr_unstable 0
nr_bounce 0
nr_vmscan_write 0
nr_writeback_temp 0
nr_isolated_anon 0
nr_isolated_file 0
nr_shmem 260
nr_dirtied 1050
nr_written 938
numa_hit 962872
numa_miss 0
numa_foreign 0
numa_interleave 8617
numa_local 962872
numa_other 0
nr_anon_transparent_hugepages 0
[akpm@linux-foundation.org: no externs in .c files]
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Michael Rubin <mrubin@google.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Acked-by: David Rientjes <rientjes@google.com>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
KOSAKI Motohiro
Linus Torvalds
parent
bb005a59e0
commit
fa25c503df
3 changed files with 144 additions and 135 deletions
|
|
@ -7,6 +7,7 @@
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/mm.h>
|
#include <linux/mm.h>
|
||||||
#include <linux/memory.h>
|
#include <linux/memory.h>
|
||||||
|
#include <linux/vmstat.h>
|
||||||
#include <linux/node.h>
|
#include <linux/node.h>
|
||||||
#include <linux/hugetlb.h>
|
#include <linux/hugetlb.h>
|
||||||
#include <linux/compaction.h>
|
#include <linux/compaction.h>
|
||||||
|
|
@ -179,11 +180,14 @@ static ssize_t node_read_vmstat(struct sys_device *dev,
|
||||||
struct sysdev_attribute *attr, char *buf)
|
struct sysdev_attribute *attr, char *buf)
|
||||||
{
|
{
|
||||||
int nid = dev->id;
|
int nid = dev->id;
|
||||||
return sprintf(buf,
|
int i;
|
||||||
"nr_written %lu\n"
|
int n = 0;
|
||||||
"nr_dirtied %lu\n",
|
|
||||||
node_page_state(nid, NR_WRITTEN),
|
for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
|
||||||
node_page_state(nid, NR_DIRTIED));
|
n += sprintf(buf+n, "%s %lu\n", vmstat_text[i],
|
||||||
|
node_page_state(nid, i));
|
||||||
|
|
||||||
|
return n;
|
||||||
}
|
}
|
||||||
static SYSDEV_ATTR(vmstat, S_IRUGO, node_read_vmstat, NULL);
|
static SYSDEV_ATTR(vmstat, S_IRUGO, node_read_vmstat, NULL);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -313,6 +313,8 @@ static inline void __dec_zone_page_state(struct page *page,
|
||||||
#define set_pgdat_percpu_threshold(pgdat, callback) { }
|
#define set_pgdat_percpu_threshold(pgdat, callback) { }
|
||||||
|
|
||||||
static inline void refresh_cpu_vm_stats(int cpu) { }
|
static inline void refresh_cpu_vm_stats(int cpu) { }
|
||||||
#endif
|
#endif /* CONFIG_SMP */
|
||||||
|
|
||||||
|
extern const char * const vmstat_text[];
|
||||||
|
|
||||||
#endif /* _LINUX_VMSTAT_H */
|
#endif /* _LINUX_VMSTAT_H */
|
||||||
|
|
|
||||||
261
mm/vmstat.c
261
mm/vmstat.c
|
|
@ -659,6 +659,138 @@ static void walk_zones_in_node(struct seq_file *m, pg_data_t *pgdat,
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(CONFIG_PROC_FS) || defined(CONFIG_SYSFS)
|
||||||
|
#ifdef CONFIG_ZONE_DMA
|
||||||
|
#define TEXT_FOR_DMA(xx) xx "_dma",
|
||||||
|
#else
|
||||||
|
#define TEXT_FOR_DMA(xx)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_ZONE_DMA32
|
||||||
|
#define TEXT_FOR_DMA32(xx) xx "_dma32",
|
||||||
|
#else
|
||||||
|
#define TEXT_FOR_DMA32(xx)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_HIGHMEM
|
||||||
|
#define TEXT_FOR_HIGHMEM(xx) xx "_high",
|
||||||
|
#else
|
||||||
|
#define TEXT_FOR_HIGHMEM(xx)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define TEXTS_FOR_ZONES(xx) TEXT_FOR_DMA(xx) TEXT_FOR_DMA32(xx) xx "_normal", \
|
||||||
|
TEXT_FOR_HIGHMEM(xx) xx "_movable",
|
||||||
|
|
||||||
|
const char * const vmstat_text[] = {
|
||||||
|
/* Zoned VM counters */
|
||||||
|
"nr_free_pages",
|
||||||
|
"nr_inactive_anon",
|
||||||
|
"nr_active_anon",
|
||||||
|
"nr_inactive_file",
|
||||||
|
"nr_active_file",
|
||||||
|
"nr_unevictable",
|
||||||
|
"nr_mlock",
|
||||||
|
"nr_anon_pages",
|
||||||
|
"nr_mapped",
|
||||||
|
"nr_file_pages",
|
||||||
|
"nr_dirty",
|
||||||
|
"nr_writeback",
|
||||||
|
"nr_slab_reclaimable",
|
||||||
|
"nr_slab_unreclaimable",
|
||||||
|
"nr_page_table_pages",
|
||||||
|
"nr_kernel_stack",
|
||||||
|
"nr_unstable",
|
||||||
|
"nr_bounce",
|
||||||
|
"nr_vmscan_write",
|
||||||
|
"nr_writeback_temp",
|
||||||
|
"nr_isolated_anon",
|
||||||
|
"nr_isolated_file",
|
||||||
|
"nr_shmem",
|
||||||
|
"nr_dirtied",
|
||||||
|
"nr_written",
|
||||||
|
|
||||||
|
#ifdef CONFIG_NUMA
|
||||||
|
"numa_hit",
|
||||||
|
"numa_miss",
|
||||||
|
"numa_foreign",
|
||||||
|
"numa_interleave",
|
||||||
|
"numa_local",
|
||||||
|
"numa_other",
|
||||||
|
#endif
|
||||||
|
"nr_anon_transparent_hugepages",
|
||||||
|
"nr_dirty_threshold",
|
||||||
|
"nr_dirty_background_threshold",
|
||||||
|
|
||||||
|
#ifdef CONFIG_VM_EVENT_COUNTERS
|
||||||
|
"pgpgin",
|
||||||
|
"pgpgout",
|
||||||
|
"pswpin",
|
||||||
|
"pswpout",
|
||||||
|
|
||||||
|
TEXTS_FOR_ZONES("pgalloc")
|
||||||
|
|
||||||
|
"pgfree",
|
||||||
|
"pgactivate",
|
||||||
|
"pgdeactivate",
|
||||||
|
|
||||||
|
"pgfault",
|
||||||
|
"pgmajfault",
|
||||||
|
|
||||||
|
TEXTS_FOR_ZONES("pgrefill")
|
||||||
|
TEXTS_FOR_ZONES("pgsteal")
|
||||||
|
TEXTS_FOR_ZONES("pgscan_kswapd")
|
||||||
|
TEXTS_FOR_ZONES("pgscan_direct")
|
||||||
|
|
||||||
|
#ifdef CONFIG_NUMA
|
||||||
|
"zone_reclaim_failed",
|
||||||
|
#endif
|
||||||
|
"pginodesteal",
|
||||||
|
"slabs_scanned",
|
||||||
|
"kswapd_steal",
|
||||||
|
"kswapd_inodesteal",
|
||||||
|
"kswapd_low_wmark_hit_quickly",
|
||||||
|
"kswapd_high_wmark_hit_quickly",
|
||||||
|
"kswapd_skip_congestion_wait",
|
||||||
|
"pageoutrun",
|
||||||
|
"allocstall",
|
||||||
|
|
||||||
|
"pgrotated",
|
||||||
|
|
||||||
|
#ifdef CONFIG_COMPACTION
|
||||||
|
"compact_blocks_moved",
|
||||||
|
"compact_pages_moved",
|
||||||
|
"compact_pagemigrate_failed",
|
||||||
|
"compact_stall",
|
||||||
|
"compact_fail",
|
||||||
|
"compact_success",
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_HUGETLB_PAGE
|
||||||
|
"htlb_buddy_alloc_success",
|
||||||
|
"htlb_buddy_alloc_fail",
|
||||||
|
#endif
|
||||||
|
"unevictable_pgs_culled",
|
||||||
|
"unevictable_pgs_scanned",
|
||||||
|
"unevictable_pgs_rescued",
|
||||||
|
"unevictable_pgs_mlocked",
|
||||||
|
"unevictable_pgs_munlocked",
|
||||||
|
"unevictable_pgs_cleared",
|
||||||
|
"unevictable_pgs_stranded",
|
||||||
|
"unevictable_pgs_mlockfreed",
|
||||||
|
|
||||||
|
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
|
||||||
|
"thp_fault_alloc",
|
||||||
|
"thp_fault_fallback",
|
||||||
|
"thp_collapse_alloc",
|
||||||
|
"thp_collapse_alloc_failed",
|
||||||
|
"thp_split",
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* CONFIG_VM_EVENTS_COUNTERS */
|
||||||
|
};
|
||||||
|
#endif /* CONFIG_PROC_FS || CONFIG_SYSFS */
|
||||||
|
|
||||||
|
|
||||||
#ifdef CONFIG_PROC_FS
|
#ifdef CONFIG_PROC_FS
|
||||||
static void frag_show_print(struct seq_file *m, pg_data_t *pgdat,
|
static void frag_show_print(struct seq_file *m, pg_data_t *pgdat,
|
||||||
struct zone *zone)
|
struct zone *zone)
|
||||||
|
|
@ -831,135 +963,6 @@ static const struct file_operations pagetypeinfo_file_ops = {
|
||||||
.release = seq_release,
|
.release = seq_release,
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef CONFIG_ZONE_DMA
|
|
||||||
#define TEXT_FOR_DMA(xx) xx "_dma",
|
|
||||||
#else
|
|
||||||
#define TEXT_FOR_DMA(xx)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_ZONE_DMA32
|
|
||||||
#define TEXT_FOR_DMA32(xx) xx "_dma32",
|
|
||||||
#else
|
|
||||||
#define TEXT_FOR_DMA32(xx)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_HIGHMEM
|
|
||||||
#define TEXT_FOR_HIGHMEM(xx) xx "_high",
|
|
||||||
#else
|
|
||||||
#define TEXT_FOR_HIGHMEM(xx)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define TEXTS_FOR_ZONES(xx) TEXT_FOR_DMA(xx) TEXT_FOR_DMA32(xx) xx "_normal", \
|
|
||||||
TEXT_FOR_HIGHMEM(xx) xx "_movable",
|
|
||||||
|
|
||||||
static const char * const vmstat_text[] = {
|
|
||||||
/* Zoned VM counters */
|
|
||||||
"nr_free_pages",
|
|
||||||
"nr_inactive_anon",
|
|
||||||
"nr_active_anon",
|
|
||||||
"nr_inactive_file",
|
|
||||||
"nr_active_file",
|
|
||||||
"nr_unevictable",
|
|
||||||
"nr_mlock",
|
|
||||||
"nr_anon_pages",
|
|
||||||
"nr_mapped",
|
|
||||||
"nr_file_pages",
|
|
||||||
"nr_dirty",
|
|
||||||
"nr_writeback",
|
|
||||||
"nr_slab_reclaimable",
|
|
||||||
"nr_slab_unreclaimable",
|
|
||||||
"nr_page_table_pages",
|
|
||||||
"nr_kernel_stack",
|
|
||||||
"nr_unstable",
|
|
||||||
"nr_bounce",
|
|
||||||
"nr_vmscan_write",
|
|
||||||
"nr_writeback_temp",
|
|
||||||
"nr_isolated_anon",
|
|
||||||
"nr_isolated_file",
|
|
||||||
"nr_shmem",
|
|
||||||
"nr_dirtied",
|
|
||||||
"nr_written",
|
|
||||||
|
|
||||||
#ifdef CONFIG_NUMA
|
|
||||||
"numa_hit",
|
|
||||||
"numa_miss",
|
|
||||||
"numa_foreign",
|
|
||||||
"numa_interleave",
|
|
||||||
"numa_local",
|
|
||||||
"numa_other",
|
|
||||||
#endif
|
|
||||||
"nr_anon_transparent_hugepages",
|
|
||||||
"nr_dirty_threshold",
|
|
||||||
"nr_dirty_background_threshold",
|
|
||||||
|
|
||||||
#ifdef CONFIG_VM_EVENT_COUNTERS
|
|
||||||
"pgpgin",
|
|
||||||
"pgpgout",
|
|
||||||
"pswpin",
|
|
||||||
"pswpout",
|
|
||||||
|
|
||||||
TEXTS_FOR_ZONES("pgalloc")
|
|
||||||
|
|
||||||
"pgfree",
|
|
||||||
"pgactivate",
|
|
||||||
"pgdeactivate",
|
|
||||||
|
|
||||||
"pgfault",
|
|
||||||
"pgmajfault",
|
|
||||||
|
|
||||||
TEXTS_FOR_ZONES("pgrefill")
|
|
||||||
TEXTS_FOR_ZONES("pgsteal")
|
|
||||||
TEXTS_FOR_ZONES("pgscan_kswapd")
|
|
||||||
TEXTS_FOR_ZONES("pgscan_direct")
|
|
||||||
|
|
||||||
#ifdef CONFIG_NUMA
|
|
||||||
"zone_reclaim_failed",
|
|
||||||
#endif
|
|
||||||
"pginodesteal",
|
|
||||||
"slabs_scanned",
|
|
||||||
"kswapd_steal",
|
|
||||||
"kswapd_inodesteal",
|
|
||||||
"kswapd_low_wmark_hit_quickly",
|
|
||||||
"kswapd_high_wmark_hit_quickly",
|
|
||||||
"kswapd_skip_congestion_wait",
|
|
||||||
"pageoutrun",
|
|
||||||
"allocstall",
|
|
||||||
|
|
||||||
"pgrotated",
|
|
||||||
|
|
||||||
#ifdef CONFIG_COMPACTION
|
|
||||||
"compact_blocks_moved",
|
|
||||||
"compact_pages_moved",
|
|
||||||
"compact_pagemigrate_failed",
|
|
||||||
"compact_stall",
|
|
||||||
"compact_fail",
|
|
||||||
"compact_success",
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_HUGETLB_PAGE
|
|
||||||
"htlb_buddy_alloc_success",
|
|
||||||
"htlb_buddy_alloc_fail",
|
|
||||||
#endif
|
|
||||||
"unevictable_pgs_culled",
|
|
||||||
"unevictable_pgs_scanned",
|
|
||||||
"unevictable_pgs_rescued",
|
|
||||||
"unevictable_pgs_mlocked",
|
|
||||||
"unevictable_pgs_munlocked",
|
|
||||||
"unevictable_pgs_cleared",
|
|
||||||
"unevictable_pgs_stranded",
|
|
||||||
"unevictable_pgs_mlockfreed",
|
|
||||||
|
|
||||||
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
|
|
||||||
"thp_fault_alloc",
|
|
||||||
"thp_fault_fallback",
|
|
||||||
"thp_collapse_alloc",
|
|
||||||
"thp_collapse_alloc_failed",
|
|
||||||
"thp_split",
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* CONFIG_VM_EVENTS_COUNTERS */
|
|
||||||
};
|
|
||||||
|
|
||||||
static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,
|
static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,
|
||||||
struct zone *zone)
|
struct zone *zone)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue