From: Nick Piggin <npiggin@suse.de>
To: Andrew Morton <akpm@osdl.org>
Cc: Nick Piggin <npiggin@suse.de>,
Linux Memory Management <linux-mm@kvack.org>
Subject: [patch 4/9] oom: cpuset hint
Date: Fri, 28 Jul 2006 09:21:19 +0200 (CEST) [thread overview]
Message-ID: <20060515210605.30275.11106.sendpatchset@linux.site> (raw)
In-Reply-To: <20060515210529.30275.74992.sendpatchset@linux.site>
cpuset_excl_nodes_overlap does not always indicate that killing a task will
not free any memory we for us. For example, we may be asking for an allocation
from _anywhere_ in the machine, or the task in question may be pinning memory
that is outside its cpuset. Fix this by just causing cpuset_excl_nodes_overlap
to reduce the badness rather than disallow it.
Signed-off-by: Nick Piggin <npiggin@suse.de>
Index: linux-2.6/mm/oom_kill.c
===================================================================
--- linux-2.6.orig/mm/oom_kill.c
+++ linux-2.6/mm/oom_kill.c
@@ -127,6 +127,14 @@ unsigned long badness(struct task_struct
points /= 4;
/*
+ * If p's nodes don't overlap ours, it may still help to kill p
+ * because p may have allocated or otherwise mapped memory on
+ * this node before. However it will be less likely.
+ */
+ if (!cpuset_excl_nodes_overlap(p))
+ points /= 8;
+
+ /*
* Adjust the score by oomkilladj.
*/
if (p->oomkilladj) {
@@ -196,9 +204,6 @@ static struct task_struct *select_bad_pr
continue;
if (p->oomkilladj == OOM_DISABLE)
continue;
- /* If p's nodes don't overlap ours, it won't help to kill p. */
- if (!cpuset_excl_nodes_overlap(p))
- continue;
/*
* This is in the process of releasing memory so wait for it
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2006-07-28 7:21 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-28 7:20 [patch 0/9] oom: various fixes and improvements for 2.6.18-rc2 Nick Piggin
2006-07-28 7:20 ` [patch 1/9] oom: use unreclaimable info Nick Piggin
2006-07-28 7:21 ` [patch 2/9] oom: reclaim_mapped on oom Nick Piggin
2006-07-28 7:21 ` [patch 3/9] cpuset: oom panic fix Nick Piggin
2006-07-28 7:29 ` Nick Piggin
2006-07-28 9:06 ` Paul Jackson
2006-07-28 7:21 ` Nick Piggin [this message]
2006-07-28 9:07 ` [patch 4/9] oom: cpuset hint Paul Jackson
2006-07-28 7:21 ` [patch 5/9] oom: handle current exiting Nick Piggin
2006-07-28 7:21 ` [patch 6/9] oom: handle oom_disable exiting Nick Piggin
2006-07-28 7:21 ` [patch 7/9] oom: swapoff tasks tweak Nick Piggin
2006-07-28 7:21 ` [patch 8/9] oom: kthread infinite loop fix Nick Piggin
2006-07-28 7:22 ` [patch 9/9] oom: more printk Nick Piggin
2006-07-28 7:44 ` [patch 0/9] oom: various fixes and improvements for 2.6.18-rc2 Andrew Morton
2006-07-28 9:28 ` Nick Piggin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060515210605.30275.11106.sendpatchset@linux.site \
--to=npiggin@suse.de \
--cc=akpm@osdl.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox