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

Commit bbfd28ee authored by Lee Schermerhorn's avatar Lee Schermerhorn Committed by Linus Torvalds
Browse files

unevictable lru: add event counting with statistics 



Fix to unevictable-lru-page-statistics.patch

Add unevictable lru infrastructure vm events to the statistics patch.
Rename the "NORECL_" and "noreclaim_" symbols and text strings to
"UNEVICTABLE_" and "unevictable_", respectively.

Currently, both the infrastructure and the mlocked pages event are
added by a single patch later in the series.  This makes it difficult
to add or rework the incremental patches.  The events actually "belong"
with the stats, so pull them up to here.

Also, restore the event counting to putback_lru_page().  This was removed
from previous patch in series where it was "misplaced".  The actual events
weren't defined that early.

Signed-off-by: default avatarLee Schermerhorn <lee.schermerhorn@hp.com>
Cc: Rik van Riel <riel@redhat.com>
Reviewed-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 894bc310

include/linux/vmstat.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -40,6 +40,11 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, 
		PAGEOUTRUN, ALLOCSTALL, PGROTATED,

		PAGEOUTRUN, ALLOCSTALL, PGROTATED,

#ifdef CONFIG_HUGETLB_PAGE

#ifdef CONFIG_HUGETLB_PAGE

		HTLB_BUDDY_PGALLOC, HTLB_BUDDY_PGALLOC_FAIL,

		HTLB_BUDDY_PGALLOC, HTLB_BUDDY_PGALLOC_FAIL,

#endif

#ifdef CONFIG_UNEVICTABLE_LRU

		UNEVICTABLE_PGCULLED,	/* culled to noreclaim list */

		UNEVICTABLE_PGSCANNED,	/* scanned for reclaimability */

		UNEVICTABLE_PGRESCUED,	/* rescued from noreclaim list */

#endif

#endif

		NR_VM_EVENT_ITEMS

		NR_VM_EVENT_ITEMS

};

};

mm/vmscan.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -484,6 +484,7 @@ void putback_lru_page(struct page *page) 
{

{

	int lru;

	int lru;

	int active = !!TestClearPageActive(page);

	int active = !!TestClearPageActive(page);

	int was_unevictable = PageUnevictable(page);





	VM_BUG_ON(PageLRU(page));

	VM_BUG_ON(PageLRU(page));
@@ -525,6 +526,11 @@ void putback_lru_page(struct page *page) 
		 */

		 */

	}

	}





	if (was_unevictable && lru != LRU_UNEVICTABLE)

		count_vm_event(UNEVICTABLE_PGRESCUED);

	else if (!was_unevictable && lru == LRU_UNEVICTABLE)

		count_vm_event(UNEVICTABLE_PGCULLED);



	put_page(page);		/* drop ref from isolate */

	put_page(page);		/* drop ref from isolate */

}

}

mm/vmstat.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -677,6 +677,11 @@ static const char * const vmstat_text[] = { 
	"htlb_buddy_alloc_success",

	"htlb_buddy_alloc_success",

	"htlb_buddy_alloc_fail",

	"htlb_buddy_alloc_fail",

#endif

#endif

#ifdef CONFIG_UNEVICTABLE_LRU

	"unevictable_pgs_culled",

	"unevictable_pgs_scanned",

	"unevictable_pgs_rescued",

#endif

#endif

#endif

};

};