Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932508Ab1EJIO2 (ORCPT ); Tue, 10 May 2011 04:14:28 -0400 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:33865 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932463Ab1EJIOY (ORCPT ); Tue, 10 May 2011 04:14:24 -0400 X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.3.1 From: KOSAKI Motohiro To: KOSAKI Motohiro Subject: [PATCH 1/4] oom: improve dump_tasks() show items Cc: kosaki.motohiro@jp.fujitsu.com, CAI Qian , avagin@gmail.com, Andrey Vagin , Andrew Morton , Mel Gorman , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Minchan Kim , David Rientjes , Hugh Dickins , Oleg Nesterov In-Reply-To: <20110510171335.16A7.A69D9226@jp.fujitsu.com> References: <20110509182110.167F.A69D9226@jp.fujitsu.com> <20110510171335.16A7.A69D9226@jp.fujitsu.com> Message-Id: <20110510171600.16AB.A69D9226@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Mailer: Becky! ver. 2.56.05 [ja] Date: Tue, 10 May 2011 17:14:21 +0900 (JST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2186 Lines: 66 Recently, oom internal logic was dramatically changed. Thus dump_tasks() is no longer useful. it has some meaningless items and don't have some oom socre related items. This patch adapt displaying fields to new oom logic. details ========== removed: pid (we always kill process. don't need thread id), mm->total_vm (we no longer uses virtual memory size) signal->oom_adj (we no longer uses it internally) added: ppid (we often kill sacrifice child process) modify: RSS (account mm->nr_ptes too) Signed-off-by: KOSAKI Motohiro --- Strictly speaking. this is NOT a part of oom fixing patches. but it's necessary when I parse QAI's test result. mm/oom_kill.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index f52e85c..118d958 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -355,7 +355,7 @@ static void dump_tasks(const struct mem_cgroup *mem, const nodemask_t *nodemask) struct task_struct *p; struct task_struct *task; - pr_info("[ pid ] uid tgid total_vm rss cpu oom_adj oom_score_adj name\n"); + pr_info("[ pid] ppid uid rss cpu score_adj name\n"); for_each_process(p) { if (oom_unkillable_task(p, mem, nodemask)) continue; @@ -370,11 +370,13 @@ static void dump_tasks(const struct mem_cgroup *mem, const nodemask_t *nodemask) continue; } - pr_info("[%5d] %5d %5d %8lu %8lu %3u %3d %5d %s\n", - task->pid, task_uid(task), task->tgid, - task->mm->total_vm, get_mm_rss(task->mm), - task_cpu(task), task->signal->oom_adj, - task->signal->oom_score_adj, task->comm); + pr_info("[%6d] %6d %5d %8lu %4u %9d %s\n", + task_tgid_nr(task), task_tgid_nr(task->real_parent), + task_uid(task), + get_mm_rss(task->mm) + p->mm->nr_ptes, + task_cpu(task), + task->signal->oom_score_adj, + task->comm); task_unlock(task); } } -- 1.7.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/