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 X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 713F0C55186 for ; Thu, 23 Apr 2020 01:13:35 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 14CC32071C for ; Thu, 23 Apr 2020 01:13:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Gg16U9fL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 14CC32071C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 67F828E0005; Wed, 22 Apr 2020 21:13:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 62FA08E0003; Wed, 22 Apr 2020 21:13:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4F7328E0005; Wed, 22 Apr 2020 21:13:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0103.hostedemail.com [216.40.44.103]) by kanga.kvack.org (Postfix) with ESMTP id 348DF8E0003 for ; Wed, 22 Apr 2020 21:13:34 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id DE813181AEF09 for ; Thu, 23 Apr 2020 01:13:33 +0000 (UTC) X-FDA: 76737347106.01.twist43_3c2558383e405 X-HE-Tag: twist43_3c2558383e405 X-Filterd-Recvd-Size: 8261 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by imf35.hostedemail.com (Postfix) with ESMTP for ; Thu, 23 Apr 2020 01:13:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587604412; 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: in-reply-to:in-reply-to:references:references; bh=2i5M2ycjs3rlosl36wEuRNmxANDiCG1t4SjA8z/n0gs=; b=Gg16U9fLasHhmJoL6KeuK4e4q6g42wtYlivz5JkoaM/yeHJDZF7UDcU1Xu9IRhRpeuzJ/g vuh5fZSUbhxwZwu7xfG075ekTmqpKfmAp22rTpL+cxqPA2XYgm8lkPvTdmHY6fQdFonrrD Z6BzFOgD6bluKHT/ozE11vjCa5pdOfw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-74-BEzLYa-fNc2wMeSdUgUC6Q-1; Wed, 22 Apr 2020 21:13:30 -0400 X-MC-Unique: BEzLYa-fNc2wMeSdUgUC6Q-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 55EDD8017F3; Thu, 23 Apr 2020 01:13:23 +0000 (UTC) Received: from localhost (ovpn-12-37.pek2.redhat.com [10.72.12.37]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 820715D706; Thu, 23 Apr 2020 01:13:15 +0000 (UTC) Date: Thu, 23 Apr 2020 09:13:12 +0800 From: Baoquan He To: Mike Rapoport Cc: linux-kernel@vger.kernel.org, Andrew Morton , Brian Cain , Catalin Marinas , "David S. Miller" , Geert Uytterhoeven , Greentime Hu , Greg Ungerer , Guan Xuetao , Guo Ren , Heiko Carstens , Helge Deller , Hoan Tran , "James E.J. Bottomley" , Jonathan Corbet , Ley Foon Tan , Mark Salter , Matt Turner , Max Filippov , Michael Ellerman , Michal Hocko , Michal Simek , Nick Hu , Paul Walmsley , Richard Weinberger , Rich Felker , Russell King , Stafford Horne , Thomas Bogendoerfer , Tony Luck , Vineet Gupta , x86@kernel.org, Yoshinori Sato , linux-alpha@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-c6x-dev@linux-c6x.org, linux-csky@vger.kernel.org, linux-doc@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-um@lists.infradead.org, linux-xtensa@linux-xtensa.org, openrisc@lists.librecores.org, sparclinux@vger.kernel.org, uclinux-h8-devel@lists.sourceforge.jp, Mike Rapoport Subject: Re: [PATCH 16/21] mm: remove early_pfn_in_nid() and CONFIG_NODES_SPAN_OTHER_NODES Message-ID: <20200423011312.GY4247@MiWiFi-R3L-srv> References: <20200412194859.12663-1-rppt@kernel.org> <20200412194859.12663-17-rppt@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200412194859.12663-17-rppt@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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: On 04/12/20 at 10:48pm, Mike Rapoport wrote: > From: Mike Rapoport > > The commit f47ac088c406 ("mm: memmap_init: iterate over memblock regions This commit id should be a temporary one, will be changed when merged into maintainer's tree and linus's tree. Only saying last patch plus the patch subject is OK? > rather that check each PFN") made early_pfn_in_nid() obsolete and since > CONFIG_NODES_SPAN_OTHER_NODES is only used to pick a stub or a real > implementation of early_pfn_in_nid() it is also not needed anymore. > > Remove both early_pfn_in_nid() and the CONFIG_NODES_SPAN_OTHER_NODES. > > Co-developed-by: Hoan Tran > Signed-off-by: Hoan Tran > Signed-off-by: Mike Rapoport > --- > arch/powerpc/Kconfig | 9 --------- > arch/sparc/Kconfig | 9 --------- > arch/x86/Kconfig | 9 --------- > mm/page_alloc.c | 20 -------------------- > 4 files changed, 47 deletions(-) > > diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig > index 5f86b22b7d2c..74f316deeae1 100644 > --- a/arch/powerpc/Kconfig > +++ b/arch/powerpc/Kconfig > @@ -685,15 +685,6 @@ config ARCH_MEMORY_PROBE > def_bool y > depends on MEMORY_HOTPLUG > > -# Some NUMA nodes have memory ranges that span > -# other nodes. Even though a pfn is valid and > -# between a node's start and end pfns, it may not > -# reside on that node. See memmap_init_zone() > -# for details. > -config NODES_SPAN_OTHER_NODES > - def_bool y > - depends on NEED_MULTIPLE_NODES > - > config STDBINUTILS > bool "Using standard binutils settings" > depends on 44x > diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig > index 795206b7b552..0e4f3891b904 100644 > --- a/arch/sparc/Kconfig > +++ b/arch/sparc/Kconfig > @@ -286,15 +286,6 @@ config NODES_SHIFT > Specify the maximum number of NUMA Nodes available on the target > system. Increases memory reserved to accommodate various tables. > > -# Some NUMA nodes have memory ranges that span > -# other nodes. Even though a pfn is valid and > -# between a node's start and end pfns, it may not > -# reside on that node. See memmap_init_zone() > -# for details. > -config NODES_SPAN_OTHER_NODES > - def_bool y > - depends on NEED_MULTIPLE_NODES > - > config ARCH_SPARSEMEM_ENABLE > def_bool y if SPARC64 > select SPARSEMEM_VMEMMAP_ENABLE > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index 9d3e95b4fb85..37dac095659e 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -1581,15 +1581,6 @@ config X86_64_ACPI_NUMA > ---help--- > Enable ACPI SRAT based node topology detection. > > -# Some NUMA nodes have memory ranges that span > -# other nodes. Even though a pfn is valid and > -# between a node's start and end pfns, it may not > -# reside on that node. See memmap_init_zone() > -# for details. > -config NODES_SPAN_OTHER_NODES > - def_bool y > - depends on X86_64_ACPI_NUMA > - > config NUMA_EMU > bool "NUMA emulation" > depends on NUMA > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index c43ce8709457..343d87b8697d 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -1541,26 +1541,6 @@ int __meminit early_pfn_to_nid(unsigned long pfn) > } > #endif /* CONFIG_NEED_MULTIPLE_NODES */ > > -#ifdef CONFIG_NODES_SPAN_OTHER_NODES > -/* Only safe to use early in boot when initialisation is single-threaded */ > -static inline bool __meminit early_pfn_in_nid(unsigned long pfn, int node) > -{ > - int nid; > - > - nid = __early_pfn_to_nid(pfn, &early_pfnnid_cache); > - if (nid >= 0 && nid != node) > - return false; > - return true; > -} > - > -#else > -static inline bool __meminit early_pfn_in_nid(unsigned long pfn, int node) > -{ > - return true; > -} > -#endif And macro early_pfn_valid() is not needed either, we may need remove it too. Otherwise, removing NODES_SPAN_OTHER_NODES in this patch looks good. Reviewed-by: Baoquan He > - > - > void __init memblock_free_pages(struct page *page, unsigned long pfn, > unsigned int order) > { > -- > 2.25.1 >