Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp5712693ybi; Tue, 4 Jun 2019 10:53:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqzPM5136PU2mM0XEpK0S7gI4hZiOvLk50hIMLx4Qoaov6aMT8za+mU4Apag6lwMm74FME53 X-Received: by 2002:aa7:8248:: with SMTP id e8mr476640pfn.155.1559670806329; Tue, 04 Jun 2019 10:53:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559670806; cv=none; d=google.com; s=arc-20160816; b=t9KvAD0ImWv0MeJqw1Ufzdx8oQviJ51I+e9j3aB+bmqlR3jmLaqmIQzulRQotQyury rxdosq/cO7A3OLw4g35HSilLMoNOgqG2bvRXc2E4Ciz/gBzhnHmKpBSyBxmZ69pPgRSH yf8v7PDBzuK1jwFdN24DJ7zuZMO5CFR1hrr+Wd9nvNtCtZbnFYNMwGaZD9B541xgPFF3 qR+zPaWeWKCR+l50cR/QZsIYGpVl7w4ADvp8wl0LhvbhREOLYz8vR395Q51HqBYgN3Rl waPVICfN1NM1JpFliMXhDp5JitzxpbRw+VHDKkoJXPqdMgSmhAuQCRv3wweYoolmIMH0 ZmQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:organization:autocrypt:openpgp:from:references:cc:to :subject; bh=Mlnc1PENy6BubUC3qMTM4yUW1mdnZfFrWQ6xDaxH6ek=; b=zlKnTN5Fnb0Tr433eRmbYmd6ZBW5KGtixEivQoqYoIwGkDef/r9hutIpkfl12KPfmc Cq1jHv4BXOQBeS35PeQa4B64x1LJnn3hnh/lLqOMAdapxctXAZFkTcGvxfKk7hQwl9kw UQFLubZfHE4EAuDkTK4DE9C+FtZM88xx9IYrcHjqMXLTSApNVcGCmtphJxKh7MhCWkWS LOMyzHE6/nI4BMQy1k2Y7UdcN5zv8YdLPD2UspHKyB+zzlZT4jaxtyMcN6kzuElA97Pr eSfhjqcTr+D7G2WqkovByDTiTyZn+gR/P7y7jATOrpFZa/JBEa+N/U3yTdGQjYnJFQOs wNpQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q1si22834981pll.25.2019.06.04.10.53.09; Tue, 04 Jun 2019 10:53:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726301AbfFDRwB (ORCPT + 99 others); Tue, 4 Jun 2019 13:52:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36912 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725929AbfFDRwA (ORCPT ); Tue, 4 Jun 2019 13:52:00 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DC01AC04FFF1; Tue, 4 Jun 2019 17:51:59 +0000 (UTC) Received: from [10.36.116.79] (ovpn-116-79.ams2.redhat.com [10.36.116.79]) by smtp.corp.redhat.com (Postfix) with ESMTP id 735B9600CC; Tue, 4 Jun 2019 17:51:53 +0000 (UTC) Subject: Re: [PATCH v3 04/11] arm64/mm: Add temporary arch_remove_memory() implementation To: Robin Murphy , Wei Yang Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org, akpm@linux-foundation.org, Dan Williams , Igor Mammedov , Catalin Marinas , Will Deacon , Mark Rutland , Ard Biesheuvel , Chintan Pandya , Mike Rapoport , Jun Yao , Yu Zhao , Anshuman Khandual References: <20190527111152.16324-1-david@redhat.com> <20190527111152.16324-5-david@redhat.com> <20190603214139.mercn5hol2yyfl2s@master> <5059f68d-45d2-784e-0770-ee67060773c7@redhat.com> <7a5b8c8d-f1bb-9c7e-9809-405af374fecd@arm.com> From: David Hildenbrand Openpgp: preference=signencrypt Autocrypt: addr=david@redhat.com; prefer-encrypt=mutual; keydata= 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 SE+xAvmumFBY Organization: Red Hat GmbH Message-ID: <4f2a87e9-7fd6-4b2b-892d-52482a330235@redhat.com> Date: Tue, 4 Jun 2019 19:51:52 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <7a5b8c8d-f1bb-9c7e-9809-405af374fecd@arm.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 04 Jun 2019 17:52:00 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 04.06.19 19:36, Robin Murphy wrote: > On 04/06/2019 07:56, David Hildenbrand wrote: >> On 03.06.19 23:41, Wei Yang wrote: >>> On Mon, May 27, 2019 at 01:11:45PM +0200, David Hildenbrand wrote: >>>> A proper arch_remove_memory() implementation is on its way, which also >>>> cleanly removes page tables in arch_add_memory() in case something goes >>>> wrong. >>> >>> Would this be better to understand? >>> >>> removes page tables created in arch_add_memory >> >> That's not what this sentence expresses. Have a look at >> arch_add_memory(), in case __add_pages() fails, the page tables are not >> removed. This will also be fixed by Anshuman in the same shot. >> >>> >>>> >>>> As we want to use arch_remove_memory() in case something goes wrong >>>> during memory hotplug after arch_add_memory() finished, let's add >>>> a temporary hack that is sufficient enough until we get a proper >>>> implementation that cleans up page table entries. >>>> >>>> We will remove CONFIG_MEMORY_HOTREMOVE around this code in follow up >>>> patches. >>>> >>>> Cc: Catalin Marinas >>>> Cc: Will Deacon >>>> Cc: Mark Rutland >>>> Cc: Andrew Morton >>>> Cc: Ard Biesheuvel >>>> Cc: Chintan Pandya >>>> Cc: Mike Rapoport >>>> Cc: Jun Yao >>>> Cc: Yu Zhao >>>> Cc: Robin Murphy >>>> Cc: Anshuman Khandual >>>> Signed-off-by: David Hildenbrand >>>> --- >>>> arch/arm64/mm/mmu.c | 19 +++++++++++++++++++ >>>> 1 file changed, 19 insertions(+) >>>> >>>> diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c >>>> index a1bfc4413982..e569a543c384 100644 >>>> --- a/arch/arm64/mm/mmu.c >>>> +++ b/arch/arm64/mm/mmu.c >>>> @@ -1084,4 +1084,23 @@ int arch_add_memory(int nid, u64 start, u64 size, >>>> return __add_pages(nid, start >> PAGE_SHIFT, size >> PAGE_SHIFT, >>>> restrictions); >>>> } >>>> +#ifdef CONFIG_MEMORY_HOTREMOVE >>>> +void arch_remove_memory(int nid, u64 start, u64 size, >>>> + struct vmem_altmap *altmap) >>>> +{ >>>> + unsigned long start_pfn = start >> PAGE_SHIFT; >>>> + unsigned long nr_pages = size >> PAGE_SHIFT; >>>> + struct zone *zone; >>>> + >>>> + /* >>>> + * FIXME: Cleanup page tables (also in arch_add_memory() in case >>>> + * adding fails). Until then, this function should only be used >>>> + * during memory hotplug (adding memory), not for memory >>>> + * unplug. ARCH_ENABLE_MEMORY_HOTREMOVE must not be >>>> + * unlocked yet. >>>> + */ >>>> + zone = page_zone(pfn_to_page(start_pfn)); >>> >>> Compared with arch_remove_memory in x86. If altmap is not NULL, zone will be >>> retrieved from page related to altmap. Not sure why this is not the same? >> >> This is a minimal implementation, sufficient for this use case here. A >> full implementation is in the works. For now, this function will not be >> used with an altmap (ZONE_DEVICE is not esupported for arm64 yet). > > FWIW the other pieces of ZONE_DEVICE are now due to land in parallel, > but as long as we don't throw the ARCH_ENABLE_MEMORY_HOTREMOVE switch > then there should still be no issue. Besides, given that we should > consistently ignore the altmap everywhere at the moment, it may even > work out regardless. Thanks for the info. > > One thing stands out about the failure path thing, though - if > __add_pages() did fail, can it still be guaranteed to have initialised > the memmap such that page_zone() won't return nonsense? Last time I if __add_pages() fails, then arch_add_memory() fails and arch_remove_memory() will not be called in the context of this series. Only if it succeeded. > looked that was still a problem when removing memory which had been > successfully added, but never onlined (although I do know that > particular case was already being discussed at the time, and I've not > been paying the greatest attention since). Yes, that part is next on my list. It works but is ugly. The memory removal process should not care about zones at all. Slowly moving into the right direction :) > > Robin. > -- Thanks, David / dhildenb