Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1180312

[patch v3 3/3] mm, oom: do not panic for oom kills triggered from sysrq

Show all headers | View raw

Sysrq+f is used to kill a process either for debug or when the VM is
otherwise unresponsive.

It is not intended to trigger a panic when no process may be killed.

Avoid panicking the system for sysrq+f when no processes are killed.

Suggested-by: Michal Hocko <mhocko@suse.cz>
Signed-off-by: David Rientjes <rientjes@google.com>
---
 v2: no change
 v3: fix title per Hillf

 Documentation/sysrq.txt | 3 ++-
 mm/oom_kill.c           | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

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");
 	}
-	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/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[patch v2 1/3] mm, oom: organize oom context into struct David Rientjes <rientjes@google.com> - 2015-07-01 23:40 +0200
  [patch v2 2/3] mm, oom: organize oom context into struct David Rientjes <rientjes@google.com> - 2015-07-01 23:40 +0200
    Re: [patch v2 2/3] mm, oom: organize oom context into struct David Rientjes <rientjes@google.com> - 2015-07-09 01:30 +0200
  [patch v2 3/3] mm, oom: organize oom context into struct David Rientjes <rientjes@google.com> - 2015-07-01 23:40 +0200
  [patch v3 1/3] mm, oom: organize oom context into struct David Rientjes <rientjes@google.com> - 2015-07-09 01:50 +0200
    [patch v3 2/3] mm, oom: pass an oom order of -1 when triggered by  sysrq David Rientjes <rientjes@google.com> - 2015-07-09 01:50 +0200
    [patch v3 3/3] mm, oom: do not panic for oom kills triggered from  sysrq David Rientjes <rientjes@google.com> - 2015-07-09 01:50 +0200
    Re: [patch v3 1/3] mm, oom: organize oom context into struct David Rientjes <rientjes@google.com> - 2015-07-15 01:50 +0200

csiph-web