Revert "memcg: support memcg sync reclaim work as kswapd"

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I4IMAK
CVE: NA

-------------------------------

This reverts commit 1496d67c.
Signed-off-by: NLu Jialin <lujialin4@huawei.com>
Reviewed-by: NXiu Jianfeng <xiujianfeng@huawei.com>
Reviewed-by: NKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>

mm/memcontrol.c

@@ -2367,10 +2367,8 @@ static void high_work_func(struct work_struct *work)
 {
 	struct mem_cgroup *memcg;
 
-	current->flags |= PF_SWAPWRITE | PF_MEMALLOC | PF_KSWAPD;
 	memcg = container_of(work, struct mem_cgroup, high_work);
 	reclaim_high(memcg, MEMCG_CHARGE_BATCH, GFP_KERNEL);
-	current->flags &= ~(PF_SWAPWRITE | PF_MEMALLOC | PF_KSWAPD);
 }
 
 /*
@@ -2540,11 +2538,9 @@ void mem_cgroup_handle_over_high(void)
 	 * memory.high is currently batched, whereas memory.max and the page
 	 * allocator run every time an allocation is made.
 	 */
-	current->flags |= PF_SWAPWRITE | PF_MEMALLOC | PF_KSWAPD;
 	nr_reclaimed = reclaim_high(memcg,
 				    in_retry ? SWAP_CLUSTER_MAX : nr_pages,
 				    GFP_KERNEL);
-	current->flags &= ~(PF_SWAPWRITE | PF_MEMALLOC | PF_KSWAPD);
 
 	/*
 	 * memory.high is breached and reclaim is unable to keep up. Throttle

mm/vmscan.c

@@ -61,8 +61,6 @@
 
 #include "internal.h"
 
-#define MEMCG_KSWAPD_SCATOR 10
-
 #define CREATE_TRACE_POINTS
 #include <trace/events/vmscan.h>
 
@@ -2836,24 +2834,6 @@ static inline bool should_continue_reclaim(struct pglist_data *pgdat,
 	return inactive_lru_pages > pages_for_compaction;
 }
 
-static bool is_memcg_kswapd_stopped(struct scan_control *sc)
-{
-	struct mem_cgroup *memcg = sc->target_mem_cgroup;
-	bool is_stop = false;
-	unsigned long stop_flag = 0;
-
-	if (!cgroup_reclaim(sc))
-		return false;
-	if (memcg->memory.max == PAGE_COUNTER_MAX)
-		stop_flag = memcg->memory.high / 6;
-	else
-		stop_flag = memcg->memory.high - memcg->memory.max *
-			    MEMCG_KSWAPD_SCATOR / 1000;
-	is_stop = page_counter_read(&memcg->memory) < stop_flag;
-
-	return (current_is_kswapd() && is_stop);
-}
-
 static void shrink_node_memcgs(pg_data_t *pgdat, struct scan_control *sc)
 {
 	struct mem_cgroup *target_memcg = sc->target_mem_cgroup;
@@ -2909,14 +2889,6 @@ static void shrink_node_memcgs(pg_data_t *pgdat, struct scan_control *sc)
 			   sc->nr_scanned - scanned,
 			   sc->nr_reclaimed - reclaimed);
 
-		/*
-		 * Memcg background reclaim would break iter once memcg kswapd
-		 * flag is satisfied.
-		 */
-		if (is_memcg_kswapd_stopped(sc)) {
-			mem_cgroup_iter_break(target_memcg, memcg);
-			break;
-		}
 	} while ((memcg = mem_cgroup_iter(target_memcg, memcg, NULL)));
 }
 
@@ -3285,9 +3257,6 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
 		__count_zid_vm_events(ALLOCSTALL, sc->reclaim_idx, 1);
 
 	do {
-		if (is_memcg_kswapd_stopped(sc))
-			break;
-
 		vmpressure_prio(sc->gfp_mask, sc->target_mem_cgroup,
 				sc->priority);
 		sc->nr_scanned = 0;
@@ -3350,13 +3319,8 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
 		goto retry;
 	}
 
-	/*
-	 * Untapped cgroup reserves?  Don't OOM, retry.
-	 * memcg usage is lower than memory.high / 2, memcg kswapd will lead to
-	 * stop memcg reclaim, but should not break low protection.
-	 */
-	if (sc->memcg_low_skipped &&
-	    !(current_is_kswapd() && cgroup_reclaim(sc))) {
+	/* Untapped cgroup reserves?  Don't OOM, retry. */
+	if (sc->memcg_low_skipped) {
 		sc->priority = initial_priority;
 		sc->force_deactivate = 0;
 		sc->memcg_low_reclaim = 1;