|
@@ -1394,6 +1394,7 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan,
|
|
|
struct list_head *src = &lruvec->lists[lru];
|
|
|
unsigned long nr_taken = 0;
|
|
|
unsigned long nr_zone_taken[MAX_NR_ZONES] = { 0 };
|
|
|
+ unsigned long nr_skipped[MAX_NR_ZONES] = { 0, };
|
|
|
unsigned long scan, nr_pages;
|
|
|
LIST_HEAD(pages_skipped);
|
|
|
|
|
@@ -1408,6 +1409,7 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan,
|
|
|
|
|
|
if (page_zonenum(page) > sc->reclaim_idx) {
|
|
|
list_move(&page->lru, &pages_skipped);
|
|
|
+ nr_skipped[page_zonenum(page)]++;
|
|
|
continue;
|
|
|
}
|
|
|
|
|
@@ -1436,8 +1438,17 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan,
|
|
|
* scanning would soon rescan the same pages to skip and put the
|
|
|
* system at risk of premature OOM.
|
|
|
*/
|
|
|
- if (!list_empty(&pages_skipped))
|
|
|
+ if (!list_empty(&pages_skipped)) {
|
|
|
+ int zid;
|
|
|
+
|
|
|
list_splice(&pages_skipped, src);
|
|
|
+ for (zid = 0; zid < MAX_NR_ZONES; zid++) {
|
|
|
+ if (!nr_skipped[zid])
|
|
|
+ continue;
|
|
|
+
|
|
|
+ __count_zid_vm_events(PGSCAN_SKIP, zid, nr_skipped[zid]);
|
|
|
+ }
|
|
|
+ }
|
|
|
*nr_scanned = scan;
|
|
|
trace_mm_vmscan_lru_isolate(sc->reclaim_idx, sc->order, nr_to_scan, scan,
|
|
|
nr_taken, mode, is_file_lru(lru));
|
|
@@ -2680,7 +2691,7 @@ retry:
|
|
|
delayacct_freepages_start();
|
|
|
|
|
|
if (global_reclaim(sc))
|
|
|
- count_vm_event(ALLOCSTALL);
|
|
|
+ __count_zid_vm_events(ALLOCSTALL, sc->reclaim_idx, 1);
|
|
|
|
|
|
do {
|
|
|
vmpressure_prio(sc->gfp_mask, sc->target_mem_cgroup,
|