Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9921ecd authored by Qiang Huang's avatar Qiang Huang Committed by Linus Torvalds
Browse files

mm: add a helper function to check may oom condition 



Use helper function to check if we need to deal with oom condition.

Signed-off-by: default avatarQiang Huang <h.huangqiang@huawei.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9c2606b7

include/linux/oom.h

+5 −0
Original line number Diff line number Diff line
@@ -82,6 +82,11 @@ static inline void oom_killer_enable(void) 
	oom_killer_disabled = false;

}



static inline bool oom_gfp_allowed(gfp_t gfp_mask)

{

	return (gfp_mask & __GFP_FS) && !(gfp_mask & __GFP_NORETRY);

}



extern struct task_struct *find_lock_task_mm(struct task_struct *p);



/* sysctls */

mm/memcontrol.c

+1 −8
Original line number Diff line number Diff line
@@ -2984,21 +2984,14 @@ static int memcg_charge_kmem(struct mem_cgroup *memcg, gfp_t gfp, u64 size) 
	struct res_counter *fail_res;

	struct mem_cgroup *_memcg;

	int ret = 0;

	bool may_oom;



	ret = res_counter_charge(&memcg->kmem, size, &fail_res);

	if (ret)

		return ret;



	/*

	 * Conditions under which we can wait for the oom_killer. Those are

	 * the same conditions tested by the core page allocator

	 */

	may_oom = (gfp & __GFP_FS) && !(gfp & __GFP_NORETRY);



	_memcg = memcg;

	ret = __mem_cgroup_try_charge(NULL, gfp, size >> PAGE_SHIFT,

				      &_memcg, may_oom);

				      &_memcg, oom_gfp_allowed(gfp));



	if (ret == -EINTR)  {

		/*

mm/page_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -2593,7 +2593,7 @@ rebalance: 
	 * running out of options and have to consider going OOM

	 */

	if (!did_some_progress) {

		if ((gfp_mask & __GFP_FS) && !(gfp_mask & __GFP_NORETRY)) {

		if (oom_gfp_allowed(gfp_mask)) {

			if (oom_killer_disabled)

				goto nopage;

			/* Coredumps can quickly deplete all memory reserves */