All of lore.kernel.org
 help / color / mirror / Atom feed
* + memory-hotplug-alloc-page-from-other-node-in-memory-online.patch added to -mm tree
@ 2009-06-29 19:49 akpm
       [not found] ` <alpine.DEB.1.10.0906291804340.21956@gentwo.org>
  0 siblings, 1 reply; 23+ messages in thread
From: akpm @ 2009-06-29 19:49 UTC (permalink / raw)
  To: mm-commits; +Cc: shaohua.li, cl, mel, yakui.zhao


The patch titled
     memory hotplug: alloc page from other node in memory online
has been added to the -mm tree.  Its filename is
     memory-hotplug-alloc-page-from-other-node-in-memory-online.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: memory hotplug: alloc page from other node in memory online
From: Shaohua Li <shaohua.li@intel.com>

To initialize hotadded node, some pages are allocated.  At that time, the
node hasn't memory, this makes the allocation always fail.  In such case,
let's allocate pages from other nodes.

Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Yakui Zhao <yakui.zhao@intel.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/page_cgroup.c    |   12 +++++++++---
 mm/sparse-vmemmap.c |    8 +++++++-
 mm/sparse.c         |    9 ++++++---
 3 files changed, 22 insertions(+), 7 deletions(-)

diff -puN mm/page_cgroup.c~memory-hotplug-alloc-page-from-other-node-in-memory-online mm/page_cgroup.c
--- a/mm/page_cgroup.c~memory-hotplug-alloc-page-from-other-node-in-memory-online
+++ a/mm/page_cgroup.c
@@ -116,10 +116,16 @@ static int __init_refok init_section_pag
 		nid = page_to_nid(pfn_to_page(pfn));
 		table_size = sizeof(struct page_cgroup) * PAGES_PER_SECTION;
 		VM_BUG_ON(!slab_is_available());
-		base = kmalloc_node(table_size,
+		if (node_state(nid, N_HIGH_MEMORY)) {
+			base = kmalloc_node(table_size,
 				GFP_KERNEL | __GFP_NOWARN, nid);
-		if (!base)
-			base = vmalloc_node(table_size, nid);
+			if (!base)
+				base = vmalloc_node(table_size, nid);
+		} else {
+			base = kmalloc(table_size, GFP_KERNEL | __GFP_NOWARN);
+			if (!base)
+				base = vmalloc(table_size);
+		}
 	} else {
 		/*
  		 * We don't have to allocate page_cgroup again, but
diff -puN mm/sparse-vmemmap.c~memory-hotplug-alloc-page-from-other-node-in-memory-online mm/sparse-vmemmap.c
--- a/mm/sparse-vmemmap.c~memory-hotplug-alloc-page-from-other-node-in-memory-online
+++ a/mm/sparse-vmemmap.c
@@ -48,8 +48,14 @@ void * __meminit vmemmap_alloc_block(uns
 {
 	/* If the main allocator is up use that, fallback to bootmem. */
 	if (slab_is_available()) {
-		struct page *page = alloc_pages_node(node,
+		struct page *page;
+
+		if (node_state(node, N_HIGH_MEMORY))
+			page = alloc_pages_node(node,
 				GFP_KERNEL | __GFP_ZERO, get_order(size));
+		else
+			page = alloc_pages(GFP_KERNEL | __GFP_ZERO,
+				get_order(size));
 		if (page)
 			return page_address(page);
 		return NULL;
diff -puN mm/sparse.c~memory-hotplug-alloc-page-from-other-node-in-memory-online mm/sparse.c
--- a/mm/sparse.c~memory-hotplug-alloc-page-from-other-node-in-memory-online
+++ a/mm/sparse.c
@@ -62,9 +62,12 @@ static struct mem_section noinline __ini
 	unsigned long array_size = SECTIONS_PER_ROOT *
 				   sizeof(struct mem_section);
 
-	if (slab_is_available())
-		section = kmalloc_node(array_size, GFP_KERNEL, nid);
-	else
+	if (slab_is_available()) {
+		if (node_state(nid, N_HIGH_MEMORY))
+			section = kmalloc_node(array_size, GFP_KERNEL, nid);
+		else
+			section = kmalloc(array_size, GFP_KERNEL);
+	} else
 		section = alloc_bootmem_node(NODE_DATA(nid), array_size);
 
 	if (section)
_

Patches currently in -mm which might be from shaohua.li@intel.com are

linux-next.patch
memory-hotplug-update-zone-pcp-at-memory-online.patch
memory-hotplug-exclude-isolated-page-from-pco-page-alloc.patch
memory-hotplug-make-pages-from-movable-zone-always-isolatable.patch
memory-hotplug-alloc-page-from-other-node-in-memory-online.patch
memory-hotplug-migrate-swap-cache-page.patch


^ permalink raw reply	[flat|nested] 23+ messages in thread

end of thread, other threads:[~2009-07-05 23:49 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-29 19:49 + memory-hotplug-alloc-page-from-other-node-in-memory-online.patch added to -mm tree akpm
     [not found] ` <alpine.DEB.1.10.0906291804340.21956@gentwo.org>
2009-06-30  0:47   ` Shaohua Li
2009-06-30  0:47     ` Shaohua Li
2009-07-01  2:55     ` Shaohua Li
2009-07-01  2:55       ` Shaohua Li
2009-07-01  3:39       ` yakui
2009-07-01  3:39         ` yakui
2009-07-01 17:22         ` Christoph Lameter
2009-07-01 17:22           ` Christoph Lameter
2009-07-02  1:11           ` yakui
2009-07-02  1:11             ` yakui
2009-07-02  1:22             ` KAMEZAWA Hiroyuki
2009-07-02  1:22               ` KAMEZAWA Hiroyuki
2009-07-02  5:59               ` Yasunori Goto
2009-07-02  5:59                 ` Yasunori Goto
2009-07-02 13:31                 ` Christoph Lameter
2009-07-02 13:31                   ` Christoph Lameter
2009-07-02 23:55                   ` KAMEZAWA Hiroyuki
2009-07-02 23:55                     ` KAMEZAWA Hiroyuki
2009-07-03  9:12                     ` Shaohua Li
2009-07-03  9:12                       ` Shaohua Li
2009-07-05 23:47                       ` KAMEZAWA Hiroyuki
2009-07-05 23:47                         ` KAMEZAWA Hiroyuki

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.