From patchwork Mon Nov 20 10:27:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Korikkar X-Patchwork-Id: 13461014 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 7BD33C54E76 for ; Mon, 20 Nov 2023 10:27:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D58506B0427; Mon, 20 Nov 2023 05:27:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D41EC6B042F; Mon, 20 Nov 2023 05:27:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BB1996B042B; Mon, 20 Nov 2023 05:27:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id A80966B0385 for ; Mon, 20 Nov 2023 05:27:55 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 759F840245 for ; Mon, 20 Nov 2023 10:27:55 +0000 (UTC) X-FDA: 81477956910.21.1B634FF Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf10.hostedemail.com (Postfix) with ESMTP id 40424C0012 for ; Mon, 20 Nov 2023 10:27:53 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=f+rTQAJW; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf10.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=1700476073; a=rsa-sha256; cv=none; b=4CyLS04K/bi7PP6JY8I0tcUExekY+QJjjcbzu1po+BYwBdXsMRP0JMb8y8Rf/1ztAXxSfa V4YNBKhPFA3ToRTvqMZy/z08CGENRuI00EQM/Pfr9wV8ITs9WJPmNSbch5QgjiQwrJ8pN6 tYz2QqDBlWI2QJOo6pGzcijtijcUAlA= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=f+rTQAJW; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf10.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=1700476073; 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=/ol48WYiTl5VCeu269Gsu0V/ceE40LaFhnb0ghggVso=; b=jnKZqV6uQ4kJNuXQndBNKPWFNP8myQEYR3K42HjTy4svFWQVZXL2gO1MA0RYv4dMBG3eOP 5E4l2bcV6+mL/tWRs53HNlFCVqkjlshQjbrUEuPyIunp6iKNdMAeLwl5OnoKgjv+qvWKVP 8NJOYDqC1ZbsabX+t+weBH2t1LNlHAc= 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 3AK987B7028533; Mon, 20 Nov 2023 10:27:49 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=/ol48WYiTl5VCeu269Gsu0V/ceE40LaFhnb0ghggVso=; b=f+rTQAJWB7vGLhzx0zVh4JXAM/w/fcg8KisWXJqDjqxMZ0FKyXvW+4XwfZbFfBIp55DY 0DjkgPH42Y/yA5XmJAboAVGrEvX37eLEoL/vUbK4la8tAD3XYwJmYt1BNaXt3qaaAwAr nXt0dr0+hhq8I4LsSbt3s9+oejnEq874vZRuA7/DoMgxxDePs3zdwMaLkLl7WO9tFERV UjWJOGsHPyMDprYfWgR0iw+ZtrpDUca1dxK10cDZVT6CmP3t52r/1JI1BXXvUjafY15m 010uZ8bjWyehaiTE+ceVJ7kG8BbYkeq+AmAm65zESw4qCqio3HXi8QqdQD2aDfjLLYVd Mg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ug4j7aa7p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Nov 2023 10:27:49 +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 3AK99uMc000404; Mon, 20 Nov 2023 10:27:48 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 3ug4j7aa77-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Nov 2023 10:27:48 +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 3AKAMjAk010144; Mon, 20 Nov 2023 10:27:48 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3uf8kngfv5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Nov 2023 10:27:48 +0000 Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3AKARjLr16319226 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 20 Nov 2023 10:27:45 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F1BC120043; Mon, 20 Nov 2023 10:27:44 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B8F092004B; Mon, 20 Nov 2023 10:27:44 +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 10:27:44 +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 v2 2/3] mm/memory_hotplug: fix error handling in add_memory_resource() Date: Mon, 20 Nov 2023 11:27:33 +0100 Message-Id: <20231120102734.2001576-3-sumanthk@linux.ibm.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120102734.2001576-1-sumanthk@linux.ibm.com> References: <20231120102734.2001576-1-sumanthk@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: vnt40VV8T6cgmDfeRzbrS6MhOvZwYcNV X-Proofpoint-GUID: rRB8LMmGA3xLehq4uAop8hT58xLuQ6Sz 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_08,2023-11-17_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=583 spamscore=0 clxscore=1015 lowpriorityscore=0 priorityscore=1501 suspectscore=0 impostorscore=0 malwarescore=0 bulkscore=0 mlxscore=0 phishscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311200069 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 40424C0012 X-Stat-Signature: o8n8ywtoe5pw9nre61pmtnuoq97ku1ks X-HE-Tag: 1700476073-827783 X-HE-Meta: U2FsdGVkX1/ZjPo7KJJ584DgCcmGcP24xLa0mRwudFiPdNJXYHOxnRIym5zOFlKCkP66N4E8cPrxcIvRTjZeHB4+leoy8zIP+8OdiekxrPWNlGCDSDzTChiBPAXL2F1xm3okCNEMlWr3GCOwq6AbyzNi4xjL5X9MfrEE1o0/x1icljmJrLcNOfGPrCo2seXUdxLQf5RhfEX3P0feVvGVzEQGMPIh7CMkrEK6cgtJSlYYQ5RLa1Giz3mIz9ACEu5DJy3wOoxp07RyVlC8Wgnj71MZsYswS45deKOKMUKF8BjjSwceZY5umg4xKQq2+9Jm068nQdXrjgr7+5e6y6oZ8ERMYZq7S/BnViujORPWvUBKpsnD6eWlBa7EYbnkEBhCzxqBs9aP5ZFtq6jnnv96t3xtxBNM30MycG7H2LivjamQZjL4TYIy0X/Dav2HTFvQNKWIKelyXS28BOMd5KXD9J3Ec8HnYx69iOl1NRxkWXT07+yZ0R+ZZs2HOzs14+QOjUZ9O+E5Okd/IMsv0BwRLigdZ5luDB7/4x9je/PO5p2blGcICDPmOB+qqAbHz2M5EonKYaoPZffQXvHuKakIwYP6lPoQaWB6UOb/pLRGrJpuiK7HQoL8ABF+r8hNXcauiwN9ecJRamC1h8hpD2Eb/vdkSq3st9e4z3koKaxwSEWM2lPmVzOAt0dNIPSz+D8XL5e4oZ8VtL5EPzieDo1A8VUWiMs9YSzgTYGwbGuszOvsuL2LFPqU6rtK4wJS4EAZp46/uVcW23A827Btafk/P5xVsaraaDvd3Ok6gIIvBqe+DAlnoC3vE4oqPG5w/vmLJeTWWTVqdprKRNmjiILVy/nSiEKlVNyaVGWpGPNcq4x3HLfRDAHG2N+mrIlA0Ecvnz5FN992v5qqwrf2ef1C7wTYTd+ID81qvTMeUTZGgTBohVygLDMrjOrGs0Wpg92B0Slj9b0Gr+I+QEORAHf KVULA0Cf EPXclfi6IcB4iGorHkyN9zY1o2EzyewsB3em8p5Q+/77znemLRUy4422aA//CExF2vHKPIUeH1cSM5axyAeVRVCQVr/J6FKrZ1gV7/+LKAnRrRcQAlMlzKTWdRHjlpsJ70uuiS1zBULFvPRf0seoc1KROKosMojrVE89R+C55UgNVeWsudP7EVhXEnpgBqYI2jwJytSccxvhSeDRy8a81T2SA6A== 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 Acked-by: David Hildenbrand 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; }