The patch titled
unevictable lru: add event counting with statistics
has been removed from the -mm tree. Its filename was
unevictable-infrastructure-lru-add-event-counting-with-statistics.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: unevictable lru: add event counting with statistics
From: Lee Schermerhorn <lee.schermerhorn@xxxxxx>
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: Lee Schermerhorn <lee.schermerhorn@xxxxxx>
Cc: Rik van Riel <riel@xxxxxxxxxx>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/vmstat.h | 5 +++++
mm/vmscan.c | 6 ++++++
mm/vmstat.c | 5 +++++
3 files changed, 16 insertions(+)
diff -puN include/linux/vmstat.h~unevictable-infrastructure-lru-add-event-counting-with-statistics include/linux/vmstat.h
--- a/include/linux/vmstat.h~unevictable-infrastructure-lru-add-event-counting-with-statistics
+++ a/include/linux/vmstat.h
@@ -41,6 +41,11 @@ enum vm_event_item { PGPGIN, PGPGOUT, PS
#ifdef CONFIG_HUGETLB_PAGE
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
NR_VM_EVENT_ITEMS
};
diff -puN mm/vmscan.c~unevictable-infrastructure-lru-add-event-counting-with-statistics mm/vmscan.c
--- a/mm/vmscan.c~unevictable-infrastructure-lru-add-event-counting-with-statistics
+++ a/mm/vmscan.c
@@ -484,6 +484,7 @@ void putback_lru_page(struct page *page)
{
int lru;
int active = !!TestClearPageActive(page);
+ int was_unevictable = PageUnevictable(page);
VM_BUG_ON(PageLRU(page));
@@ -525,6 +526,11 @@ redo:
*/
}
+ 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 */
}
diff -puN mm/vmstat.c~unevictable-infrastructure-lru-add-event-counting-with-statistics mm/vmstat.c
--- a/mm/vmstat.c~unevictable-infrastructure-lru-add-event-counting-with-statistics
+++ a/mm/vmstat.c
@@ -677,6 +677,11 @@ static const char * const vmstat_text[]
"htlb_buddy_alloc_success",
"htlb_buddy_alloc_fail",
#endif
+#ifdef CONFIG_UNEVICTABLE_LRU
+ "unevictable_pgs_culled",
+ "unevictable_pgs_scanned",
+ "unevictable_pgs_rescued",
+#endif
#endif
};
_
Patches currently in -mm which might be from lee.schermerhorn@xxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
