LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: David Rientjes <rientjes@cs.washington.edu>
To: Andrew Morton <akpm@osdl.org>
Cc: Andi Kleen <ak@suse.de>, Rohit Seth <rohitseth@google.com>,
	linux-kernel@vger.kernel.org
Subject: [patch -mm 2/5] x86_64: split remaining fake nodes equally
Date: Thu, 25 Jan 2007 13:37:15 -0800 (PST)	[thread overview]
Message-ID: <Pine.LNX.4.64N.0701251333470.13206@attu4.cs.washington.edu> (raw)
In-Reply-To: <Pine.LNX.4.64N.0701251332280.13206@attu4.cs.washington.edu>

Extends the numa=fake x86_64 command-line option to split the remaining
system memory into equal-sized nodes.

For example:
numa=fake=2*512,4*	gives two 512M nodes and the remaining system
			memory is split into four approximately equal
			chunks.

Cc: Andi Kleen <ak@suse.de>
Signed-off-by: David Rientjes <rientjes@cs.washington.edu>
---
 Documentation/x86_64/boot-options.txt |    4 +++-
 arch/x86_64/mm/numa.c                 |   24 +++++++++++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt
index 6ccdb5e..0721416 100644
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
@@ -155,7 +155,9 @@ NUMA
 		depending on the sizes and coefficients listed.  For example:
 			numa=fake=2*512,1024,4*256
 		gives two 512M nodes, a 1024M node, and four 256M nodes.  If
-		the last character of CMDLINE is a comma, the remaining system
+		the last character of CMDLINE is a *, the remaining system
+		memory is divided up equally among its previous coefficient.
+		If the last character is a comma, the remaining system
 		memory is not allocated to an additional node.
 
   numa=hotadd=percent
diff --git a/arch/x86_64/mm/numa.c b/arch/x86_64/mm/numa.c
index 0417921..3344d60 100644
--- a/arch/x86_64/mm/numa.c
+++ b/arch/x86_64/mm/numa.c
@@ -415,11 +415,25 @@ static int __init numa_emulation(unsigned long start_pfn, unsigned long end_pfn)
 done:
 	if (!num_nodes)
 		return -1;
-	/* Fill remainder of system RAM with a final node, if appropriate. */
-	if (addr < max_addr && *(cmdline - 1) != ',') {
-		setup_node_range(num_nodes, nodes, &addr, max_addr - addr,
-				 max_addr);
-		num_nodes++;
+	/* Fill remainder of system RAM, if appropriate. */
+	if (addr < max_addr) {
+		switch (*(cmdline - 1)) {
+		case '*':
+			/* Split remaining nodes into coeff chunks */
+			if (coeff <= 0)
+				break;
+			num_nodes += split_nodes_equally(nodes, &addr, max_addr,
+							 num_nodes, coeff);
+			break;
+		case ',':
+			/* Do not allocate remaining system RAM */
+			break;
+		default:
+			/* Give one final node */
+			setup_node_range(num_nodes, nodes, &addr,
+					 max_addr - addr, max_addr);
+			num_nodes++;
+		}
 	}
 out:
 	memnode_shift = compute_hash_shift(nodes, num_nodes);

  reply	other threads:[~2007-01-25 21:37 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-01-25 21:37 [patch -mm 1/5] x86_64: configurable fake numa node sizes David Rientjes
2007-01-25 21:37 ` David Rientjes [this message]
2007-01-25 21:37   ` [patch -mm 3/5] x86_64: fixed-size remaining fake nodes David Rientjes
2007-01-25 21:37     ` [patch -mm 4/5] x86_64: fake numa function annotations David Rientjes
2007-01-25 21:37       ` [patch -mm 5/5] x86_64: fake numa for cpusets document David Rientjes
2007-01-29 13:36     ` [patch -mm 3/5] x86_64: fixed-size remaining fake nodes Andi Kleen
2007-01-29 18:38       ` David Rientjes
2007-01-30  1:19         ` David Rientjes

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=Pine.LNX.4.64N.0701251333470.13206@attu4.cs.washington.edu \
    --to=rientjes@cs.washington.edu \
    --cc=ak@suse.de \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rohitseth@google.com \
    --subject='Re: [patch -mm 2/5] x86_64: split remaining fake nodes equally' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).