|
@@ -83,24 +83,6 @@ static bool has_intersects_mems_allowed(struct task_struct *tsk,
|
|
|
}
|
|
|
#endif /* CONFIG_NUMA */
|
|
|
|
|
|
-/*
|
|
|
- * If this is a system OOM (not a memcg OOM) and the task selected to be
|
|
|
- * killed is not already running at high (RT) priorities, speed up the
|
|
|
- * recovery by boosting the dying task to the lowest FIFO priority.
|
|
|
- * That helps with the recovery and avoids interfering with RT tasks.
|
|
|
- */
|
|
|
-static void boost_dying_task_prio(struct task_struct *p,
|
|
|
- struct mem_cgroup *mem)
|
|
|
-{
|
|
|
- struct sched_param param = { .sched_priority = 1 };
|
|
|
-
|
|
|
- if (mem)
|
|
|
- return;
|
|
|
-
|
|
|
- if (!rt_task(p))
|
|
|
- sched_setscheduler_nocheck(p, SCHED_FIFO, ¶m);
|
|
|
-}
|
|
|
-
|
|
|
/*
|
|
|
* The process p may have detached its own ->mm while exiting or through
|
|
|
* use_mm(), but one or more of its subthreads may still have a valid
|
|
@@ -452,13 +434,6 @@ static int oom_kill_task(struct task_struct *p, struct mem_cgroup *mem)
|
|
|
set_tsk_thread_flag(p, TIF_MEMDIE);
|
|
|
force_sig(SIGKILL, p);
|
|
|
|
|
|
- /*
|
|
|
- * We give our sacrificial lamb high priority and access to
|
|
|
- * all the memory it needs. That way it should be able to
|
|
|
- * exit() and clear out its resources quickly...
|
|
|
- */
|
|
|
- boost_dying_task_prio(p, mem);
|
|
|
-
|
|
|
return 0;
|
|
|
}
|
|
|
#undef K
|
|
@@ -482,7 +457,6 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
|
|
|
*/
|
|
|
if (p->flags & PF_EXITING) {
|
|
|
set_tsk_thread_flag(p, TIF_MEMDIE);
|
|
|
- boost_dying_task_prio(p, mem);
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -556,7 +530,6 @@ void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask)
|
|
|
*/
|
|
|
if (fatal_signal_pending(current)) {
|
|
|
set_thread_flag(TIF_MEMDIE);
|
|
|
- boost_dying_task_prio(current, NULL);
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -712,7 +685,6 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask,
|
|
|
*/
|
|
|
if (fatal_signal_pending(current)) {
|
|
|
set_thread_flag(TIF_MEMDIE);
|
|
|
- boost_dying_task_prio(current, NULL);
|
|
|
return;
|
|
|
}
|
|
|
|