lkml.org 
[lkml]   [2021]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH] mm/oom_kill: allow oom kill allocating task for non-global case
    Date
    At the present time, in the context of memcg OOM, even when
    sysctl_oom_kill_allocating_task is enabled/or set, the "allocating"
    task cannot be selected, as a target for the OOM killer.

    This patch removes the restriction entirely.

    Signed-off-by: Aaron Tomlin <atomlin@redhat.com>
    ---
    mm/oom_kill.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/mm/oom_kill.c b/mm/oom_kill.c
    index eefd3f5fde46..3bae33e2d9c2 100644
    --- a/mm/oom_kill.c
    +++ b/mm/oom_kill.c
    @@ -1089,9 +1089,9 @@ bool out_of_memory(struct oom_control *oc)
    oc->nodemask = NULL;
    check_panic_on_oom(oc);

    - if (!is_memcg_oom(oc) && sysctl_oom_kill_allocating_task &&
    - current->mm && !oom_unkillable_task(current) &&
    - oom_cpuset_eligible(current, oc) &&
    + if (sysctl_oom_kill_allocating_task && current->mm &&
    + !oom_unkillable_task(current) &&
    + oom_cpuset_eligible(current, oc) &&
    current->signal->oom_score_adj != OOM_SCORE_ADJ_MIN) {
    get_task_struct(current);
    oc->chosen = current;
    --
    2.26.3
    \
     
     \ /
      Last update: 2021-06-07 18:34    [W:2.838 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site