memory_hotplug: check for walk_memory_resource() failure in online_pages()

Add a check to online_pages() to test for failure of
walk_memory_resource().  This fixes a condition where a failure
of walk_memory_resource() can lead to online_pages() returning
success without the requested pages being onlined.

Signed-off-by: Geoff Levand <[email protected]>
Cc: Yasunori Goto <[email protected]>
Cc: KAMEZAWA Hiroyuki <[email protected]>
Cc: Dave Hansen <[email protected]>
Cc: Keith Mannthey <[email protected]>
Cc: Christoph Lameter <[email protected]>
Cc: Paul Jackson <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 988bd91b9f7fdd8460d2b94dbf18d05aa57d431a..656ad1c65422f0440a56b422b8431891e5304827 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -404,8 +404,15 @@ int online_pages(unsigned long pfn, unsigned long nr_pages)
        if (!populated_zone(zone))
                need_zonelists_rebuild = 1;
 
-       walk_memory_resource(pfn, nr_pages, &onlined_pages,
+       ret = walk_memory_resource(pfn, nr_pages, &onlined_pages,
                online_pages_range);
+       if (ret) {
+               printk(KERN_DEBUG "online_pages %lx at %lx failed\n",
+                       nr_pages, pfn);
+               memory_notify(MEM_CANCEL_ONLINE, &arg);
+               return ret;
+       }
+
        zone->present_pages += onlined_pages;
        zone->zone_pgdat->node_present_pages += onlined_pages;