memory-hotplug: don't BUG() in register_memory_resource()

Out of memory condition is not a bug and while we can't add new memory
in such case crashing the system seems wrong.  Propagating the return
value from register_memory_resource() requires interface change.

Signed-off-by: Vitaly Kuznetsov <[email protected]>
Reviewed-by: Igor Mammedov <[email protected]>
Acked-by: David Rientjes <[email protected]>
Cc: Tang Chen <[email protected]>
Cc: Naoya Horiguchi <[email protected]>
Cc: Xishi Qiu <[email protected]>
Cc: Sheng Yong <[email protected]>
Cc: Zhu Guihua <[email protected]>
Cc: Dan Williams <[email protected]>
Cc: David Vrabel <[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 a042a9d537bb31984d6b2a8d3cc8ae1e54361e4f..92f95952692b0f9aa20bec8afa3cd1725e573452 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -131,7 +131,8 @@ static struct resource *register_memory_resource(u64 start, u64 size)
 {
        struct resource *res;
        res = kzalloc(sizeof(struct resource), GFP_KERNEL);
-       BUG_ON(!res);
+       if (!res)
+               return ERR_PTR(-ENOMEM);
 
        res->name = "System RAM";
        res->start = start;
@@ -140,7 +141,7 @@ static struct resource *register_memory_resource(u64 start, u64 size)
        if (request_resource(&iomem_resource, res) < 0) {
                pr_debug("System RAM resource %pR cannot be added\n", res);
                kfree(res);
-               res = NULL;
+               return ERR_PTR(-EEXIST);
        }
        return res;
 }
@@ -1312,8 +1313,8 @@ int __ref add_memory(int nid, u64 start, u64 size)
        int ret;
 
        res = register_memory_resource(start, size);
-       if (!res)
-               return -EEXIST;
+       if (IS_ERR(res))
+               return PTR_ERR(res);
 
        ret = add_memory_resource(nid, res);
        if (ret < 0)