--- include/linux/vmstat.h | 2 +- mm/swap.c | 2 +- mm/vmscan.c | 7 ++++--- mm/vmstat.c | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h index ee03bba..edf77d1 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h @@ -30,7 +30,7 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, FOR_ALL_ZONES(PGALLOC), - PGFREE, PGACTIVATE, PGDEACTIVATE, + PGFREE, PGACTIVATE_ANON, PGACTIVATE_FILE, PGDEACTIVATE, PGFAULT, PGMAJFAULT, FOR_ALL_ZONES(PGREFILL), FOR_ALL_ZONES(PGSTEAL), diff --git a/mm/swap.c b/mm/swap.c index 308e57d..3433204 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -187,7 +187,7 @@ void activate_page(struct page *page) SetPageActive(page); lru += LRU_ACTIVE; add_page_to_lru_list(zone, page, lru); - __count_vm_event(PGACTIVATE); + __count_vm_event(PGACTIVATE_FILE + file); update_page_reclaim_stat(zone, page, file, 1); } diff --git a/mm/vmscan.c b/mm/vmscan.c index 674a78b..9349b83 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -623,7 +623,7 @@ static unsigned long shrink_page_list(struct list_head *page_list, { LIST_HEAD(ret_pages); struct pagevec freed_pvec; - int pgactivate = 0; + int pgactivate[2] = { 0, 0 }; unsigned long nr_reclaimed = 0; cond_resched(); @@ -821,8 +821,8 @@ activate_locked: if (PageSwapCache(page) && vm_swap_full()) try_to_free_swap(page); VM_BUG_ON(PageActive(page)); + pgactivate[page_is_file_cache(page)]++; SetPageActive(page); - pgactivate++; keep_locked: unlock_page(page); keep: @@ -832,7 +832,8 @@ keep: list_splice(&ret_pages, page_list); if (pagevec_count(&freed_pvec)) __pagevec_free(&freed_pvec); - count_vm_events(PGACTIVATE, pgactivate); + count_vm_events(PGACTIVATE_ANON, pgactivate[0]); + count_vm_events(PGACTIVATE_FILE, pgactivate[1]); return nr_reclaimed; } diff --git a/mm/vmstat.c b/mm/vmstat.c index 6051fba..d7b6810 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -665,7 +665,8 @@ static const char * const vmstat_text[] = { TEXTS_FOR_ZONES("pgalloc") "pgfree", - "pgactivate", + "pgactivate_anon", + "pgactivate_file", "pgdeactivate", "pgfault", -- 1.6.5.4