Received: by 2002:a05:7412:b130:b0:e2:908c:2ebd with SMTP id az48csp2119156rdb; Mon, 20 Nov 2023 02:29:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IHjNI5Gh0g0ZiJr0wZzYic8DoX42JO83WTfudShPtpH0bnuRYPqUvk/OvdEN0XOa92nh2Eu X-Received: by 2002:a05:6870:718c:b0:1ef:aba1:1995 with SMTP id d12-20020a056870718c00b001efaba11995mr8820421oah.59.1700476143534; Mon, 20 Nov 2023 02:29:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700476143; cv=none; d=google.com; s=arc-20160816; b=aOE7KiPsfZkSCYOtwyjfbHKYVpvAsupLZkZiXo3DNi/clDuv2ZzNVyBD5bxb1XExkh WRfSUA2rto5M/JSN3puqyvQhJc607VJoTKhYbrKqvsW8+mztFt8F/7uTZmbuLvjeCsMX ZNxO66Hq0PTlow2xLXcLk79bdeuhzVDV8h0dnT15mJwdR6uFgCIjitJMJx6d7lB11ucQ SDAiouBgKza6G4h405EJKxEucexWulJxdeP3iEmjLF9MuedKMH2UklDTGwof6U2d58YZ CyWOHpGaUuQaUOu1HDMgfHUHEWsjaFdmtbLYg9KBkiY3aKM3d8bsAJg2vJGRA86I7slz JLMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/ol48WYiTl5VCeu269Gsu0V/ceE40LaFhnb0ghggVso=; fh=cZYhCIXeFQihRJa58ZPqyZ6LPPRkNNP1A3GDumZ/1bQ=; b=zUmvWCwlucYJZXsLcn9vn6WM+Jh4KkljFdN6EJUkA1uNe/Z1hu2DLy8MfOPvGMeFim z1zMwBqjHTLojmFSnjLMx5fYr0kMxo3ACvRwuf7KpRc9Ud0YLjxrSc4PpIfbaN+yMw9z dU60puxn1qXLWdoCjMkkBgrojtBMF0ZCz6hfJZexeOdB1rq6S99H44Vg+AMjmnbziiVC efOYoWxk8g7Q5Gkj25MKUB2F2XH54brbAdpUfkkuDv2ebHw7qJaSk+HtTVO1omGjY53a Li4qla8iug7Lc10NbzfRfAsqwOdkdqEPo9Yd6y/eceB/hJIHbSY+lj8CBK2PNMyygFMu n6zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=f+rTQAJW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id t186-20020a6381c3000000b005b7e3ee181fsi7638178pgd.642.2023.11.20.02.29.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 02:29:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=f+rTQAJW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id BF44680B1F9B; Mon, 20 Nov 2023 02:28:58 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232947AbjKTK2H (ORCPT + 99 others); Mon, 20 Nov 2023 05:28:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232462AbjKTK2G (ORCPT ); Mon, 20 Nov 2023 05:28:06 -0500 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9D66B4; Mon, 20 Nov 2023 02:28:00 -0800 (PST) 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 Content-Transfer-Encoding: 8bit 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-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 20 Nov 2023 02:28:58 -0800 (PST) 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; } -- 2.41.0