From patchwork Wed Aug 9 08:15:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 13347537 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1C8DEB64DD for ; Wed, 9 Aug 2023 08:18:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 38DD26B0071; Wed, 9 Aug 2023 04:18:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 33E0E6B0074; Wed, 9 Aug 2023 04:18:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 22CA98E0001; Wed, 9 Aug 2023 04:18:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 142266B0071 for ; Wed, 9 Aug 2023 04:18:54 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id CEAD114052D for ; Wed, 9 Aug 2023 08:18:53 +0000 (UTC) X-FDA: 81103865346.22.F44CFAA Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf11.hostedemail.com (Postfix) with ESMTP id 1F3F74002A for ; Wed, 9 Aug 2023 08:18:50 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf11.hostedemail.com: domain of yangyingliang@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=yangyingliang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691569132; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=HE6NtwxfWFe/9W3AED2DPJnoAHxRony0hvu8qfMsOTk=; b=Kge+LxFIe7XmOoEBwTzQ5rKUZYQxDmjwZGwvoyNhYzoO2Kd9qNrxsJi62tUzYqhbZHeZ3j yItxxTEgSaMu2c3OPqoYs8tKZwl77/vN4XMllcFpvdX3ZVoZzAByFIDSPIrSTYSonxSCD9 +HmxqKrHXXv5NjXRFa8yUS9Hf4jcGlA= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf11.hostedemail.com: domain of yangyingliang@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=yangyingliang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691569132; a=rsa-sha256; cv=none; b=M22CGMSdGuBTQZZ0T/tVkHqxakz97iEW1rL1tGjfiPptLxOYbb4NzGz4gGJqb1iWiJOwOx v4LZ2Ywe4dszkmxcsywCjtmBeewJy98IzcAWsHhO5AKvkbBF/1p81HzoJJZIb4DAuQ+sGf 4r3hFxBz/tLCaHef+5R07Yb010eTKik= Received: from dggpemm500022.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4RLNFH4VryzVl9V; Wed, 9 Aug 2023 16:16:51 +0800 (CST) Received: from dggpemm500007.china.huawei.com (7.185.36.183) by dggpemm500022.china.huawei.com (7.185.36.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Wed, 9 Aug 2023 16:18:46 +0800 Received: from huawei.com (10.175.103.91) by dggpemm500007.china.huawei.com (7.185.36.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Wed, 9 Aug 2023 16:18:45 +0800 From: Yang Yingliang To: CC: , , , , , Subject: [PATCH -next] mm/memory_hotplug: fix error return code in add_memory_resource() Date: Wed, 9 Aug 2023 16:15:52 +0800 Message-ID: <20230809081552.1351184-1-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm500007.china.huawei.com (7.185.36.183) X-CFilter-Loop: Reflected X-Rspam-User: X-Stat-Signature: ucktz1ic615kwk6q5aw3yfx64xsssza8 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 1F3F74002A X-HE-Tag: 1691569130-515254 X-HE-Meta: U2FsdGVkX1+IEfrRRiVoTL7PzTCHa4yqGV7ffjRi7dbFutbD4NqfoZxbFfqdx1YZTgZ4C7ckuZsSM9aUp5YIKpCmuJ2xnL5snjZXzQyKYD0LCVy5BHlTLnPf/1XsQjr6dPOs1mNAtDYzvg/5ceZ98XeMu+hgIdyRUbwz1H01bvRbTac9v2oEBv+vp34R6WPm/D+QVvMeJgjIT0gEXLZsWmCV5sQmRmu7Xg1CG31J8iPtLw/oE8LA949puYwzoKZFHhBhrTPdenQyoeLGH2G10HVheH4TdjKDbbxXueYi2l5h2SrzwTiSM/i1JY1hk/iD23OHuqt/2+LAw4HJu435zqISzdLuuzh+iIKHBSOZ0rQiGWt0TQbHlj2LHDV/l6vTNj8ZfVyVWP+7vRiRL0zn6PNlgHYfJ79W46fMx9t+CM1Vtez7j/xXYuGFOlFZKd/y1DwgQIgC2cqPNMfIdvpKl2/3dsfWKs8KbZ/Y1gyvjZsIXZJWJnute6a1+23yK4zj58otlK91WNvbr0wV9qy9fh4dPtRFK2K6hmg6mZ1qPqodRLOHuSNpGPQB+tDGVckEV6K/86FI5LBz7z8FwAihq6SdGZBGj15fdNoD4UgrADUq6xys/SWrx7ULWRXoKGcB9ze/SIXdoa9fZsNZp2R7k3xrcbucZKH0ps+XhMqOwz5NyGYTMflHHYtLbTYM495KqFoyzxcWGQ95CrGVkWGmnZ9w37LXXysmKeN2Tx73DPPMt5VrJpRylCF5+BTEfn6Gc2x/SzyCnTexegRqCRwWk2IFUJTRXsLqdeR1cy6NHCWjhzwOeLeqyP7U/ij96VIizc8eyqVoL/VFgdQyQAj+X1cxiG/J87NjmilVR0MfzHDJ2PH5QyLWRFQW62X4SCOhtb4IQnVM44rx0JunA+ZnjMDN1iqlbQUUWdiOk44NgIS4p82k7nbbopKPzJ1zJdLS/Sj78/YVvvR5Gj5Rs5c Iv5j/7Ma s8qWD7EStro0u+NInFMVpAlly6vvlWwrKq6kXphmoXl47Pc/lv8vsqyj1BA54osIB1e5TNt58UqhvohkYZK49GbWGww46gGVlvWr7HqhvSj7xMQGbQ47hJ/7u9uMIPqB8DhBvyNp7XZfwQStKRMXaG+xhsNCENcO2p+MiCqRdp+gSYYbr5PvA6g9SwhajhYi5kZhR X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Set error return code to -ENOMEM, when kmalloc() fails. Fixes: ad3232df3e41 ("mm/memory_hotplug: embed vmem_altmap details in memory block") Signed-off-by: Yang Yingliang Reviewed-by: Aneesh Kumar K.V --- mm/memory_hotplug.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index f8d3e7427e32..1b03f4ec6fd2 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1440,8 +1440,10 @@ int __ref add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) if (mhp_supports_memmap_on_memory(size)) { mhp_altmap.free = memory_block_memmap_on_memory_pages(); params.altmap = kmalloc(sizeof(struct vmem_altmap), GFP_KERNEL); - if (!params.altmap) + if (!params.altmap) { + ret = -ENOMEM; goto error; + } memcpy(params.altmap, &mhp_altmap, sizeof(mhp_altmap)); }