Received: by 2002:a05:7412:b130:b0:e2:908c:2ebd with SMTP id az48csp2274499rdb; Mon, 20 Nov 2023 06:56:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IHZBfX1BI/c1GMEkXsCUrHs4ZhxJjdZv7qLoUeowORB6h4kL8Z7ojbyGpsYljdix+b+lDv/ X-Received: by 2002:a05:6a00:6c94:b0:6be:2649:8c6b with SMTP id jc20-20020a056a006c9400b006be26498c6bmr6924986pfb.32.1700492192162; Mon, 20 Nov 2023 06:56:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700492192; cv=none; d=google.com; s=arc-20160816; b=k9eIx3ETVG+CU7X41wk+s2kBrOgNcdl34Rh4zvNJT+iwzQpJlaHJyDnlrbjH9MGRCw K2/u+0XOQzbaGTJb1xnyHg3vfowMg48N+pupABASr+GirKLLIRaN4bdl792PRx5ic7wa 1F7MgJ3iV354eiULEO1U/15XLZhhSPF00o7FY7z24WC0CpqrLTY0juosww9YjVgJrjuB 0FDkokpeIsl8Au4SMbkjz2OEt1R4ZG15i2Gxal9NrdahFGcD6Z56EgoRFm58sAGqQMDC KVA1YJV6re7BPofEdH0ms/bHdAn/Biw7ujtWfDEKVsZp6VQ6D1VcqamzyFYXy2LW3aMl nYjQ== 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=9Dc9eNCtoWZ5M5LtxZOQTgGnMve9k3+30EiddPdb3dg=; fh=16z9eSgr+T6wkiFTMo20mXPHGWzPIsCuS8kXeZ8Bzu4=; b=KrOuq/+n3vHHWSeYJ0lr1LyptSB2K6GgayKJOkSsxsreBQMX4mc455yE0HNAbSGS2Q zIPnD+V6pDc7959cRN964ZalzbNXX2bhdAw0DlVmuNlNEsDeYgwdgwQNP5uTOYese0tf fFeT/VT+C/CvvpDjiIyzV9p9tSFXxEE/x3+aLkEfKIxvVHh8Jis/gcIinVyYxbXGxBsd aBtIZQL0+AsCOxXigXj1yWHrwVFdMHJWrtiExBUufZylLAIyWUrGzjD9a2pCd1/UC6tz CpSXAjempIrLjXaZzTRMdaAsk4WCCc70wLGo8RIv1X4G+9SQQsNRTdOsPIYL3Z9DXNry qlKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=RyIM8IIc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id d18-20020a056a00199200b006cb90b336dcsi2721045pfl.267.2023.11.20.06.56.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 06:56:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=RyIM8IIc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id E877980AD9A9; Mon, 20 Nov 2023 06:55:50 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234031AbjKTOzJ (ORCPT + 99 others); Mon, 20 Nov 2023 09:55:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233230AbjKTOyr (ORCPT ); Mon, 20 Nov 2023 09:54:47 -0500 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F5131FE3; Mon, 20 Nov 2023 06:54:19 -0800 (PST) Received: from pps.filterd (m0353726.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3AKDWeNT013382; Mon, 20 Nov 2023 14:54:07 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=9Dc9eNCtoWZ5M5LtxZOQTgGnMve9k3+30EiddPdb3dg=; b=RyIM8IIcoGM8yee6uOvtKfw2YGwLmaUwIYFxXhQrFst/MmFbAoCyGITwDjN4IAKy6rRs EEJJ6FCT15T9iHelvU+hI02WYKup/EUtMfUFCL79HD3F8rOdLki0sBNoNwHIr2f/Dh1M 6T8HYnn6Nzri0tf1xyUJ8G8XT00WjVdEeTpZ14RvTvrp9duJ08tvli48+eEqfAc+slZp 4v/kKkjgjmTzcGC2dx7lE+a9BVAFb5Toj9G7oKsY6y8NrOOMNuCCB4EcpwQ7G00OhIT4 mxgqLhKfHWF6r3uVNV78sjFLgaDi3tR0nbnffBAj6pFjYUQMpq/lbxQCTWmm/I0SoXGD EA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ug8e7a1gq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Nov 2023 14:54:07 +0000 Received: from m0353726.ppops.net (m0353726.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3AKEeox9001148; Mon, 20 Nov 2023 14:54:06 GMT Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ug8e7a1gc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Nov 2023 14:54:06 +0000 Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3AKDWQMf012378; Mon, 20 Nov 2023 14:54:05 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 3ufaa1sa83-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Nov 2023 14:54:05 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3AKEs2Lj22151832 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 20 Nov 2023 14:54:03 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DFF2220040; Mon, 20 Nov 2023 14:54:02 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AD3032004E; Mon, 20 Nov 2023 14:54:02 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 20 Nov 2023 14:54:02 +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 v3 2/3] mm/memory_hotplug: fix error handling in add_memory_resource() Date: Mon, 20 Nov 2023 15:53:53 +0100 Message-Id: <20231120145354.308999-3-sumanthk@linux.ibm.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120145354.308999-1-sumanthk@linux.ibm.com> References: <20231120145354.308999-1-sumanthk@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: VjPJiQavhUGgOyHQSRgMKweaZAgACGBp X-Proofpoint-GUID: eL__u2loFyIY9HaWlPcvYndCoqbx7-5I 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_14,2023-11-20_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1015 suspectscore=0 priorityscore=1501 impostorscore=0 mlxlogscore=582 spamscore=0 bulkscore=0 adultscore=0 lowpriorityscore=0 malwarescore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311200103 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 agentk.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 (agentk.vger.email [0.0.0.0]); Mon, 20 Nov 2023 06:55:51 -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") Cc: stable@vger.kernel.org # 5.15+ 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