4.14-stable patches

added patches:
	revert-mm-sparsemem-allocate-mem_section-at-runtime-for-config_sparsemem_extreme-y.patch

diff --git a/queue-4.14/revert-mm-sparsemem-allocate-mem_section-at-runtime-for-config_sparsemem_extreme-y.patch b/queue-4.14/revert-mm-sparsemem-allocate-mem_section-at-runtime-for-config_sparsemem_extreme-y.patch
new file mode 100644 (file)
index 0000000..15b58e8
--- /dev/null
+++ b/queue-4.14/revert-mm-sparsemem-allocate-mem_section-at-runtime-for-config_sparsemem_extreme-y.patch
@@ -0,0 +1,103 @@
+From 77e3f5b8962b2d9eee0d0fc89e9188dd1c176f31 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Mon, 8 Jan 2018 10:06:56 +0100
+Subject: Revert "mm/sparsemem: Allocate mem_section at runtime for CONFIG_SPARSEMEM_EXTREME=y"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 4afaf6ea65acb07e151470580d89e6a2c0268610 which is
+commit 83e3c48729d9ebb7af5a31a504f3fd6aff0348c4 upstream.
+
+It breaks kdump and probably shoudn't have been included in the 4.14.y
+tree at all.
+
+Reported-by: Michal Hocko <mhocko@kernel.org>
+Reported-by: Mike Galbraith <efault@gmx.de>
+Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
+Cc: Andrew Morton <akpm@linux-foundation.org>
+Cc: Andy Lutomirski <luto@amacapital.net>
+Cc: Borislav Petkov <bp@suse.de>
+Cc: Cyrill Gorcunov <gorcunov@openvz.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
+Cc: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/linux/mmzone.h |    6 +-----
+ mm/sparse.c            |   17 ++++++-----------
+ 2 files changed, 7 insertions(+), 16 deletions(-)
+
+--- a/include/linux/mmzone.h
++++ b/include/linux/mmzone.h
+@@ -1152,17 +1152,13 @@ struct mem_section {
+ #define SECTION_ROOT_MASK     (SECTIONS_PER_ROOT - 1)
+ 
+ #ifdef CONFIG_SPARSEMEM_EXTREME
+-extern struct mem_section **mem_section;
++extern struct mem_section *mem_section[NR_SECTION_ROOTS];
+ #else
+ extern struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT];
+ #endif
+ 
+ static inline struct mem_section *__nr_to_section(unsigned long nr)
+ {
+-#ifdef CONFIG_SPARSEMEM_EXTREME
+-      if (!mem_section)
+-              return NULL;
+-#endif
+       if (!mem_section[SECTION_NR_TO_ROOT(nr)])
+               return NULL;
+       return &mem_section[SECTION_NR_TO_ROOT(nr)][nr & SECTION_ROOT_MASK];
+--- a/mm/sparse.c
++++ b/mm/sparse.c
+@@ -23,7 +23,8 @@
+  * 1) mem_section     - memory sections, mem_map's for valid memory
+  */
+ #ifdef CONFIG_SPARSEMEM_EXTREME
+-struct mem_section **mem_section;
++struct mem_section *mem_section[NR_SECTION_ROOTS]
++      ____cacheline_internodealigned_in_smp;
+ #else
+ struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT]
+       ____cacheline_internodealigned_in_smp;
+@@ -100,7 +101,7 @@ static inline int sparse_index_init(unsi
+ int __section_nr(struct mem_section* ms)
+ {
+       unsigned long root_nr;
+-      struct mem_section *root = NULL;
++      struct mem_section* root;
+ 
+       for (root_nr = 0; root_nr < NR_SECTION_ROOTS; root_nr++) {
+               root = __nr_to_section(root_nr * SECTIONS_PER_ROOT);
+@@ -111,7 +112,7 @@ int __section_nr(struct mem_section* ms)
+                    break;
+       }
+ 
+-      VM_BUG_ON(!root);
++      VM_BUG_ON(root_nr == NR_SECTION_ROOTS);
+ 
+       return (root_nr * SECTIONS_PER_ROOT) + (ms - root);
+ }
+@@ -339,17 +340,11 @@ again:
+ static void __init check_usemap_section_nr(int nid, unsigned long *usemap)
+ {
+       unsigned long usemap_snr, pgdat_snr;
+-      static unsigned long old_usemap_snr;
+-      static unsigned long old_pgdat_snr;
++      static unsigned long old_usemap_snr = NR_MEM_SECTIONS;
++      static unsigned long old_pgdat_snr = NR_MEM_SECTIONS;
+       struct pglist_data *pgdat = NODE_DATA(nid);
+       int usemap_nid;
+ 
+-      /* First call */
+-      if (!old_usemap_snr) {
+-              old_usemap_snr = NR_MEM_SECTIONS;
+-              old_pgdat_snr = NR_MEM_SECTIONS;
+-      }
+-
+       usemap_snr = pfn_to_section_nr(__pa(usemap) >> PAGE_SHIFT);
+       pgdat_snr = pfn_to_section_nr(__pa(pgdat) >> PAGE_SHIFT);
+       if (usemap_snr == pgdat_snr)

diff --git a/queue-4.14/series b/queue-4.14/series
index 3f18b5a0d5f0ecbd70888e5f304abd790bf95bfa..afcc09b2b9238167bdd90884e6e13358d6d9f394 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -36,3 +36,4 @@ parisc-qemu-idle-sleep-support.patch
 mtd-nand-pxa3xx-fix-readoob-implementation.patch
 kvm-s390-fix-cmma-migration-for-multiple-memory-slots.patch
 kvm-s390-prevent-buffer-overrun-on-memory-hotplug-during-migration.patch
+revert-mm-sparsemem-allocate-mem_section-at-runtime-for-config_sparsemem_extreme-y.patch