From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757467AbdKGLS4 (ORCPT ); Tue, 7 Nov 2017 06:18:56 -0500 Received: from terminus.zytor.com ([65.50.211.136]:45163 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752069AbdKGLSy (ORCPT ); Tue, 7 Nov 2017 06:18:54 -0500 Date: Tue, 7 Nov 2017 03:12:53 -0800 From: "tip-bot for Kirill A. Shutemov" Message-ID: Cc: akpm@linux-foundation.org, kirill.shutemov@linux.intel.com, peterz@infradead.org, mingo@kernel.org, sudeep.holla@arm.com, torvalds@linux-foundation.org, bjorn.andersson@linaro.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, will.deacon@arm.com Reply-To: will.deacon@arm.com, hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, bjorn.andersson@linaro.org, mingo@kernel.org, sudeep.holla@arm.com, torvalds@linux-foundation.org, peterz@infradead.org, akpm@linux-foundation.org, kirill.shutemov@linux.intel.com In-Reply-To: <20171107083337.89952-1-kirill.shutemov@linux.intel.com> References: <20171107083337.89952-1-kirill.shutemov@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] mm/sparsemem: Fix ARM64 boot crash when CONFIG_SPARSEMEM_EXTREME=y Git-Commit-ID: 629a359bdb0e0652a8227b4ff3125431995fec6e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 629a359bdb0e0652a8227b4ff3125431995fec6e Gitweb: https://git.kernel.org/tip/629a359bdb0e0652a8227b4ff3125431995fec6e Author: Kirill A. Shutemov AuthorDate: Tue, 7 Nov 2017 11:33:37 +0300 Committer: Ingo Molnar CommitDate: Tue, 7 Nov 2017 11:16:08 +0100 mm/sparsemem: Fix ARM64 boot crash when CONFIG_SPARSEMEM_EXTREME=y Since commit: 83e3c48729d9 ("mm/sparsemem: Allocate mem_section at runtime for CONFIG_SPARSEMEM_EXTREME=y") we allocate the mem_section array dynamically in sparse_memory_present_with_active_regions(), but some architectures, like arm64, don't call the routine to initialize sparsemem. Let's move the initialization into memory_present() it should cover all architectures. Reported-and-tested-by: Sudeep Holla Tested-by: Bjorn Andersson Signed-off-by: Kirill A. Shutemov Acked-by: Will Deacon Cc: Andrew Morton Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-mm@kvack.org Fixes: 83e3c48729d9 ("mm/sparsemem: Allocate mem_section at runtime for CONFIG_SPARSEMEM_EXTREME=y") Link: http://lkml.kernel.org/r/20171107083337.89952-1-kirill.shutemov@linux.intel.com Signed-off-by: Ingo Molnar --- mm/page_alloc.c | 10 ---------- mm/sparse.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 8dfd13f..77e4d3c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5646,16 +5646,6 @@ void __init sparse_memory_present_with_active_regions(int nid) unsigned long start_pfn, end_pfn; int i, this_nid; -#ifdef CONFIG_SPARSEMEM_EXTREME - if (!mem_section) { - unsigned long size, align; - - size = sizeof(struct mem_section) * NR_SECTION_ROOTS; - align = 1 << (INTERNODE_CACHE_SHIFT); - mem_section = memblock_virt_alloc(size, align); - } -#endif - for_each_mem_pfn_range(i, nid, &start_pfn, &end_pfn, &this_nid) memory_present(this_nid, start_pfn, end_pfn); } diff --git a/mm/sparse.c b/mm/sparse.c index b00a973..d294148 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -206,6 +206,16 @@ void __init memory_present(int nid, unsigned long start, unsigned long end) { unsigned long pfn; +#ifdef CONFIG_SPARSEMEM_EXTREME + if (unlikely(!mem_section)) { + unsigned long size, align; + + size = sizeof(struct mem_section) * NR_SECTION_ROOTS; + align = 1 << (INTERNODE_CACHE_SHIFT); + mem_section = memblock_virt_alloc(size, align); + } +#endif + start &= PAGE_SECTION_MASK; mminit_validate_memmodel_limits(&start, &end); for (pfn = start; pfn < end; pfn += PAGES_PER_SECTION) {