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 8B80EC54FB9 for ; Mon, 20 Nov 2023 07:23:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 00AD86B030F; Mon, 20 Nov 2023 02:23:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EFCBD6B0322; Mon, 20 Nov 2023 02:23:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DC53E6B032D; Mon, 20 Nov 2023 02:23:36 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id C9BD76B030F for ; Mon, 20 Nov 2023 02:23:36 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 97CA71407D1 for ; Mon, 20 Nov 2023 07:23:36 +0000 (UTC) X-FDA: 81477492432.17.986F195 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf27.hostedemail.com (Postfix) with ESMTP id 697F040007 for ; Mon, 20 Nov 2023 07:23:34 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=kF1+pCmP; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf27.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=1700465014; 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=BwjqaOg3dzwZ6bAKcYCLKvjoYag2ay5CRFizDGiN3hA=; b=YaOTprmxEB/78pbBihz8AqTDSx0IuxVEQ47QI13bXwvsgbMjxLBebQecxN7twJPTdod6LZ 5OuA7jq6BhFGAHt7aZRY7dwK9tjruW+s+giYJyGXh5OqWU7sSfgUTx3NcY+TTXC8ESrmKb 5rpz4E8tffxvRHfmYf9YThJXCQvdV4Y= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=kF1+pCmP; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf27.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=1700465014; a=rsa-sha256; cv=none; b=1TF3OpxpJPe+V7Emd+zZgXjpg+3rNVQbxAA7oA95jM1Wgpg04oJ9rKYE++7VcZNrHq4NcN r++Klgf5sNO25Xzh+VNziYG9HC7S8XqCY2zdvCdYJ55A0qyqyg4vTMDZoRL9wcK1+vTFT4 VpAxjb6ji6tIRbVntOSzlvUpezgs1yU= Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3AK5gOLv027826; Mon, 20 Nov 2023 07:23:31 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=BwjqaOg3dzwZ6bAKcYCLKvjoYag2ay5CRFizDGiN3hA=; b=kF1+pCmPaClbQLuxSRDULLXpJZO9ItqZjz0B15kaOcXODbXqN4xga7zAj5VWnKoEDmaU DeUiU6iVJGJy4uuAHaFZIfXo3GQf0aPXUKcyI4jHiZfTCnN9lrvL/oTFvN2xpZdqzbsh qQpaLU8wOW+GyXNvc0YFTA6D0kHuQ502Y6MfLB/nqpJJyqpD1/4Zqj3Z5Oj2RZoHfwTA O6FoBSofX6dn/OZW+g7JORUEPfp37K8FbajuCli2nOgILvN1ZEVFNvmsJxQhzSHTTQSa 1nt/McVZ/m9lhUF+Fed9UVxJsLsU12YEE/05WO2ZSh22lvRp2QXU7/h4SxCvgbh9PSXx Fg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ufuws05pv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Nov 2023 07:23:30 +0000 Received: from m0356516.ppops.net (m0356516.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3AK7GIkh018207; Mon, 20 Nov 2023 07:23:30 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ufuws05pj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Nov 2023 07:23:30 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3AK7KRBM008955; Mon, 20 Nov 2023 07:23:29 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3uf7yy7rxr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Nov 2023 07:23:29 +0000 Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3AK7NQWs42074552 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 20 Nov 2023 07:23:26 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2F34F20040; Mon, 20 Nov 2023 07:23:26 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D47E22004B; Mon, 20 Nov 2023 07:23:25 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav03.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 20 Nov 2023 07:23:25 +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/3] mm/memory_hotplug: fix error handling in add_memory_resource() Date: Mon, 20 Nov 2023 08:23:16 +0100 Message-Id: <20231120072317.3169630-3-sumanthk@linux.ibm.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120072317.3169630-1-sumanthk@linux.ibm.com> References: <20231120072317.3169630-1-sumanthk@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 3d9mbPpTPABzcun9Q-w9vYzYUwpx0Bcp X-Proofpoint-GUID: 0DiWSAupzY9cHbCzU3NqtR37jHtZ8Ly8 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-20_04,2023-11-17_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 phishscore=0 adultscore=0 priorityscore=1501 lowpriorityscore=0 mlxlogscore=570 spamscore=0 clxscore=1015 suspectscore=0 mlxscore=0 bulkscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311200046 X-Rspamd-Queue-Id: 697F040007 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: ok3jz518pjz45c8iw6pz7syih7bh3ope X-HE-Tag: 1700465014-42799 X-HE-Meta: U2FsdGVkX1/q2wX/eUzB5S+atJOp3He9Y/vUTzV3N/HbI5gFPy1o2cg6GiQ4V5/3Mi6a5a9YLWgF95pNsw1ZLbHOSdNPPCwnE78czl07MhxYCp3bGLj4eqHZ4ZpjPe8k8UwqJpGgASZO0R5np9GofjaN5+evwoA9lWWBIazG5PWi5maX9tIcq4kpcD2QSiQA2NSdmCvBjFZPuYN0vmKbUWBXYlEnUvcS8ThE6hMhlAiCOb82o2QhK/tZ8t+PCVOD2ZyOma/KfR1jieeps5ZwP3hsooEZfrFyzqY/VlYGAQpKgo3KifkahoNBEFSUyiWwvlO6iY+EDoWTocg7Iu3TXTn3w1lrNkr5odlVFGmQ+Nh+2hHEagLLB81IGxDhvNYs81T1zD0zbIUM0HQ7yLUFZ7d7pw63z3VhfWzOlK/F9Rfj7yCcmnUjY84pvq0CfXIt9VQftelA5txFU5Ju9JeN05If77R7doaAvEkLEEM+2wk/ECLw9qtOrh86ATP3NdMn/HGTUWLuvOfRRmAU+I2REALhkei6Z8CKVBM5AbjXGtaTih8QuQgXSSQTim5iRGYKXbHNpYHKDnZwAw3OX6G05FulKIJWdzssyBHvEGx9DjojNPoVyrRhAt1BHUrkV6Tn6Gv9/+EDDoPT0pZqCHS4GNYrDnkxafT3i49K2Kgu/yZAoqa7E6GAYzqm/0IQdDzdaTArjAbGGFc7h1+lHwSeBSA2OdJLcjpynxlrOFbM2FhYYiXU5psoLjVvlXgaNdRm6nmo8HHI8Zl3IweiQYNcR+1KCkjsIPgRmzQq+BMcI3SYK4lM9Fd849GUcXeSJESJrPC6En/VdqKUb+XwlFBktjv8zMmFggRR4qmKiPUdHTMMc7fPkeJXVfG/CIYKaSUrnG0/jdLjZAt//m07bLAJqCTkwUFiyJTbvnoasE8ckyD5n/gyixdd2u1iuee0iEq2w6uuivuSNAUuy5gHfMr JfRikkPn kzLpk+/xo0IAe7xrsmuZh9W/rKbh87GOWBOfmmCXNfU/4T9HtNwOFqtPPtPEy5mi1FNxxDCedXGxK66POMhXUw6mbCyvtUd0NtIxvhWoK0B+qLrNkeNkjKwQqh1y6UJ/W7PzNN2v41oUOBYtN5oezd5mqy3c55jjbXWuJEIDq9lRB+0LaDOOKhwezAtGCDam02AHo 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: a08a2ae34613 ("mm,memory_hotplug: allocate memmap from the added memory range") 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