diff options
| author | Anton Blanchard <anton@samba.org> | 2005-07-08 02:56:06 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-08 03:23:36 +0200 |
| commit | 42639269f9ce4aac2e6c20bcbca30b5da8b9a899 (patch) | |
| tree | 1583ac4da9d2e40669d4579e338d8e506dedba5a | |
| parent | [PATCH] remove completly bogus comment inside __alloc_pages() try_to_free_pag... (diff) | |
| download | linux-42639269f9ce4aac2e6c20bcbca30b5da8b9a899.tar.xz linux-42639269f9ce4aac2e6c20bcbca30b5da8b9a899.zip | |
[PATCH] mm: quieten OOM killer noise
We now print statistics when invoking the OOM killer, however this
information is not rate limited and you can get into situations where the
console is continually spammed.
For example, when a task is exiting the OOM killer will simply return
(waiting for that task to exit and clear up memory). If the VM continually
calls back into the OOM killer we get thousands of copies of show_mem() on
the console.
Use printk_ratelimit() to quieten it.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | mm/oom_kill.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index e20d559edbaf..1e56076672f5 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -258,9 +258,11 @@ void out_of_memory(unsigned int __nocast gfp_mask, int order) struct mm_struct *mm = NULL; task_t * p; - printk("oom-killer: gfp_mask=0x%x, order=%d\n", gfp_mask, order); - /* print memory stats */ - show_mem(); + if (printk_ratelimit()) { + printk("oom-killer: gfp_mask=0x%x, order=%d\n", + gfp_mask, order); + show_mem(); + } read_lock(&tasklist_lock); retry: |