Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754133AbbGIVa7 (ORCPT ); Thu, 9 Jul 2015 17:30:59 -0400 Received: from mail-ig0-f178.google.com ([209.85.213.178]:35707 "EHLO mail-ig0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752139AbbGIVav (ORCPT ); Thu, 9 Jul 2015 17:30:51 -0400 Date: Thu, 9 Jul 2015 14:30:47 -0700 (PDT) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: Hillf Danton cc: Andrew Morton , Sergey Senozhatsky , Michal Hocko , linux-kernel , linux-mm@kvack.org Subject: Re: [patch v3 3/3] mm, oom: do not panic for oom kills triggered from sysrq In-Reply-To: <02e601d0b9fd$d644ec50$82cec4f0$@alibaba-inc.com> Message-ID: References: <02e601d0b9fd$d644ec50$82cec4f0$@alibaba-inc.com> User-Agent: Alpine 2.10 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2443 Lines: 64 On Thu, 9 Jul 2015, Hillf Danton wrote: > > diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt > > --- a/Documentation/sysrq.txt > > +++ b/Documentation/sysrq.txt > > @@ -75,7 +75,8 @@ On all - write a character to /proc/sysrq-trigger. e.g.: > > > > 'e' - Send a SIGTERM to all processes, except for init. > > > > -'f' - Will call oom_kill to kill a memory hog process. > > +'f' - Will call the oom killer to kill a memory hog process, but do not > > + panic if nothing can be killed. > > > > 'g' - Used by kgdb (kernel debugger) > > > > diff --git a/mm/oom_kill.c b/mm/oom_kill.c > > --- a/mm/oom_kill.c > > +++ b/mm/oom_kill.c > > @@ -607,6 +607,9 @@ void check_panic_on_oom(struct oom_control *oc, enum oom_constraint constraint, > > if (constraint != CONSTRAINT_NONE) > > return; > > } > > + /* Do not panic for oom kills triggered by sysrq */ > > + if (oc->order == -1) > > + return; > > dump_header(oc, NULL, memcg); > > panic("Out of memory: %s panic_on_oom is enabled\n", > > sysctl_panic_on_oom == 2 ? "compulsory" : "system-wide"); > > @@ -686,11 +689,11 @@ bool out_of_memory(struct oom_control *oc) > > > > p = select_bad_process(oc, &points, totalpages); > > /* Found nothing?!?! Either we hang forever, or we panic. */ > > - if (!p) { > > + if (!p && oc->order != -1) { > > dump_header(oc, NULL, NULL); > > panic("Out of memory and no killable processes...\n"); > > } > > Given sysctl_panic_on_oom checked, AFAICU there seems > no chance for panic, no matter -1 or not. > I'm not sure I understand your point. There are two oom killer panics: when panic_on_oom is enabled and when the oom killer can't find an eligible process. The change to the panic_on_oom panic is dealt with in check_panic_on_oom() and the no eligible process panic is dealt with here. If the sysctl is disabled, and there are no eligible processes to kill, the change in behavior here is that we don't panic when triggered from sysrq. That's the change in the hunk above. > > - if (p != (void *)-1UL) { > > + if (p && p != (void *)-1UL) { > > oom_kill_process(oc, p, points, totalpages, NULL, > > "Out of memory"); > > killed = 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/