From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932392AbbLRJ1F (ORCPT ); Fri, 18 Dec 2015 04:27:05 -0500 Received: from mx2.suse.de ([195.135.220.15]:39629 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754648AbbLRJDu (ORCPT ); Fri, 18 Dec 2015 04:03:50 -0500 From: Vlastimil Babka To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Vlastimil Babka , Joonsoo Kim , Minchan Kim , Sasha Levin , "Kirill A. Shutemov" , Mel Gorman , Michal Hocko Subject: [PATCH v3 08/14] mm, oom: print symbolic gfp_flags in oom warning Date: Fri, 18 Dec 2015 10:03:20 +0100 Message-Id: <1450429406-7081-9-git-send-email-vbabka@suse.cz> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1450429406-7081-1-git-send-email-vbabka@suse.cz> References: <1450429406-7081-1-git-send-email-vbabka@suse.cz> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It would be useful to translate gfp_flags into string representation when printing in case of an OOM, especially as the flags have been undergoing some changes recently and the script ./scripts/gfp-translate needs a matching source version to be accurate. Example output: a.out invoked oom-killer: order=0, gfp_mask=0x24280ca(GFP_HIGHUSER_MOVABLE|GFP_ZERO), om_score_adj=0 Signed-off-by: Vlastimil Babka Cc: Joonsoo Kim Cc: Minchan Kim Cc: Sasha Levin Cc: "Kirill A. Shutemov" Cc: Mel Gorman Acked-by: Michal Hocko --- mm/oom_kill.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index dc490c06941b..f92b75750fc5 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -386,10 +386,11 @@ static void dump_tasks(struct mem_cgroup *memcg, const nodemask_t *nodemask) static void dump_header(struct oom_control *oc, struct task_struct *p, struct mem_cgroup *memcg) { - pr_warning("%s invoked oom-killer: gfp_mask=0x%x, order=%d, " - "oom_score_adj=%hd\n", - current->comm, oc->gfp_mask, oc->order, + pr_warn("%s invoked oom-killer: order=%d, gfp_mask=%#x(%pgg), " + "oom_score_adj=%hd\n", + current->comm, oc->order, oc->gfp_mask, &oc->gfp_mask, current->signal->oom_score_adj); + cpuset_print_current_mems_allowed(); dump_stack(); if (memcg) -- 2.6.3