Commit 54c4fe08 authored by Haifeng Xu's avatar Haifeng Xu Committed by Andrew Morton

mm/vmscan: simplify shrink_node()

The difference between sc->nr_reclaimed and nr_reclaimed is computed three
times.  Introduce a new variable to record the value, so it only needs to
be computed once.

Link: https://lkml.kernel.org/r/20230411061757.12041-1-haifeng.xu@shopee.comSigned-off-by: default avatarHaifeng Xu <haifeng.xu@shopee.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 09a607c9
...@@ -6463,7 +6463,7 @@ static void shrink_node_memcgs(pg_data_t *pgdat, struct scan_control *sc) ...@@ -6463,7 +6463,7 @@ static void shrink_node_memcgs(pg_data_t *pgdat, struct scan_control *sc)
static void shrink_node(pg_data_t *pgdat, struct scan_control *sc) static void shrink_node(pg_data_t *pgdat, struct scan_control *sc)
{ {
struct reclaim_state *reclaim_state = current->reclaim_state; struct reclaim_state *reclaim_state = current->reclaim_state;
unsigned long nr_reclaimed, nr_scanned; unsigned long nr_reclaimed, nr_scanned, nr_node_reclaimed;
struct lruvec *target_lruvec; struct lruvec *target_lruvec;
bool reclaimable = false; bool reclaimable = false;
...@@ -6489,13 +6489,14 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc) ...@@ -6489,13 +6489,14 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc)
reclaim_state->reclaimed_slab = 0; reclaim_state->reclaimed_slab = 0;
} }
nr_node_reclaimed = sc->nr_reclaimed - nr_reclaimed;
/* Record the subtree's reclaim efficiency */ /* Record the subtree's reclaim efficiency */
if (!sc->proactive) if (!sc->proactive)
vmpressure(sc->gfp_mask, sc->target_mem_cgroup, true, vmpressure(sc->gfp_mask, sc->target_mem_cgroup, true,
sc->nr_scanned - nr_scanned, sc->nr_scanned - nr_scanned, nr_node_reclaimed);
sc->nr_reclaimed - nr_reclaimed);
if (sc->nr_reclaimed - nr_reclaimed) if (nr_node_reclaimed)
reclaimable = true; reclaimable = true;
if (current_is_kswapd()) { if (current_is_kswapd()) {
...@@ -6557,8 +6558,7 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc) ...@@ -6557,8 +6558,7 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc)
test_bit(LRUVEC_CONGESTED, &target_lruvec->flags)) test_bit(LRUVEC_CONGESTED, &target_lruvec->flags))
reclaim_throttle(pgdat, VMSCAN_THROTTLE_CONGESTED); reclaim_throttle(pgdat, VMSCAN_THROTTLE_CONGESTED);
if (should_continue_reclaim(pgdat, sc->nr_reclaimed - nr_reclaimed, if (should_continue_reclaim(pgdat, nr_node_reclaimed, sc))
sc))
goto again; goto again;
/* /*
......
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