4.14-stable patches

added patches:
	mm-sparsemem-fix-arm64-boot-crash-when-config_sparsemem_extreme-y.patch

diff --git a/queue-4.14/mm-sparsemem-fix-arm64-boot-crash-when-config_sparsemem_extreme-y.patch b/queue-4.14/mm-sparsemem-fix-arm64-boot-crash-when-config_sparsemem_extreme-y.patch
new file mode 100644 (file)
index 0000000..0b0279e
--- /dev/null
+++ b/queue-4.14/mm-sparsemem-fix-arm64-boot-crash-when-config_sparsemem_extreme-y.patch
@@ -0,0 +1,78 @@
+From 629a359bdb0e0652a8227b4ff3125431995fec6e Mon Sep 17 00:00:00 2001
+From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
+Date: Tue, 7 Nov 2017 11:33:37 +0300
+Subject: mm/sparsemem: Fix ARM64 boot crash when CONFIG_SPARSEMEM_EXTREME=y
+
+From: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
+
+commit 629a359bdb0e0652a8227b4ff3125431995fec6e upstream.
+
+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 <sudeep.holla@arm.com>
+Tested-by: Bjorn Andersson <bjorn.andersson@linaro.org>
+Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
+Acked-by: Will Deacon <will.deacon@arm.com>
+Cc: Andrew Morton <akpm@linux-foundation.org>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+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 <mingo@kernel.org>
+Cc: Dan Rue <dan.rue@linaro.org>
+Cc: Naresh Kamboju <naresh.kamboju@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ mm/page_alloc.c |   10 ----------
+ mm/sparse.c     |   10 ++++++++++
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+--- a/mm/page_alloc.c
++++ b/mm/page_alloc.c
+@@ -5651,16 +5651,6 @@ void __init sparse_memory_present_with_a
+       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);
+ }
+--- a/mm/sparse.c
++++ b/mm/sparse.c
+@@ -207,6 +207,16 @@ void __init memory_present(int nid, unsi
+ {
+       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) {

diff --git a/queue-4.14/series b/queue-4.14/series
index 6a3875d45f5b1c121acd11299e7313b540ce92cf..d3ec280473b862b676060faedc49a8b1eb4aaa7c 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -157,3 +157,4 @@ thermal-drivers-hisi-fix-kernel-panic-on-alarm-interrupt.patch
 thermal-drivers-hisi-simplify-the-temperature-step-computation.patch
 thermal-drivers-hisi-fix-multiple-alarm-interrupts-firing.patch
 platform-x86-asus-wireless-send-an-ev_syn-syn_report-between-state-changes.patch
+mm-sparsemem-fix-arm64-boot-crash-when-config_sparsemem_extreme-y.patch