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

Commit bbc1fb5c authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "mm: oom-kill: Add lmk_kill possible for ULMK""

parents 3c948ad1 a0107aaf

include/linux/oom.h

+0 −11
Original line number Diff line number Diff line
@@ -122,17 +122,6 @@ extern void oom_killer_enable(void); 


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



#ifdef CONFIG_HAVE_USERSPACE_LOW_MEMORY_KILLER

extern bool should_ulmk_retry(void);

extern void ulmk_update_last_kill(void);

#else

static inline bool should_ulmk_retry(void)

{

	return false;

}

static inline void ulmk_update_last_kill(void) {}

#endif



/* sysctls */

extern int sysctl_oom_dump_tasks;

extern int sysctl_oom_kill_allocating_task;

kernel/signal.c

+1 −3
Original line number Diff line number Diff line
@@ -1407,10 +1407,8 @@ int group_send_sig_info(int sig, struct kernel_siginfo *info, 


	if (!ret && sig) {

		ret = do_send_sig_info(sig, info, p, type);

		if (capable(CAP_KILL) && sig == SIGKILL) {

		if (capable(CAP_KILL) && sig == SIGKILL)

			add_to_oom_reaper(p);

			ulmk_update_last_kill();

		}

	}



	return ret;

mm/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -759,17 +759,6 @@ config PERCPU_STATS 
	  information includes global and per chunk statistics, which can

	  be used to help understand percpu memory usage.





config HAVE_USERSPACE_LOW_MEMORY_KILLER

	bool "Have userspace low memory killer"

	default n

	help

	  The page allocator cannot directly call into a

	  userspace low memory killer as it can call into the OOM killer.

	  Therefore, add a timeout mechanism to give the userspace

	  low memory killer a chance to run.





config GUP_BENCHMARK

	bool "Enable infrastructure for get_user_pages_fast() benchmarking"

	help

mm/oom_kill.c

+0 −22
Original line number Diff line number Diff line
@@ -73,28 +73,6 @@ static inline bool is_memcg_oom(struct oom_control *oc) 
	return oc->memcg != NULL;

}



/*

 * If ULMK has killed a process recently,

 * we are making progress.

 */



#ifdef CONFIG_HAVE_USERSPACE_LOW_MEMORY_KILLER

static atomic64_t ulmk_kill_jiffies = ATOMIC64_INIT(INITIAL_JIFFIES);





bool should_ulmk_retry(void)

{

	unsigned long j = atomic64_read(&ulmk_kill_jiffies);



	return time_before(jiffies, j + 2 * HZ);

}



void ulmk_update_last_kill(void)

{

	atomic64_set(&ulmk_kill_jiffies, jiffies);

}

#endif



#ifdef CONFIG_NUMA

/**

 * oom_cpuset_eligible() - check task eligiblity for kill

mm/page_alloc.c

+0 −3
Original line number Diff line number Diff line
@@ -4680,9 +4680,6 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, 
	if (costly_order && !(gfp_mask & __GFP_RETRY_MAYFAIL))

		goto nopage;



	if (order <= PAGE_ALLOC_COSTLY_ORDER && should_ulmk_retry())

		goto retry;



	if (should_reclaim_retry(gfp_mask, order, ac, alloc_flags,

				 did_some_progress > 0, &no_progress_loops))

		goto retry;