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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6967C4332F for ; Tue, 14 Nov 2023 18:36:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229770AbjKNSgb (ORCPT ); Tue, 14 Nov 2023 13:36:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230200AbjKNSga (ORCPT ); Tue, 14 Nov 2023 13:36:30 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD8E011D for ; Tue, 14 Nov 2023 10:36:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699986987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=70jj+kF+5ruNn+g6XU2qEsz1QgBg73S7Eid+Vheoqr0=; b=VtBljMu+x1UKvb/cWOMgHytXZQxSuVjskDwTbASvlyzPYbgRMt4ErHE1hIlgAF0AtXvfW8 8h3tPM+MjxlZwYC7WkVvIrJAWUZjcvIIEX4q5RPAbBDRLfX87+QEqmDpK79ps7U3CkGOCb akJfce9b6OAJUeR+Bqa5cpIYilsmvm8= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-218-UFflZPADP6KkJt8jqj4BlA-1; Tue, 14 Nov 2023 13:36:23 -0500 X-MC-Unique: UFflZPADP6KkJt8jqj4BlA-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-408508aa81cso38622865e9.3 for ; Tue, 14 Nov 2023 10:36:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699986982; x=1700591782; h=content-transfer-encoding:in-reply-to:organization:autocrypt:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=70jj+kF+5ruNn+g6XU2qEsz1QgBg73S7Eid+Vheoqr0=; b=TAt3mzYih75v/nB8+usP1HiZtylkd60cpAQeb0fB3C9aGqxgTkRMUiNB1An5d+N6Pu rXkG73bDAVUYqbh7R647eYX3M/BF2gv/e0chrjZZ0MSPdR4oeOWilsl6FcduUuCtd2jS cVya3ZscxcSGRVJFhsYaNmhL0lhnz/oklTEGKEQ8NjSTX1TmIIF8O5ANyXivKzCvgwNE 3H0tTp2SWiicQyVqiTWocdV58S+RGNY8hB1Izy9ykXqHsAFwzLrOD/NJdav13Wu6oTqV WKWPQo0gOWL4j6RLXGODbRhRXptc2hL7coym4nQ1u/1DwC96MXCF2C0HPzQiTAzgGecf O09Q== X-Gm-Message-State: AOJu0YzEkponMaobmmfLLpXI4V+49LG2snIuT9+TscKnryiNfU5T7RRP y3ZTrE0plbulewP/UkcocrdITBMxY31pznrKG6+buD2t9RLNke7ysGeDagNLbVzlmuILps6G6Me cnACsRCuIEvtRtx7Fe+N7cA== X-Received: by 2002:a05:600c:2343:b0:405:3d41:5646 with SMTP id 3-20020a05600c234300b004053d415646mr8998550wmq.2.1699986982497; Tue, 14 Nov 2023 10:36:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IG3dyGRKOJfvGPDCabt07XWx3boGiNXJuEtAeXKmTs1ZfH3/0i5AocPao0QEx+zbJawjvDaoQ== X-Received: by 2002:a05:600c:2343:b0:405:3d41:5646 with SMTP id 3-20020a05600c234300b004053d415646mr8998534wmq.2.1699986982136; Tue, 14 Nov 2023 10:36:22 -0800 (PST) Received: from ?IPV6:2003:cb:c73e:8900:2d8:c9f0:f3fb:d4fd? (p200300cbc73e890002d8c9f0f3fbd4fd.dip0.t-ipconnect.de. [2003:cb:c73e:8900:2d8:c9f0:f3fb:d4fd]) by smtp.gmail.com with ESMTPSA id n2-20020a05600c4f8200b004090ca6d785sm12263078wmq.2.2023.11.14.10.36.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 14 Nov 2023 10:36:21 -0800 (PST) Message-ID: <6c545504-e1a7-435b-aad9-b045247d6945@redhat.com> Date: Tue, 14 Nov 2023 19:36:20 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/8] mm/memory_hotplug: fix error handling in add_memory_resource() Content-Language: en-US To: Sumanth Korikkar , linux-mm , Andrew Morton Cc: Oscar Salvador , Michal Hocko , "Aneesh Kumar K.V" , Anshuman Khandual , Gerald Schaefer , Alexander Gordeev , Heiko Carstens , Vasily Gorbik , linux-s390 , LKML , Vishal Verma References: <20231114180238.1522782-1-sumanthk@linux.ibm.com> <20231114180238.1522782-3-sumanthk@linux.ibm.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20231114180238.1522782-3-sumanthk@linux.ibm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-s390@vger.kernel.org On 14.11.23 19:02, Sumanth Korikkar wrote: > 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()") That's the wrong commit. We didn't support memmap-on-memory back then. Likely it should be: 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; > } > Indeed; this will conflict with Vishals patches, ccing him. -- Cheers, David / dhildenb