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

Commit 09316c09 authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by Linus Torvalds
Browse files

mm/balloon_compaction: add vmstat counters and kpageflags bit 



Always mark pages with PageBalloon even if balloon compaction is disabled
and expose this mark in /proc/kpageflags as KPF_BALLOON.

Also this patch adds three counters into /proc/vmstat: "balloon_inflate",
"balloon_deflate" and "balloon_migrate".  They accumulate balloon
activity.  Current size of balloon is (balloon_inflate - balloon_deflate)
pages.

All generic balloon code now gathered under option CONFIG_MEMORY_BALLOON.
It should be selected by ballooning driver which wants use this feature.
Currently virtio-balloon is the only user.

Signed-off-by: default avatarKonstantin Khlebnikov <k.khlebnikov@samsung.com>
Cc: Rafael Aquini <aquini@redhat.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9d1ba805

drivers/virtio/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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.

drivers/virtio/virtio_balloon.c

+1 −0
Original line number Diff line number Diff line
@@ -396,6 +396,7 @@ static int virtballoon_migratepage(struct balloon_dev_info *vb_dev_info, 
	spin_lock_irqsave(&vb_dev_info->pages_lock, flags);

	balloon_page_insert(vb_dev_info, newpage);

	vb_dev_info->isolated_pages--;

	__count_vm_event(BALLOON_MIGRATE);

	spin_unlock_irqrestore(&vb_dev_info->pages_lock, flags);

	vb->num_pfns = VIRTIO_BALLOON_PAGES_PER_PAGE;

	set_page_pfns(vb->pfns, newpage);

fs/proc/page.c

+3 −0
Original line number Diff line number Diff line
@@ -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);

include/linux/balloon_compaction.h

+2 −0
Original line number Diff line number Diff line
@@ -166,11 +166,13 @@ static inline gfp_t balloon_mapping_gfp_mask(void) 
static inline void balloon_page_insert(struct balloon_dev_info *balloon,

				       struct page *page)

{

	__SetPageBalloon(page);

	list_add(&page->lru, &balloon->pages);

}



static inline void balloon_page_delete(struct page *page)

{

	__ClearPageBalloon(page);

	list_del(&page->lru);

}

include/linux/vm_event_item.h

+7 −0
Original line number Diff line number Diff line
@@ -72,6 +72,13 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, 
		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 */