Messages in this thread Patch in this message | | | From | KOSAKI Motohiro <> | Subject | [PATCH 5/5] move PGDEACTIVATE modification to shrink_active_list() | Date | Thu, 16 Jul 2009 17:40:53 +0900 (JST) |
| |
Subject: move PGDEACTIVATE modification to shrink_active_list()
Pgmoved accounting in move_active_pages_to_lru() doesn't make any sense. it can be calculated in irq enabled area.
This patch move #-of-deactivating-pages calcution to shrink_active_list().
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> --- mm/vmscan.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
Index: b/mm/vmscan.c =================================================================== --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1217,7 +1217,6 @@ static void move_active_pages_to_lru(str struct list_head *list, enum lru_list lru) { - unsigned long pgmoved = 0; struct pagevec pvec; struct page *page; @@ -1231,7 +1230,6 @@ static void move_active_pages_to_lru(str SetPageLRU(page); add_page_to_lru_list(zone, page, lru); - pgmoved++; if (!pagevec_add(&pvec, page) || list_empty(list)) { spin_unlock_irq(&zone->lru_lock); @@ -1241,8 +1239,6 @@ static void move_active_pages_to_lru(str spin_lock_irq(&zone->lru_lock); } } - if (!is_active_lru(lru)) - __count_vm_events(PGDEACTIVATE, pgmoved); } static void shrink_active_list(unsigned long nr_pages, struct zone *zone, @@ -1257,6 +1253,7 @@ static void shrink_active_list(unsigned struct page *page; struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(zone, sc); unsigned long nr_rotated = 0; + unsigned long nr_deactivate = 0; lru_add_drain(); spin_lock_irq(&zone->lru_lock); @@ -1311,6 +1308,7 @@ static void shrink_active_list(unsigned ClearPageActive(page); /* we are de-activating */ list_add(&page->lru, &l_inactive); + nr_deactivate++; } /* @@ -1324,6 +1322,7 @@ static void shrink_active_list(unsigned * get_scan_ratio. */ reclaim_stat->recent_rotated[!!file] += nr_rotated; + __count_vm_events(PGDEACTIVATE, nr_deactivate); move_active_pages_to_lru(zone, &l_active, LRU_ACTIVE + file * LRU_FILE);
| |