From mboxrd@z Thu Jan 1 00:00:00 1970 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 43302C4167D for ; Tue, 14 Nov 2023 18:03:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AEE446B0302; Tue, 14 Nov 2023 13:03:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A9F096B0304; Tue, 14 Nov 2023 13:03:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 921A06B0305; Tue, 14 Nov 2023 13:03:17 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 7D8A66B0302 for ; Tue, 14 Nov 2023 13:03:17 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id F3F60C0595 for ; Tue, 14 Nov 2023 18:03:16 +0000 (UTC) X-FDA: 81457331634.15.AE72030 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf02.hostedemail.com (Postfix) with ESMTP id 020658005B for ; Tue, 14 Nov 2023 18:02:55 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=RAplVQvp; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf02.hostedemail.com: domain of sumanthk@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=sumanthk@linux.ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699984976; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=UXuiVxrhS/ib2MzACnKB4Rr4sLIRlSyid8ooltH0jI4=; b=F8hnSwsJFSYKad9nvcsP1rYn/wHb/R0V6igqA32RcW5jyRrczAosabBxMo4FDQknlPffNB bSnYlTdXPyPf7h4oLqOF/JTK9Z8iol04CWodSpILsCM9raTe5949G4qiHjc53XYjlmrvwM hDLd8hKhZLX5RLFHuL7D7ORbZbBKT8g= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=RAplVQvp; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf02.hostedemail.com: domain of sumanthk@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=sumanthk@linux.ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699984976; a=rsa-sha256; cv=none; b=XVe9BGJvdTxKYaAPnvMu1O88HYMsJ6xsaJ3bMQug35wD+C2QsxTOpuPq8FsT9hqioOcWOw oiiu/GBEItoALQ2WxLPxRJIOb3QL5jCbOkDIeGixP6ZT+T/j5wnylZrZJVuhledmme9oIs Vn18iXQhFSk5iu9/gkE2+RiLlIDHcgs= Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3AEHaZXB020727; Tue, 14 Nov 2023 18:02:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=UXuiVxrhS/ib2MzACnKB4Rr4sLIRlSyid8ooltH0jI4=; b=RAplVQvp9sbVP0ga+9CZJuhytEzKojnJWmvaIbG58Wyy0i9tFegtR5SIG8R7PuKRl+WX XCYV4llb51bYAr4H3bsqYZ5habUIJz7TfHifnJkVBPKLNAoWoh/6fj6hn0kIUz8uxX26 vg/DcsMbgP9nanKYNyWBS5ohLS8EKK0REJLvNIgWcrTDPgSnnOlvQXTzJqlXK2hFPugq 0q7NCVJsQC0XSToXpFcMAEZ0LpRTx0nE9Qyj7yuUXB8GuS25MjwurEaU1Sj6WgMY3TRs 0WQ/AI+JmIa7Kx4nkapIQKlNeq/JpM6qSRq6DEL5TEgM+6haaQHdYDQz4V5xL1eYjvH4 1w== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ucdeg8r9r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Nov 2023 18:02:52 +0000 Received: from m0360072.ppops.net (m0360072.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3AEHbOQq022529; Tue, 14 Nov 2023 18:02:51 GMT Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ucdeg8r8r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Nov 2023 18:02:51 +0000 Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3AEGY3Oa020091; Tue, 14 Nov 2023 18:02:50 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3uamxn9kn0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Nov 2023 18:02:49 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3AEI2keY40895122 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 14 Nov 2023 18:02:46 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4F0F22004D; Tue, 14 Nov 2023 18:02:46 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E9B462005A; Tue, 14 Nov 2023 18:02:45 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 14 Nov 2023 18:02:45 +0000 (GMT) From: Sumanth Korikkar To: linux-mm , Andrew Morton , David Hildenbrand Cc: Oscar Salvador , Michal Hocko , "Aneesh Kumar K.V" , Anshuman Khandual , Gerald Schaefer , Alexander Gordeev , Heiko Carstens , Vasily Gorbik , linux-s390 , LKML Subject: [PATCH 2/8] mm/memory_hotplug: fix error handling in add_memory_resource() Date: Tue, 14 Nov 2023 19:02:32 +0100 Message-Id: <20231114180238.1522782-3-sumanthk@linux.ibm.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231114180238.1522782-1-sumanthk@linux.ibm.com> References: <20231114180238.1522782-1-sumanthk@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: jVaEeKBBA0p_qfPGMQOSGvCcx2fmXvce X-Proofpoint-GUID: 27rzWHrwdprSxIiUtgE4QBwK6wgOC6zP X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-14_18,2023-11-14_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 mlxlogscore=543 malwarescore=0 spamscore=0 adultscore=0 mlxscore=0 impostorscore=0 suspectscore=0 priorityscore=1501 clxscore=1015 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311140136 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 020658005B X-Stat-Signature: rzihbtmft9cj7rywihewo64w1bb86f7d X-Rspam-User: X-HE-Tag: 1699984975-126566 X-HE-Meta: U2FsdGVkX1+NIXRY7pUw7isCQvuGl0kRoxp/4JCXTzgseAuiwNDzJZX3B1Gg2+JNRkn/zwnDVNuh91Nr6RSnN5Mcn8iW3aNnSU2xfw+y5MwC7nObwj4pthxdFQj5U5ALHncUv6IRrHKKmKqfVEdDnnruzsaWIpVaHejmlwNJicFjwQdmZy/bZ8sn3+dHVBwCD5xMdeCp2UXM7t2BxAbGyWODpyK0q123D/yE5aMY0cwMr5bYxee/Srcpt1lo9aTttXIc3Yr/XHo7vScpG8GOh3TtvJAjdZN7V/W892sXWs8sMGXXz+wt9F0SbEkGkXwHZzgJAaNGy9mJ6JdNQmCzFNE1NSa54jtUnDPTDAQVT18U1DYJF3nSn7IfMkMg0uJP1Th92q1E48wcT1pcs2MpQriZTGOdz+PCURKWJUEkim6gVvnZY+NBd9pehZHpYCwZb23Aekdc4Qq+Ty7mwBmJg5Idju/ddb5kFO3UbGFbBGWJm+5TNVdxHrZUYXuK8Y4zlyDYR3MzddFD3RYFi0eDdc+OC81yYvEJFP61lu7qPm+IjFFGdbA75NzSgTBVLd9silFmfFyG4oeFUpWBmDqfV6y/FhaMCG7eZi7OwHn4vazQZdg9fTMdrT+HLdPMxekeBy0KaUzpXS0kNDolNZnYtTzJot5IXPFw7S2XY1ZeAfUpcbb3yOkDg8o3hnysLKoKmo9cvBUITB7jzxq2DDCzcOhW/OxUZTBaIbe0tsEufvM4FmyZFPNchm6Bsd1G7aA1StZmXBEokP6mPLAeEEcEXdZhckXZqIAL0zjW3AUkAtH3BxNsJBYfUFvN1xNoKBwgZ48NKeeL8DnzIEyT4cvNa3Ix7VSTAkFrHkKL9sLS0eDZBYIXc7BZOeqXNswoJjUftgDqZAjK8RJ26VbyHfXmk/0+WqSXrlC0xkLNjxEDNoiXARywHynnRxhTPZbmhrHM16/sTYzt6klkqHPwE/o ihiwQQOI 9PyMcGc6nPLE/5uwX9fo3eMQRW+na8u1dtSga6r8mU9J8bAU3gHaGxDrR+WaWW/LpIM7tV2Q8vjRAZrezoO6A9TL+qnHerFpnQ1YOrvRDK5ckHmm0DgNjhm7725eUdmHXVRostztcgXAO//1rrG+fds7u/cGxSNsgzFwU/dwu0+/c+bsGwUG2QwJjClSBBFpWdUzz 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: List-Subscribe: List-Unsubscribe: In add_memory_resource(), creation of memory block devices occurs after successful call to arch_add_memory(). However, creation of memory block devices could fail. In that case, arch_remove_memory() is called to perform necessary cleanup. Currently with or without altmap support, arch_remove_memory() is always passed with altmap set to NULL during error handling. This leads to freeing of struct pages using free_pages(), eventhough the allocation might have been performed with altmap support via altmap_alloc_block_buf(). Fix the error handling by passing altmap in arch_remove_memory(). This ensures the following: * When altmap is disabled, deallocation of the struct pages array occurs via free_pages(). * When altmap is enabled, deallocation occurs via vmem_altmap_free(). Fixes: db051a0dac13 ("mm/memory_hotplug: create memory block devices after arch_add_memory()") Reviewed-by: Gerald Schaefer Signed-off-by: Sumanth Korikkar --- mm/memory_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index c8238fc5edcb..4f476a970e84 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1458,7 +1458,7 @@ int __ref add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) /* create memory block devices after memory was added */ ret = create_memory_block_devices(start, size, params.altmap, group); if (ret) { - arch_remove_memory(start, size, NULL); + arch_remove_memory(start, size, params.altmap); goto error_free; } -- 2.41.0