diff --git a/mm/memcontrol.c b/mm/memcontrol.c index a6994003af60e830593d60a7304672ee792933ef..26523e19a89bbdc3b04a3d01375b27e6d60aff4c 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -68,7 +68,6 @@ #include #include #include -#include #include "internal.h" #include #include @@ -2671,13 +2670,11 @@ static void reclaim_wmark(struct mem_cgroup *memcg) * simply record the whole duration of reclaim_wmark work for the * overhead-accuracy trade-off. */ - pre_oom_enter(); start = ktime_get_ns(); psi_memstall_enter(&pflags); try_to_free_mem_cgroup_pages(memcg, nr_pages, GFP_KERNEL, MEMCG_RECLAIM_MAY_SWAP); psi_memstall_leave(&pflags); duration = ktime_get_ns() - start; - pre_oom_leave(); if (!css_tryget_online(&memcg->css)) return; @@ -2713,13 +2710,11 @@ static unsigned long reclaim_high(struct mem_cgroup *memcg, memcg_memory_event(memcg, MEMCG_HIGH); - pre_oom_enter(); psi_memstall_enter(&pflags); nr_reclaimed += try_to_free_mem_cgroup_pages(memcg, nr_pages, gfp_mask, MEMCG_RECLAIM_MAY_SWAP); psi_memstall_leave(&pflags); - pre_oom_leave(); } while ((memcg = parent_mem_cgroup(memcg)) && !mem_cgroup_is_root(memcg)); @@ -3011,14 +3006,12 @@ static int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask, memcg_memory_event(mem_over_limit, MEMCG_MAX); raised_max_event = true; - pre_oom_enter(); memcg_lat_stat_start(&start); psi_memstall_enter(&pflags); nr_reclaimed = try_to_free_mem_cgroup_pages(mem_over_limit, nr_pages, gfp_mask, reclaim_options); psi_memstall_leave(&pflags); memcg_lat_stat_end(MEM_LAT_MEMCG_DIRECT_RECLAIM, start); - pre_oom_leave(); if (mem_cgroup_margin(mem_over_limit) >= nr_pages) goto retry; diff --git a/mm/vmscan.c b/mm/vmscan.c index 3388141a659a275580a036aaa739e13a9b055253..1bf9f16c3b8fb78f37094f033196054c5adf89e2 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -60,7 +60,6 @@ #ifdef CONFIG_PAGECACHE_LIMIT #include #endif -#include #include #include @@ -6990,7 +6989,6 @@ static int balance_pgdat(pg_data_t *pgdat, int order, int highest_zoneidx) }; set_task_reclaim_state(current, &sc.reclaim_state); - pre_oom_enter(); psi_memstall_enter(&pflags); __fs_reclaim_acquire(_THIS_IP_); @@ -7173,7 +7171,6 @@ static int balance_pgdat(pg_data_t *pgdat, int order, int highest_zoneidx) snapshot_refaults(NULL, pgdat); __fs_reclaim_release(_THIS_IP_); psi_memstall_leave(&pflags); - pre_oom_leave(); set_task_reclaim_state(current, NULL); /*