The patch titled Subject: mm: introduce common page state for ballooned memory has been added to the -mm tree. Its filename is mm-introduce-common-page-state-for-ballooned-memory.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-introduce-common-page-state-for-ballooned-memory.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-introduce-common-page-state-for-ballooned-memory.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 <k.khlebnikov@xxxxxxxxxxx> Subject: mm: introduce common page state for ballooned memory Add page state PageBallon() and functions __Set/ClearPageBalloon. Like PageBuddy() PageBalloon() looks like page-flag but actually this is special state of page->_mapcount counter. There is no conflict because ballooned pages cannot be mapped and cannot be in buddy allocator. Ballooned pages are counted in vmstat counter NR_BALLOON_PAGES, it's shown them in /proc/meminfo and /proc/meminfo. Also this patch it exports PageBallon into userspace via /proc/kpageflags as KPF_BALLOON. All this code including mm/balloon_compaction.o is under CONFIG_MEMORY_BALLOON, it should be selected by ballooning driver which want use this feature. Signed-off-by: Konstantin Khlebnikov <k.khlebnikov@xxxxxxxxxxx> Cc: Rafael Aquini <aquini@xxxxxxxxxx> Cc: Andrey Ryabinin <ryabinin.a.a@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/filesystems/proc.txt | 2 ++ drivers/base/node.c | 16 ++++++++++------ drivers/virtio/Kconfig | 1 + fs/proc/meminfo.c | 6 ++++++ fs/proc/page.c | 3 +++ include/linux/mm.h | 10 ++++++++++ include/linux/mmzone.h | 3 +++ include/uapi/linux/kernel-page-flags.h | 1 + mm/Kconfig | 5 +++++ mm/Makefile | 3 ++- mm/balloon_compaction.c | 14 ++++++++++++++ mm/vmstat.c | 8 +++++++- tools/vm/page-types.c | 1 + 13 files changed, 65 insertions(+), 8 deletions(-) diff -puN Documentation/filesystems/proc.txt~mm-introduce-common-page-state-for-ballooned-memory Documentation/filesystems/proc.txt --- a/Documentation/filesystems/proc.txt~mm-introduce-common-page-state-for-ballooned-memory +++ a/Documentation/filesystems/proc.txt @@ -796,6 +796,7 @@ 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) @@ -838,6 +839,7 @@ 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 drivers/base/node.c --- a/drivers/base/node.c~mm-introduce-common-page-state-for-ballooned-memory +++ a/drivers/base/node.c @@ -120,6 +120,9 @@ 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)), @@ -136,14 +139,15 @@ static ssize_t node_read_meminfo(struct 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)), -#ifdef CONFIG_TRANSPARENT_HUGEPAGE nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE)) - , nid, - K(node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) * - HPAGE_PMD_NR)); -#else - nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE))); +#ifdef CONFIG_TRANSPARENT_HUGEPAGE + ,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 drivers/virtio/Kconfig~mm-introduce-common-page-state-for-ballooned-memory drivers/virtio/Kconfig --- a/drivers/virtio/Kconfig~mm-introduce-common-page-state-for-ballooned-memory +++ a/drivers/virtio/Kconfig @@ -25,6 +25,7 @@ config VIRTIO_PCI config VIRTIO_BALLOON tristate "Virtio balloon driver" depends on VIRTIO + select MEMORY_BALLOON ---help--- This driver supports increasing and decreasing the amount of memory within a KVM guest. diff -puN fs/proc/meminfo.c~mm-introduce-common-page-state-for-ballooned-memory fs/proc/meminfo.c --- a/fs/proc/meminfo.c~mm-introduce-common-page-state-for-ballooned-memory +++ a/fs/proc/meminfo.c @@ -138,6 +138,9 @@ 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), @@ -193,6 +196,9 @@ 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 fs/proc/page.c~mm-introduce-common-page-state-for-ballooned-memory fs/proc/page.c --- a/fs/proc/page.c~mm-introduce-common-page-state-for-ballooned-memory +++ a/fs/proc/page.c @@ -133,6 +133,9 @@ u64 stable_page_flags(struct page *page) if (PageBuddy(page)) u |= 1 << KPF_BUDDY; + if (PageBalloon(page)) + u |= 1 << KPF_BALLOON; + u |= kpf_copy_bit(k, KPF_LOCKED, PG_locked); u |= kpf_copy_bit(k, KPF_SLAB, PG_slab); diff -puN include/linux/mm.h~mm-introduce-common-page-state-for-ballooned-memory include/linux/mm.h --- a/include/linux/mm.h~mm-introduce-common-page-state-for-ballooned-memory +++ a/include/linux/mm.h @@ -554,6 +554,16 @@ static inline void __ClearPageBuddy(stru atomic_set(&page->_mapcount, -1); } +#define PAGE_BALLOON_MAPCOUNT_VALUE (-256) + +static inline int PageBalloon(struct page *page) +{ + return IS_ENABLED(CONFIG_MEMORY_BALLOON) && + atomic_read(&page->_mapcount) == PAGE_BALLOON_MAPCOUNT_VALUE; +} +void __SetPageBalloon(struct page *page); +void __ClearPageBalloon(struct page *page); + void put_page(struct page *page); void put_pages_list(struct list_head *pages); diff -puN include/linux/mmzone.h~mm-introduce-common-page-state-for-ballooned-memory include/linux/mmzone.h --- a/include/linux/mmzone.h~mm-introduce-common-page-state-for-ballooned-memory +++ a/include/linux/mmzone.h @@ -157,6 +157,9 @@ 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/uapi/linux/kernel-page-flags.h~mm-introduce-common-page-state-for-ballooned-memory include/uapi/linux/kernel-page-flags.h --- a/include/uapi/linux/kernel-page-flags.h~mm-introduce-common-page-state-for-ballooned-memory +++ a/include/uapi/linux/kernel-page-flags.h @@ -31,6 +31,7 @@ #define KPF_KSM 21 #define KPF_THP 22 +#define KPF_BALLOON 23 #endif /* _UAPILINUX_KERNEL_PAGE_FLAGS_H */ diff -puN mm/Kconfig~mm-introduce-common-page-state-for-ballooned-memory mm/Kconfig --- a/mm/Kconfig~mm-introduce-common-page-state-for-ballooned-memory +++ a/mm/Kconfig @@ -228,6 +228,11 @@ config ARCH_ENABLE_SPLIT_PMD_PTLOCK boolean # +# support for memory ballooning +config MEMORY_BALLOON + boolean + +# # support for memory balloon compaction config BALLOON_COMPACTION bool "Allow for balloon memory compaction/migration" diff -puN mm/Makefile~mm-introduce-common-page-state-for-ballooned-memory mm/Makefile --- a/mm/Makefile~mm-introduce-common-page-state-for-ballooned-memory +++ a/mm/Makefile @@ -16,7 +16,7 @@ obj-y := filemap.o mempool.o oom_kill. readahead.o swap.o truncate.o vmscan.o shmem.o \ util.o mmzone.o vmstat.o backing-dev.o \ mm_init.o mmu_context.o percpu.o slab_common.o \ - compaction.o balloon_compaction.o vmacache.o \ + compaction.o vmacache.o \ interval_tree.o list_lru.o workingset.o \ iov_iter.o $(mmu-y) @@ -64,3 +64,4 @@ obj-$(CONFIG_ZBUD) += zbud.o obj-$(CONFIG_ZSMALLOC) += zsmalloc.o obj-$(CONFIG_GENERIC_EARLY_IOREMAP) += early_ioremap.o obj-$(CONFIG_CMA) += cma.o +obj-$(CONFIG_MEMORY_BALLOON) += balloon_compaction.o diff -puN mm/balloon_compaction.c~mm-introduce-common-page-state-for-ballooned-memory mm/balloon_compaction.c --- a/mm/balloon_compaction.c~mm-introduce-common-page-state-for-ballooned-memory +++ a/mm/balloon_compaction.c @@ -10,6 +10,20 @@ #include <linux/export.h> #include <linux/balloon_compaction.h> +void __SetPageBalloon(struct page *page) +{ + VM_BUG_ON_PAGE(atomic_read(&page->_mapcount) != -1, page); + atomic_set(&page->_mapcount, PAGE_BALLOON_MAPCOUNT_VALUE); + inc_zone_page_state(page, NR_BALLOON_PAGES); +} + +void __ClearPageBalloon(struct page *page) +{ + VM_BUG_ON_PAGE(!PageBalloon(page), page); + atomic_set(&page->_mapcount, -1); + dec_zone_page_state(page, NR_BALLOON_PAGES); +} + /* * balloon_devinfo_alloc - allocates a balloon device information descriptor. * @balloon_dev_descriptor: pointer to reference the balloon device which diff -puN mm/vmstat.c~mm-introduce-common-page-state-for-ballooned-memory mm/vmstat.c --- a/mm/vmstat.c~mm-introduce-common-page-state-for-ballooned-memory +++ a/mm/vmstat.c @@ -735,7 +735,7 @@ static void walk_zones_in_node(struct se TEXT_FOR_HIGHMEM(xx) xx "_movable", const char * const vmstat_text[] = { - /* Zoned VM counters */ + /* enum zone_stat_item countes */ "nr_free_pages", "nr_alloc_batch", "nr_inactive_anon", @@ -778,10 +778,16 @@ 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", "nr_dirty_background_threshold", #ifdef CONFIG_VM_EVENT_COUNTERS + /* enum vm_event_item counters */ "pgpgin", "pgpgout", "pswpin", diff -puN tools/vm/page-types.c~mm-introduce-common-page-state-for-ballooned-memory tools/vm/page-types.c --- a/tools/vm/page-types.c~mm-introduce-common-page-state-for-ballooned-memory +++ a/tools/vm/page-types.c @@ -132,6 +132,7 @@ static const char * const page_flag_name [KPF_NOPAGE] = "n:nopage", [KPF_KSM] = "x:ksm", [KPF_THP] = "t:thp", + [KPF_BALLOON] = "o:balloon", [KPF_RESERVED] = "r:reserved", [KPF_MLOCKED] = "m:mlocked", _ Patches currently in -mm which might be from k.khlebnikov@xxxxxxxxxxx are mm-balloon_compaction-ignore-anonymous-pages.patch mm-balloon_compaction-keep-ballooned-pages-away-from-normal-migration-path.patch mm-balloon_compaction-isolate-balloon-pages-without-lru_lock.patch mm-introduce-common-page-state-for-ballooned-memory.patch mm-balloon_compaction-use-common-page-ballooning.patch mm-balloon_compaction-general-cleanup.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