Commit 8d49b699 authored by Roman Gushchin's avatar Roman Gushchin Committed by Andrew Morton
Browse files

mm: memcg: rename memcg_oom_recover() 

Rename memcg_oom_recover() into memcg1_oom_recover() for consistency with
other memory cgroup v1-related functions.

Move the declaration in mm/memcontrol-v1.h to be nearby other memcg v1 oom
handling functions.

Link: https://lkml.kernel.org/r/20240625005906.106920-10-roman.gushchin@linux.dev


Signed-off-by: default avatarRoman Gushchin <roman.gushchin@linux.dev>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Acked-by: default avatarShakeel Butt <shakeel.butt@linux.dev>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Muchun Song <muchun.song@linux.dev>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 292fc2e0

mm/memcontrol-v1.c

+3 −3
Original line number Diff line number Diff line
@@ -1090,8 +1090,8 @@ static void __mem_cgroup_clear_mc(void) 


		mc.moved_swap = 0;

	}

	memcg_oom_recover(from);

	memcg_oom_recover(to);

	memcg1_oom_recover(from);

	memcg1_oom_recover(to);

	wake_up_all(&mc.waitq);

}
@@ -2067,7 +2067,7 @@ static int memcg_oom_wake_function(wait_queue_entry_t *wait, 
	return autoremove_wake_function(wait, mode, sync, arg);

}



void memcg_oom_recover(struct mem_cgroup *memcg)

void memcg1_oom_recover(struct mem_cgroup *memcg)

{

	/*

	 * For the following lockless ->under_oom test, the only required

mm/memcontrol-v1.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ static inline void memcg1_soft_limit_reset(struct mem_cgroup *memcg) 


void mem_cgroup_charge_statistics(struct mem_cgroup *memcg, int nr_pages);

void memcg1_check_events(struct mem_cgroup *memcg, int nid);

void memcg_oom_recover(struct mem_cgroup *memcg);

int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask,

		     unsigned int nr_pages);
@@ -92,5 +91,6 @@ ssize_t memcg_write_event_control(struct kernfs_open_file *of, 


bool memcg1_oom_prepare(struct mem_cgroup *memcg, bool *locked);

void memcg1_oom_finish(struct mem_cgroup *memcg, bool locked);

void memcg1_oom_recover(struct mem_cgroup *memcg);



#endif	/* __MM_MEMCONTROL_V1_H */

mm/memcontrol.c

+3 −3
Original line number Diff line number Diff line
@@ -3165,7 +3165,7 @@ static int mem_cgroup_resize_max(struct mem_cgroup *memcg, 
	} while (true);



	if (!ret && enlarge)

		memcg_oom_recover(memcg);

		memcg1_oom_recover(memcg);



	return ret;

}
@@ -3750,7 +3750,7 @@ static int mem_cgroup_oom_control_write(struct cgroup_subsys_state *css, 


	WRITE_ONCE(memcg->oom_kill_disable, val);

	if (!val)

		memcg_oom_recover(memcg);

		memcg1_oom_recover(memcg);



	return 0;

}
@@ -5444,7 +5444,7 @@ static void uncharge_batch(const struct uncharge_gather *ug) 
			page_counter_uncharge(&ug->memcg->memsw, ug->nr_memory);

		if (ug->nr_kmem)

			memcg_account_kmem(ug->memcg, -ug->nr_kmem);

		memcg_oom_recover(ug->memcg);

		memcg1_oom_recover(ug->memcg);

	}



	local_irq_save(flags);