From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752893AbcADQSa (ORCPT ); Mon, 4 Jan 2016 11:18:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55112 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752548AbcADQRl (ORCPT ); Mon, 4 Jan 2016 11:17:41 -0500 From: Vitaly Kuznetsov To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Andrew Morton , David Rientjes , Tang Chen , Naoya Horiguchi , Xishi Qiu , Sheng Yong , Zhu Guihua , Dan Williams , David Vrabel , Igor Mammedov Subject: [PATCH v2 1/2] memory-hotplug: don't BUG() in register_memory_resource() Date: Mon, 4 Jan 2016 17:17:30 +0100 Message-Id: <1451924251-4189-2-git-send-email-vkuznets@redhat.com> In-Reply-To: <1451924251-4189-1-git-send-email-vkuznets@redhat.com> References: <1451924251-4189-1-git-send-email-vkuznets@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Andrew Morton Cc: David Rientjes Cc: Tang Chen Cc: Naoya Horiguchi Cc: Xishi Qiu Cc: Sheng Yong Cc: Zhu Guihua Cc: Dan Williams Cc: David Vrabel Cc: Igor Mammedov --- Changes since v1: - Use ERR_PTR/PTR_ERR/IS_ERR() [David Rientjes] --- mm/memory_hotplug.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index a042a9d..92f9595 100644 --- 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) -- 2.4.3