Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759162AbcCVLDK (ORCPT ); Tue, 22 Mar 2016 07:03:10 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36461 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932730AbcCVLBG (ORCPT ); Tue, 22 Mar 2016 07:01:06 -0400 From: Michal Hocko To: Andrew Morton Cc: , LKML , Tetsuo Handa , David Rientjes , Michal Hocko Subject: [PATCH 4/9] mm, oom_reaper: report success/failure Date: Tue, 22 Mar 2016 12:00:21 +0100 Message-Id: <1458644426-22973-5-git-send-email-mhocko@kernel.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1458644426-22973-1-git-send-email-mhocko@kernel.org> References: <1458644426-22973-1-git-send-email-mhocko@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2048 Lines: 67 From: Michal Hocko Inform about the successful/failed oom_reaper attempts and dump all the held locks to tell us more who is blocking the progress. Signed-off-by: Michal Hocko --- mm/oom_kill.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 2830b1c6483e..e627ce235e38 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -419,6 +419,7 @@ static struct task_struct *oom_reaper_th; static struct task_struct *task_to_reap; static DECLARE_WAIT_QUEUE_HEAD(oom_reaper_wait); +#define K(x) ((x) << (PAGE_SHIFT-10)) static bool __oom_reap_task(struct task_struct *tsk) { struct mmu_gather tlb; @@ -479,6 +480,11 @@ static bool __oom_reap_task(struct task_struct *tsk) &details); } tlb_finish_mmu(&tlb, 0, -1); + pr_info("oom_reaper: reaped process %d (%s), now anon-rss:%lukB, file-rss:%lukB, shmem-rss:%lukB\n", + task_pid_nr(tsk), tsk->comm, + K(get_mm_counter(mm, MM_ANONPAGES)), + K(get_mm_counter(mm, MM_FILEPAGES)), + K(get_mm_counter(mm, MM_SHMEMPAGES))); up_read(&mm->mmap_sem); /* @@ -495,14 +501,21 @@ static bool __oom_reap_task(struct task_struct *tsk) return ret; } +#define MAX_OOM_REAP_RETRIES 10 static void oom_reap_task(struct task_struct *tsk) { int attempts = 0; /* Retry the down_read_trylock(mmap_sem) a few times */ - while (attempts++ < 10 && !__oom_reap_task(tsk)) + while (attempts++ < MAX_OOM_REAP_RETRIES && !__oom_reap_task(tsk)) schedule_timeout_idle(HZ/10); + if (attempts > MAX_OOM_REAP_RETRIES) { + pr_info("oom_reaper: unable to reap pid:%d (%s)\n", + task_pid_nr(tsk), tsk->comm); + debug_show_all_locks(); + } + /* Drop a reference taken by wake_oom_reaper */ put_task_struct(tsk); } @@ -649,7 +662,6 @@ static bool process_shares_mm(struct task_struct *p, struct mm_struct *mm) return false; } -#define K(x) ((x) << (PAGE_SHIFT-10)) /* * Must be called while holding a reference to p, which will be released upon * returning. -- 2.7.0