From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rafael Aquini Subject: [PATCH v4 3/3] mm: add vm event counters for balloon pages compaction Date: Tue, 17 Jul 2012 13:50:43 -0300 Message-ID: <4af2f0d495db34075d6bf4f921f326c6eb71cf2d.1342485774.git.aquini__33936.7527085871$1342543918$gmane$org@redhat.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: In-Reply-To: References: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.linux-foundation.org Errors-To: virtualization-bounces@lists.linux-foundation.org To: linux-mm@kvack.org Cc: Rik van Riel , Rafael Aquini , Konrad Rzeszutek Wilk , "Michael S. Tsirkin" , linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, Minchan Kim , Andi Kleen , Andrew Morton , Rafael Aquini List-Id: virtualization@lists.linuxfoundation.org This patch is only for testing report purposes and shall be dropped in case of the rest of this patchset getting accepted for merging. Signed-off-by: Rafael Aquini --- drivers/virtio/virtio_balloon.c | 1 + include/linux/vm_event_item.h | 2 ++ mm/compaction.c | 1 + mm/migrate.c | 6 ++++-- mm/vmstat.c | 4 ++++ 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 7669bc8..c4ddcd7 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -410,6 +410,7 @@ int virtballoon_migratepage(struct address_space *mapping, mutex_unlock(&balloon_lock); + count_vm_event(COMPACTBALLOONMIGRATED); return 0; } diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h index 06f8e38..e330c5a 100644 --- a/include/linux/vm_event_item.h +++ b/include/linux/vm_event_item.h @@ -40,6 +40,8 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, #ifdef CONFIG_COMPACTION COMPACTBLOCKS, COMPACTPAGES, COMPACTPAGEFAILED, COMPACTSTALL, COMPACTFAIL, COMPACTSUCCESS, + COMPACTBALLOONMIGRATED, COMPACTBALLOONFAILED, + COMPACTBALLOONISOLATED, COMPACTBALLOONFREED, #endif #ifdef CONFIG_HUGETLB_PAGE HTLB_BUDDY_PGALLOC, HTLB_BUDDY_PGALLOC_FAIL, diff --git a/mm/compaction.c b/mm/compaction.c index 51eac0c..d212dde 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -72,6 +72,7 @@ static bool isolate_balloon_page(struct page *page) if (is_balloon_page(page) && (page_count(page) == 2)) { __isolate_balloon_page(page); unlock_page(page); + count_vm_event(COMPACTBALLOONISOLATED); return true; } unlock_page(page); diff --git a/mm/migrate.c b/mm/migrate.c index 59c7bc5..5838719 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -78,9 +78,10 @@ void putback_lru_pages(struct list_head *l) list_del(&page->lru); dec_zone_page_state(page, NR_ISOLATED_ANON + page_is_file_cache(page)); - if (unlikely(is_balloon_page(page))) + if (unlikely(is_balloon_page(page))) { + count_vm_event(COMPACTBALLOONFAILED); WARN_ON(!putback_balloon_page(page)); - else + } else putback_lru_page(page); } } @@ -878,6 +879,7 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private, page_is_file_cache(page)); put_page(page); __free_page(page); + count_vm_event(COMPACTBALLOONFREED); return rc; } out: diff --git a/mm/vmstat.c b/mm/vmstat.c index 1bbbbd9..3b7109f 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -767,6 +767,10 @@ const char * const vmstat_text[] = { "compact_stall", "compact_fail", "compact_success", + "compact_balloon_migrated", + "compact_balloon_failed", + "compact_balloon_isolated", + "compact_balloon_freed", #endif #ifdef CONFIG_HUGETLB_PAGE -- 1.7.10.4