[RHEL8,COMMIT] ms/mm: vmscan: split shrink_node() into node part and memcgs part

Submitted by Konstantin Khorenko on April 2, 2020, 1:03 p.m.

Details

Message ID 202004021303.032D30Sr002739@finist_co8.work.ct
State New
Series "Series without cover letter"
Headers show

Commit Message

Konstantin Khorenko April 2, 2020, 1:03 p.m.
The commit is pushed to "branch-rh8-4.18.0-80.1.2.vz8.3.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh8-4.18.0-80.1.2.vz8.3.4
------>
commit 5eb440ed125fbc69a15d5c31183d85cde3b92af8
Author: Johannes Weiner <hannes@cmpxchg.org>
Date:   Thu Apr 2 16:03:00 2020 +0300

    ms/mm: vmscan: split shrink_node() into node part and memcgs part
    
    This function is getting long and unwieldy, split out the memcg bits.
    
    The updated shrink_node() handles the generic (node) reclaim aspects:
      - global vmpressure notifications
      - writeback and congestion throttling
      - reclaim/compaction management
      - kswapd giving up on unreclaimable nodes
    
    It then calls a new shrink_node_memcgs() which handles cgroup specifics:
      - the cgroup tree traversal
      - memory.low considerations
      - per-cgroup slab shrinking callbacks
      - per-cgroup vmpressure notifications
    
    [hannes@cmpxchg.org: rename "root" to "target_memcg", per Roman]
      Link: http://lkml.kernel.org/r/20191025143640.GA386981@cmpxchg.org
    Link: http://lkml.kernel.org/r/20191022144803.302233-8-hannes@cmpxchg.org
    Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
    Reviewed-by: Roman Gushchin <guro@fb.com>
    Reviewed-by: Shakeel Butt <shakeelb@google.com>
    Acked-by: Michal Hocko <mhocko@suse.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    
    (cherry picked from commit 0f6a5cff43d3bcd6aa54c9af267737249d02aa21)
    Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
---
 mm/vmscan.c | 48 ++++++++++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 20 deletions(-)

Patch hide | download patch | download mbox

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 2b443e6f5bc3..066f7eb7bb73 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -2489,31 +2489,22 @@  static bool pgdat_memcg_congested(pg_data_t *pgdat, struct mem_cgroup *memcg)
 		(memcg && memcg_congested(pgdat, memcg));
 }
 
-static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc)
+static void shrink_node_memcgs(pg_data_t *pgdat, struct scan_control *sc)
 {
-	struct reclaim_state *reclaim_state = current->reclaim_state;
-	struct mem_cgroup *root = sc->target_mem_cgroup;
-	unsigned long nr_reclaimed, nr_scanned;
-	bool reclaimable = false;
+	struct mem_cgroup *target_memcg = sc->target_mem_cgroup;
 	struct mem_cgroup *memcg;
 	struct mem_cgroup_reclaim_cookie reclaim = {
 		.pgdat = pgdat,
 		.priority = sc->priority,
 	};
 
-again:
-	reclaim.generation = 0;
-	memset(&sc->nr, 0, sizeof(sc->nr));
-	nr_reclaimed = sc->nr_reclaimed;
-	nr_scanned = sc->nr_scanned;
-
-	memcg = mem_cgroup_iter(root, NULL, &reclaim);
+	memcg = mem_cgroup_iter(target_memcg, NULL, &reclaim);
 	do {
 		struct lruvec *lruvec = mem_cgroup_lruvec(memcg, pgdat);
 		unsigned long reclaimed;
 		unsigned long scanned;
 
-		switch (mem_cgroup_protected(root, memcg)) {
+		switch (mem_cgroup_protected(target_memcg, memcg)) {
 		case MEMCG_PROT_MIN:
 			/*
 			 * Hard protection.
@@ -2563,10 +2554,26 @@  static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc)
 		 */
 		if (cgroup_reclaim(sc) &&
 			sc->nr_reclaimed >= sc->nr_to_reclaim) {
-			mem_cgroup_iter_break(root, memcg);
+			mem_cgroup_iter_break(target_memcg, memcg);
 			break;
 		}
-	} while ((memcg = mem_cgroup_iter(root, memcg, &reclaim)));
+	} while ((memcg = mem_cgroup_iter(target_memcg, memcg, &reclaim)));
+}
+
+static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc)
+{
+	struct reclaim_state *reclaim_state = current->reclaim_state;
+	struct mem_cgroup *target_memcg = sc->target_mem_cgroup;
+	unsigned long nr_reclaimed, nr_scanned;
+	bool reclaimable = false;
+
+again:
+	memset(&sc->nr, 0, sizeof(sc->nr));
+
+	nr_reclaimed = sc->nr_reclaimed;
+	nr_scanned = sc->nr_scanned;
+
+	shrink_node_memcgs(pgdat, sc);
 
 	if (!cgroup_reclaim(sc))
 		shrink_slab(sc->gfp_mask, pgdat->node_id, NULL,
@@ -2578,9 +2585,9 @@  static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc)
 	}
 
 	/* Record the subtree's reclaim efficiency */
-	vmpressure(sc->gfp_mask, sc->target_mem_cgroup, true,
-			   sc->nr_scanned - nr_scanned,
-			   sc->nr_reclaimed - nr_reclaimed);
+	vmpressure(sc->gfp_mask, target_memcg, true,
+		   sc->nr_scanned - nr_scanned,
+		   sc->nr_reclaimed - nr_reclaimed);
 
 	if (sc->nr_reclaimed - nr_reclaimed)
 		reclaimable = true;
@@ -2634,7 +2641,7 @@  static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc)
 	 */
 	if (cgroup_reclaim(sc) && writeback_throttling_sane(sc) &&
 	    sc->nr.dirty && sc->nr.dirty == sc->nr.congested)
-		set_memcg_congestion(pgdat, root, true);
+		set_memcg_congestion(pgdat, target_memcg, true);
 
 	/*
 	 * Stall direct reclaim for IO completions if underlying BDIs
@@ -2643,7 +2650,8 @@  static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc)
 	 * the LRU too quickly.
 	 */
 	if (!sc->hibernation_mode && !current_is_kswapd() &&
-	    current_may_throttle() && pgdat_memcg_congested(pgdat, root))
+	    current_may_throttle() &&
+	    pgdat_memcg_congested(pgdat, target_memcg))
 		wait_iff_congested(BLK_RW_ASYNC, HZ/10);
 
 	if (should_continue_reclaim(pgdat, sc->nr_reclaimed - nr_reclaimed,