lkml.org 
[lkml]   [2017]   [Jan]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch] mm, oom: header nodemask is NULL when cpusets are disabled
    Commit 82e7d3abec86 ("oom: print nodemask in the oom report") implicitly 
    sets the allocation nodemask to cpuset_current_mems_allowed when there is
    no effective mempolicy. cpuset_current_mems_allowed is only effective
    when cpusets are enabled, which is also printed by dump_header(), so
    setting the nodemask to cpuset_current_mems_allowed is redundant and
    prevents debugging issues where ac->nodemask is not set properly in the
    page allocator.

    This provides better debugging output since
    cpuset_print_current_mems_allowed() is already provided.

    Suggested-by: Vlastimil Babka <vbabka@suse.cz>
    Signed-off-by: David Rientjes <rientjes@google.com>
    ---
    mm/oom_kill.c | 16 +++++++++-------
    1 file changed, 9 insertions(+), 7 deletions(-)

    diff --git a/mm/oom_kill.c b/mm/oom_kill.c
    --- a/mm/oom_kill.c
    +++ b/mm/oom_kill.c
    @@ -403,12 +403,14 @@ static void dump_tasks(struct mem_cgroup *memcg, const nodemask_t *nodemask)

    static void dump_header(struct oom_control *oc, struct task_struct *p)
    {
    - nodemask_t *nm = (oc->nodemask) ? oc->nodemask : &cpuset_current_mems_allowed;
    -
    - pr_warn("%s invoked oom-killer: gfp_mask=%#x(%pGg), nodemask=%*pbl, order=%d, oom_score_adj=%hd\n",
    - current->comm, oc->gfp_mask, &oc->gfp_mask,
    - nodemask_pr_args(nm), oc->order,
    - current->signal->oom_score_adj);
    + pr_warn("%s invoked oom-killer: gfp_mask=%#x(%pGg), nodemask=",
    + current->comm, oc->gfp_mask, &oc->gfp_mask);
    + if (oc->nodemask)
    + pr_cont("%*pbl", nodemask_pr_args(oc->nodemask));
    + else
    + pr_cont("(null)\n");
    + pr_cont(", order=%d, oom_score_adj=%hd\n",
    + oc->order, current->signal->oom_score_adj);
    if (!IS_ENABLED(CONFIG_COMPACTION) && oc->order)
    pr_warn("COMPACTION is disabled!!!\n");

    @@ -417,7 +419,7 @@ static void dump_header(struct oom_control *oc, struct task_struct *p)
    if (oc->memcg)
    mem_cgroup_print_oom_info(oc->memcg, p);
    else
    - show_mem(SHOW_MEM_FILTER_NODES, nm);
    + show_mem(SHOW_MEM_FILTER_NODES, oc->nodemask);
    if (sysctl_oom_dump_tasks)
    dump_tasks(oc->memcg, oc->nodemask);
    }
    \
     
     \ /
      Last update: 2017-01-19 23:58    [W:2.117 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site