The patch titled
Subject: mm-introduce-common-page-state-for-ballooned-memory-fix-v2--2
has been added to the -mm tree. Its filename is
mm-introduce-common-page-state-for-ballooned-memory-fix-v2-2.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-introduce-common-page-state-for-ballooned-memory-fix-v2-2.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-introduce-common-page-state-for-ballooned-memory-fix-v2-2.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Konstantin Khlebnikov <koct9i@xxxxxxxxx>
Subject: mm-introduce-common-page-state-for-ballooned-memory-fix-v2--2
This reverts per-zone balloon counters and removes them from meminfo,
zoneinfo. Instead of that this patch adds three /proc/vmstat counters:
"balloon_inflate", "balloon_deflate" and "balloon_migrate". Current size
of balloon is (balloon_inflate - balloon_deflate) pages.
Signed-off-by: Konstantin Khlebnikov <koct9i@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/filesystems/proc.txt | 2 --
drivers/base/node.c | 6 ------
fs/proc/meminfo.c | 6 ------
include/linux/mmzone.h | 3 ---
include/linux/vm_event_item.h | 7 +++++++
mm/vmstat.c | 10 +++++++---
6 files changed, 14 insertions(+), 20 deletions(-)
diff -puN Documentation/filesystems/proc.txt~mm-introduce-common-page-state-for-ballooned-memory-fix-v2-2 Documentation/filesystems/proc.txt
--- a/Documentation/filesystems/proc.txt~mm-introduce-common-page-state-for-ballooned-memory-fix-v2-2
+++ a/Documentation/filesystems/proc.txt
@@ -796,7 +796,6 @@ VmallocTotal: 112216 kB
VmallocUsed: 428 kB
VmallocChunk: 111088 kB
AnonHugePages: 49152 kB
-BalloonPages: 0 kB
MemTotal: Total usable ram (i.e. physical ram minus a few reserved
bits and the kernel binary code)
@@ -839,7 +838,6 @@ MemAvailable: An estimate of how much me
Writeback: Memory which is actively being written back to the disk
AnonPages: Non-file backed pages mapped into userspace page tables
AnonHugePages: Non-file backed huge pages mapped into userspace page tables
-BalloonPages: Memory which was ballooned, not included into MemTotal
Mapped: files which have been mmaped, such as libraries
Slab: in-kernel data structures cache
SReclaimable: Part of Slab, that might be reclaimed, such as caches
diff -puN drivers/base/node.c~mm-introduce-common-page-state-for-ballooned-memory-fix-v2-2 drivers/base/node.c
--- a/drivers/base/node.c~mm-introduce-common-page-state-for-ballooned-memory-fix-v2-2
+++ a/drivers/base/node.c
@@ -120,9 +120,6 @@ static ssize_t node_read_meminfo(struct
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
"Node %d AnonHugePages: %8lu kB\n"
#endif
-#ifdef CONFIG_MEMORY_BALLOON
- "Node %d BalloonPages: %8lu kB\n"
-#endif
,
nid, K(node_page_state(nid, NR_FILE_DIRTY)),
nid, K(node_page_state(nid, NR_WRITEBACK)),
@@ -144,9 +141,6 @@ static ssize_t node_read_meminfo(struct
,nid, K(node_page_state(nid,
NR_ANON_TRANSPARENT_HUGEPAGES) * HPAGE_PMD_NR)
#endif
-#ifdef CONFIG_MEMORY_BALLOON
- ,nid, K(node_page_state(nid, NR_BALLOON_PAGES))
-#endif
);
n += hugetlb_report_node_meminfo(nid, buf + n);
return n;
diff -puN fs/proc/meminfo.c~mm-introduce-common-page-state-for-ballooned-memory-fix-v2-2 fs/proc/meminfo.c
--- a/fs/proc/meminfo.c~mm-introduce-common-page-state-for-ballooned-memory-fix-v2-2
+++ a/fs/proc/meminfo.c
@@ -138,9 +138,6 @@ static int meminfo_proc_show(struct seq_
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
"AnonHugePages: %8lu kB\n"
#endif
-#ifdef CONFIG_MEMORY_BALLOON
- "BalloonPages: %8lu kB\n"
-#endif
,
K(i.totalram),
K(i.freeram),
@@ -196,9 +193,6 @@ static int meminfo_proc_show(struct seq_
,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
HPAGE_PMD_NR)
#endif
-#ifdef CONFIG_MEMORY_BALLOON
- ,K(global_page_state(NR_BALLOON_PAGES))
-#endif
);
hugetlb_report_meminfo(m);
diff -puN include/linux/mmzone.h~mm-introduce-common-page-state-for-ballooned-memory-fix-v2-2 include/linux/mmzone.h
--- a/include/linux/mmzone.h~mm-introduce-common-page-state-for-ballooned-memory-fix-v2-2
+++ a/include/linux/mmzone.h
@@ -157,9 +157,6 @@ enum zone_stat_item {
WORKINGSET_NODERECLAIM,
NR_ANON_TRANSPARENT_HUGEPAGES,
NR_FREE_CMA_PAGES,
-#ifdef CONFIG_MEMORY_BALLOON
- NR_BALLOON_PAGES,
-#endif
NR_VM_ZONE_STAT_ITEMS };
/*
diff -puN include/linux/vm_event_item.h~mm-introduce-common-page-state-for-ballooned-memory-fix-v2-2 include/linux/vm_event_item.h
--- a/include/linux/vm_event_item.h~mm-introduce-common-page-state-for-ballooned-memory-fix-v2-2
+++ a/include/linux/vm_event_item.h
@@ -72,6 +72,13 @@ enum vm_event_item { PGPGIN, PGPGOUT, PS
THP_ZERO_PAGE_ALLOC,
THP_ZERO_PAGE_ALLOC_FAILED,
#endif
+#ifdef CONFIG_MEMORY_BALLOON
+ BALLOON_INFLATE,
+ BALLOON_DEFLATE,
+#ifdef CONFIG_BALLOON_COMPACTION
+ BALLOON_MIGRATE,
+#endif
+#endif
#ifdef CONFIG_DEBUG_TLBFLUSH
#ifdef CONFIG_SMP
NR_TLB_REMOTE_FLUSH, /* cpu tried to flush others' tlbs */
diff -puN mm/vmstat.c~mm-introduce-common-page-state-for-ballooned-memory-fix-v2-2 mm/vmstat.c
--- a/mm/vmstat.c~mm-introduce-common-page-state-for-ballooned-memory-fix-v2-2
+++ a/mm/vmstat.c
@@ -778,9 +778,6 @@ const char * const vmstat_text[] = {
"workingset_nodereclaim",
"nr_anon_transparent_hugepages",
"nr_free_cma",
-#ifdef CONFIG_MEMORY_BALLOON
- "nr_balloon_pages",
-#endif
/* enum writeback_stat_item counters */
"nr_dirty_threshold",
@@ -866,6 +863,13 @@ const char * const vmstat_text[] = {
"thp_zero_page_alloc",
"thp_zero_page_alloc_failed",
#endif
+#ifdef CONFIG_MEMORY_BALLOON
+ "balloon_inflate",
+ "balloon_deflate",
+#ifdef CONFIG_BALLOON_COMPACTION
+ "balloon_migrate",
+#endif
+#endif /* CONFIG_MEMORY_BALLOON */
#ifdef CONFIG_DEBUG_TLBFLUSH
#ifdef CONFIG_SMP
"nr_tlb_remote_flush",
_
Patches currently in -mm which might be from koct9i@xxxxxxxxx are
selftests-vm-transhuge-stress-stress-test-for-memory-compaction.patch
mm-introduce-common-page-state-for-ballooned-memory-fix-v2-2.patch
mm-balloon_compaction-use-common-page-ballooning-v2-fix-1.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
