|
@@ -1310,14 +1310,7 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
|
|
|
pagevec_release(&pvec);
|
|
|
}
|
|
|
|
|
|
-/**
|
|
|
- * inactive_anon_is_low - check if anonymous pages need to be deactivated
|
|
|
- * @zone: zone to check
|
|
|
- *
|
|
|
- * Returns true if the zone does not have enough inactive anon pages,
|
|
|
- * meaning some active anon pages need to be deactivated.
|
|
|
- */
|
|
|
-static int inactive_anon_is_low(struct zone *zone)
|
|
|
+static int inactive_anon_is_low_global(struct zone *zone)
|
|
|
{
|
|
|
unsigned long active, inactive;
|
|
|
|
|
@@ -1330,6 +1323,25 @@ static int inactive_anon_is_low(struct zone *zone)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+/**
|
|
|
+ * inactive_anon_is_low - check if anonymous pages need to be deactivated
|
|
|
+ * @zone: zone to check
|
|
|
+ * @sc: scan control of this context
|
|
|
+ *
|
|
|
+ * Returns true if the zone does not have enough inactive anon pages,
|
|
|
+ * meaning some active anon pages need to be deactivated.
|
|
|
+ */
|
|
|
+static int inactive_anon_is_low(struct zone *zone, struct scan_control *sc)
|
|
|
+{
|
|
|
+ int low;
|
|
|
+
|
|
|
+ if (scan_global_lru(sc))
|
|
|
+ low = inactive_anon_is_low_global(zone);
|
|
|
+ else
|
|
|
+ low = mem_cgroup_inactive_anon_is_low(sc->mem_cgroup, zone);
|
|
|
+ return low;
|
|
|
+}
|
|
|
+
|
|
|
static unsigned long shrink_list(enum lru_list lru, unsigned long nr_to_scan,
|
|
|
struct zone *zone, struct scan_control *sc, int priority)
|
|
|
{
|
|
@@ -1340,8 +1352,7 @@ static unsigned long shrink_list(enum lru_list lru, unsigned long nr_to_scan,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
- if (lru == LRU_ACTIVE_ANON &&
|
|
|
- (!scan_global_lru(sc) || inactive_anon_is_low(zone))) {
|
|
|
+ if (lru == LRU_ACTIVE_ANON && inactive_anon_is_low(zone, sc)) {
|
|
|
shrink_active_list(nr_to_scan, zone, sc, priority, file);
|
|
|
return 0;
|
|
|
}
|
|
@@ -1509,9 +1520,7 @@ static void shrink_zone(int priority, struct zone *zone,
|
|
|
* Even if we did not try to evict anon pages at all, we want to
|
|
|
* rebalance the anon lru active/inactive ratio.
|
|
|
*/
|
|
|
- if (!scan_global_lru(sc) || inactive_anon_is_low(zone))
|
|
|
- shrink_active_list(SWAP_CLUSTER_MAX, zone, sc, priority, 0);
|
|
|
- else if (!scan_global_lru(sc))
|
|
|
+ if (inactive_anon_is_low(zone, sc))
|
|
|
shrink_active_list(SWAP_CLUSTER_MAX, zone, sc, priority, 0);
|
|
|
|
|
|
throttle_vm_writeout(sc->gfp_mask);
|
|
@@ -1807,7 +1816,7 @@ loop_again:
|
|
|
* Do some background aging of the anon list, to give
|
|
|
* pages a chance to be referenced before reclaiming.
|
|
|
*/
|
|
|
- if (inactive_anon_is_low(zone))
|
|
|
+ if (inactive_anon_is_low(zone, &sc))
|
|
|
shrink_active_list(SWAP_CLUSTER_MAX, zone,
|
|
|
&sc, priority, 0);
|
|
|
|