Commit a579086c authored by Yu Zhao's avatar Yu Zhao Committed by Andrew Morton

mm: multi-gen LRU: remove eviction fairness safeguard

Recall that the eviction consumes the oldest generation: first it
bucket-sorts folios whose gen counters were updated by the aging and
reclaims the rest; then it increments lrugen->min_seq.

The current eviction fairness safeguard for global reclaim has a
dilemma: when there are multiple eligible memcgs, should it continue
or stop upon meeting the reclaim goal? If it continues, it overshoots
and increases direct reclaim latency; if it stops, it loses fairness
between memcgs it has taken memory away from and those it has yet to.

With memcg LRU, the eviction, while ensuring eventual fairness, will
stop upon meeting its goal. Therefore the current eviction fairness
safeguard for global reclaim will not be needed.

Note that memcg LRU only applies to global reclaim. For memcg reclaim,
the eviction will continue, even if it is overshooting. This becomes
unconditional due to code simplification.

Link: https://lkml.kernel.org/r/20221222041905.2431096-4-yuzhao@google.comSigned-off-by: default avatarYu Zhao <yuzhao@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Michael Larabel <Michael@MichaelLarabel.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Suren Baghdasaryan <surenb@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 6df1b221
...@@ -449,6 +449,11 @@ static bool cgroup_reclaim(struct scan_control *sc) ...@@ -449,6 +449,11 @@ static bool cgroup_reclaim(struct scan_control *sc)
return sc->target_mem_cgroup; return sc->target_mem_cgroup;
} }
static bool global_reclaim(struct scan_control *sc)
{
return !sc->target_mem_cgroup || mem_cgroup_is_root(sc->target_mem_cgroup);
}
/** /**
* writeback_throttling_sane - is the usual dirty throttling mechanism available? * writeback_throttling_sane - is the usual dirty throttling mechanism available?
* @sc: scan_control in question * @sc: scan_control in question
...@@ -499,6 +504,11 @@ static bool cgroup_reclaim(struct scan_control *sc) ...@@ -499,6 +504,11 @@ static bool cgroup_reclaim(struct scan_control *sc)
return false; return false;
} }
static bool global_reclaim(struct scan_control *sc)
{
return true;
}
static bool writeback_throttling_sane(struct scan_control *sc) static bool writeback_throttling_sane(struct scan_control *sc)
{ {
return true; return true;
...@@ -5006,8 +5016,7 @@ static int isolate_folios(struct lruvec *lruvec, struct scan_control *sc, int sw ...@@ -5006,8 +5016,7 @@ static int isolate_folios(struct lruvec *lruvec, struct scan_control *sc, int sw
return scanned; return scanned;
} }
static int evict_folios(struct lruvec *lruvec, struct scan_control *sc, int swappiness, static int evict_folios(struct lruvec *lruvec, struct scan_control *sc, int swappiness)
bool *need_swapping)
{ {
int type; int type;
int scanned; int scanned;
...@@ -5096,9 +5105,6 @@ static int evict_folios(struct lruvec *lruvec, struct scan_control *sc, int swap ...@@ -5096,9 +5105,6 @@ static int evict_folios(struct lruvec *lruvec, struct scan_control *sc, int swap
goto retry; goto retry;
} }
if (need_swapping && type == LRU_GEN_ANON)
*need_swapping = true;
return scanned; return scanned;
} }
...@@ -5138,67 +5144,26 @@ static unsigned long get_nr_to_scan(struct lruvec *lruvec, struct scan_control * ...@@ -5138,67 +5144,26 @@ static unsigned long get_nr_to_scan(struct lruvec *lruvec, struct scan_control *
return min_seq[!can_swap] + MIN_NR_GENS <= max_seq ? nr_to_scan : 0; return min_seq[!can_swap] + MIN_NR_GENS <= max_seq ? nr_to_scan : 0;
} }
static bool should_abort_scan(struct lruvec *lruvec, unsigned long seq, static unsigned long get_nr_to_reclaim(struct scan_control *sc)
struct scan_control *sc, bool need_swapping)
{ {
int i; /* don't abort memcg reclaim to ensure fairness */
DEFINE_MAX_SEQ(lruvec); if (!global_reclaim(sc))
return -1;
if (!current_is_kswapd()) {
/* age each memcg at most once to ensure fairness */
if (max_seq - seq > 1)
return true;
/* over-swapping can increase allocation latency */
if (sc->nr_reclaimed >= sc->nr_to_reclaim && need_swapping)
return true;
/* give this thread a chance to exit and free its memory */
if (fatal_signal_pending(current)) {
sc->nr_reclaimed += MIN_LRU_BATCH;
return true;
}
if (cgroup_reclaim(sc))
return false;
} else if (sc->nr_reclaimed - sc->last_reclaimed < sc->nr_to_reclaim)
return false;
/* keep scanning at low priorities to ensure fairness */
if (sc->priority > DEF_PRIORITY - 2)
return false;
/*
* A minimum amount of work was done under global memory pressure. For
* kswapd, it may be overshooting. For direct reclaim, the allocation
* may succeed if all suitable zones are somewhat safe. In either case,
* it's better to stop now, and restart later if necessary.
*/
for (i = 0; i <= sc->reclaim_idx; i++) {
unsigned long wmark;
struct zone *zone = lruvec_pgdat(lruvec)->node_zones + i;
if (!managed_zone(zone))
continue;
wmark = current_is_kswapd() ? high_wmark_pages(zone) : low_wmark_pages(zone);
if (wmark > zone_page_state(zone, NR_FREE_PAGES))
return false;
}
sc->nr_reclaimed += MIN_LRU_BATCH; /* discount the previous progress for kswapd */
if (current_is_kswapd())
return sc->nr_to_reclaim + sc->last_reclaimed;
return true; return max(sc->nr_to_reclaim, compact_gap(sc->order));
} }
static void lru_gen_shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc) static void lru_gen_shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc)
{ {
struct blk_plug plug; struct blk_plug plug;
bool need_aging = false; bool need_aging = false;
bool need_swapping = false;
unsigned long scanned = 0; unsigned long scanned = 0;
unsigned long reclaimed = sc->nr_reclaimed; unsigned long reclaimed = sc->nr_reclaimed;
DEFINE_MAX_SEQ(lruvec); unsigned long nr_to_reclaim = get_nr_to_reclaim(sc);
lru_add_drain(); lru_add_drain();
...@@ -5222,7 +5187,7 @@ static void lru_gen_shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc ...@@ -5222,7 +5187,7 @@ static void lru_gen_shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc
if (!nr_to_scan) if (!nr_to_scan)
goto done; goto done;
delta = evict_folios(lruvec, sc, swappiness, &need_swapping); delta = evict_folios(lruvec, sc, swappiness);
if (!delta) if (!delta)
goto done; goto done;
...@@ -5230,7 +5195,7 @@ static void lru_gen_shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc ...@@ -5230,7 +5195,7 @@ static void lru_gen_shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc
if (scanned >= nr_to_scan) if (scanned >= nr_to_scan)
break; break;
if (should_abort_scan(lruvec, max_seq, sc, need_swapping)) if (sc->nr_reclaimed >= nr_to_reclaim)
break; break;
cond_resched(); cond_resched();
...@@ -5677,7 +5642,7 @@ static int run_eviction(struct lruvec *lruvec, unsigned long seq, struct scan_co ...@@ -5677,7 +5642,7 @@ static int run_eviction(struct lruvec *lruvec, unsigned long seq, struct scan_co
if (sc->nr_reclaimed >= nr_to_reclaim) if (sc->nr_reclaimed >= nr_to_reclaim)
return 0; return 0;
if (!evict_folios(lruvec, sc, swappiness, NULL)) if (!evict_folios(lruvec, sc, swappiness))
return 0; return 0;
cond_resched(); cond_resched();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment