public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Yinghai Lu <yinghai@kernel.org>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Tejun Heo <tj@kernel.org>, Thomas Renninger <trenn@suse.de>,
	Tang Chen <tangchen@cn.fujitsu.com>
Cc: linux-kernel@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>,
	Pekka Enberg <penberg@kernel.org>,
	Jacob Shin <jacob.shin@amd.com>,
	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: [PATCH v4 22/22] x86, mm, numa: Put pagetable on local node ram for 64bit
Date: Thu, 11 Apr 2013 17:56:08 -0700	[thread overview]
Message-ID: <1365728168-32067-23-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1365728168-32067-1-git-send-email-yinghai@kernel.org>

If node with ram is hotplugable, local node mem for page table and vmemmap
should be on that node ram.

This patch is some kind of refreshment of
| commit 1411e0ec3123ae4c4ead6bfc9fe3ee5a3ae5c327
| Date:   Mon Dec 27 16:48:17 2010 -0800
|
|    x86-64, numa: Put pgtable to local node memory
That was reverted before.

We have reason to reintroduce it to make memory hotplug work.

Calling init_mem_mapping in early_initmem_init for every node.
alloc_low_pages will alloc page table in following order:
	BRK, local node, low range
So page table will be on low range or local nodes.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Jacob Shin <jacob.shin@amd.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
 arch/x86/mm/numa.c | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index d3eb0c9..11acdf6 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -673,7 +673,39 @@ static void __init early_x86_numa_init(void)
 #ifdef CONFIG_X86_64
 static void __init early_x86_numa_init_mapping(void)
 {
-	init_mem_mapping(0, max_pfn << PAGE_SHIFT);
+	unsigned long last_start = 0, last_end = 0;
+	struct numa_meminfo *mi = &numa_meminfo;
+	unsigned long start, end;
+	int last_nid = -1;
+	int i, nid;
+
+	for (i = 0; i < mi->nr_blks; i++) {
+		nid   = mi->blk[i].nid;
+		start = mi->blk[i].start;
+		end   = mi->blk[i].end;
+
+		if (last_nid == nid) {
+			last_end = end;
+			continue;
+		}
+
+		/* other nid now */
+		if (last_nid >= 0) {
+			printk(KERN_DEBUG "Node %d: [mem %#016lx-%#016lx]\n",
+					last_nid, last_start, last_end - 1);
+			init_mem_mapping(last_start, last_end);
+		}
+
+		/* for next nid */
+		last_nid   = nid;
+		last_start = start;
+		last_end   = end;
+	}
+	/* last one */
+	printk(KERN_DEBUG "Node %d: [mem %#016lx-%#016lx]\n",
+			last_nid, last_start, last_end - 1);
+	init_mem_mapping(last_start, last_end);
+
 	if (max_pfn > max_low_pfn)
 		max_low_pfn = max_pfn;
 }
-- 
1.8.1.4


  parent reply	other threads:[~2013-04-12  0:57 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-12  0:55 [PATCH v4 00/22] x86, ACPI, numa: Parse numa info early Yinghai Lu
2013-04-12  0:55 ` [PATCH v4 01/22] x86: Change get_ramdisk_image() to global Yinghai Lu
2013-04-12  0:55 ` [PATCH v4 02/22] x86, microcode: Use common get_ramdisk_image() Yinghai Lu
2013-04-12  0:55 ` [PATCH v4 03/22] x86, ACPI, mm: Kill max_low_pfn_mapped Yinghai Lu
2013-06-05  8:36   ` Tang Chen
2013-04-12  0:55 ` [PATCH v4 04/22] x86, ACPI: Search buffer above 4G in second try for acpi override tables Yinghai Lu
2013-04-12  0:55 ` [PATCH v4 05/22] x86, ACPI: Increase override tables number limit Yinghai Lu
2013-04-12  0:55 ` [PATCH v4 06/22] x86, ACPI: Split acpi_initrd_override to find/copy two functions Yinghai Lu
2013-04-12  0:55 ` [PATCH v4 07/22] x86, ACPI: Store override acpi tables phys addr in cpio files info array Yinghai Lu
2013-04-12  0:55 ` [PATCH v4 08/22] x86, ACPI: Make acpi_initrd_override_find work with 32bit flat mode Yinghai Lu
2013-04-12  0:55 ` [PATCH v4 09/22] x86, ACPI: Find acpi tables in initrd early from head_32.S/head64.c Yinghai Lu
2013-04-12  0:55 ` [PATCH v4 10/22] x86, mm, numa: Move two functions calling on successful path later Yinghai Lu
2013-04-12  0:55 ` [PATCH v4 11/22] x86, mm, numa: Call numa_meminfo_cover_memory() checking early Yinghai Lu
2013-04-12  0:55 ` [PATCH v4 12/22] x86, mm, numa: Move node_map_pfn alignment() to x86 Yinghai Lu
2013-04-12  0:55 ` [PATCH v4 13/22] x86, mm, numa: Use numa_meminfo to check node_map_pfn alignment Yinghai Lu
2013-04-12  0:56 ` [PATCH v4 14/22] x86, mm, numa: Set memblock nid later Yinghai Lu
2013-04-12  0:56 ` [PATCH v4 15/22] x86, mm, numa: Move node_possible_map setting later Yinghai Lu
2013-04-12  0:56 ` [PATCH v4 16/22] x86, mm, numa: Move emulation handling down Yinghai Lu
2013-04-12  0:56 ` [PATCH v4 17/22] x86, ACPI, numa, ia64: split SLIT handling out Yinghai Lu
2013-04-12  0:56 ` [PATCH v4 18/22] x86, mm, numa: Add early_initmem_init() stub Yinghai Lu
2013-04-12  0:56 ` [PATCH v4 19/22] x86, mm: Parse numa info early Yinghai Lu
2013-04-12  0:56 ` [PATCH v4 20/22] x86, mm: Add comments for step_size shift Yinghai Lu
2013-04-12  0:56 ` [PATCH v4 21/22] x86, mm: Make init_mem_mapping be able to be called several times Yinghai Lu
2013-04-12  0:56 ` Yinghai Lu [this message]
2013-04-26  8:58 ` [PATCH v4 00/22] x86, ACPI, numa: Parse numa info early Tang Chen
2013-04-30  7:21 ` Tang Chen
2013-05-06  9:49   ` Tang Chen
2013-05-09  8:54   ` Tang Chen
2013-05-09 18:24     ` Yinghai Lu
2013-05-13  2:59       ` Tang Chen
2013-05-14  9:06         ` Tang Chen
2013-05-22  5:14       ` Tang Chen
2013-05-22  5:18         ` H. Peter Anvin
2013-06-03  6:01           ` Tang Chen

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=1365728168-32067-23-git-send-email-yinghai@kernel.org \
    --to=yinghai@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=hpa@zytor.com \
    --cc=jacob.shin@amd.com \
    --cc=konrad.wilk@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=penberg@kernel.org \
    --cc=tangchen@cn.fujitsu.com \
    --cc=tglx@linutronix.de \
    --cc=tj@kernel.org \
    --cc=trenn@suse.de \
    /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