linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mm/page_alloc: fix memmap_init_zone pageblock alignment
@ 2018-03-01 12:47 Daniel Vacek
  2018-03-01 13:10 ` Michal Hocko
                   ` (2 more replies)
  0 siblings, 3 replies; 22+ messages in thread
From: Daniel Vacek @ 2018-03-01 12:47 UTC (permalink / raw)
  To: linux-kernel, linux-mm
  Cc: Andrew Morton, Michal Hocko, Vlastimil Babka, Mel Gorman,
	Pavel Tatashin, Paul Burton, Daniel Vacek, stable

In move_freepages() a BUG_ON() can be triggered on uninitialized page structures
due to pageblock alignment. Aligning the skipped pfns in memmap_init_zone() the
same way as in move_freepages_block() simply fixes those crashes.

Fixes: b92df1de5d28 ("[mm] page_alloc: skip over regions of invalid pfns where possible")
Signed-off-by: Daniel Vacek <neelx@redhat.com>
Cc: stable@vger.kernel.org
---
 mm/page_alloc.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index cb416723538f..9edee36e6a74 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5359,9 +5359,14 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
 			/*
 			 * Skip to the pfn preceding the next valid one (or
 			 * end_pfn), such that we hit a valid pfn (or end_pfn)
-			 * on our next iteration of the loop.
+			 * on our next iteration of the loop. Note that it needs
+			 * to be pageblock aligned even when the region itself
+			 * is not as move_freepages_block() can shift ahead of
+			 * the valid region but still depends on correct page
+			 * metadata.
 			 */
-			pfn = memblock_next_valid_pfn(pfn, end_pfn) - 1;
+			pfn = (memblock_next_valid_pfn(pfn, end_pfn) &
+						~(pageblock_nr_pages-1)) - 1;
 #endif
 			continue;
 		}
-- 
2.16.2

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply related	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2018-03-13 22:47 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-01 12:47 [PATCH] mm/page_alloc: fix memmap_init_zone pageblock alignment Daniel Vacek
2018-03-01 13:10 ` Michal Hocko
2018-03-01 15:09   ` Daniel Vacek
2018-03-01 15:27     ` Michal Hocko
2018-03-01 16:20       ` Daniel Vacek
2018-03-01 23:21         ` Andrew Morton
2018-03-02 10:54         ` Daniel Vacek
2018-03-02 13:01         ` Michal Hocko
2018-03-02 15:27           ` Daniel Vacek
2018-03-01 17:24       ` Daniel Vacek
2018-03-02 11:01 ` [PATCH v2] " Daniel Vacek
2018-03-03  0:12 ` [PATCH v3 0/2] mm/page_alloc: fix kernel BUG at mm/page_alloc.c:1913! crash in move_freepages() Daniel Vacek
2018-03-03  0:12   ` [PATCH v3 1/2] mm/memblock: hardcode the end_pfn being -1 Daniel Vacek
2018-03-03  0:12   ` [PATCH v3 2/2] mm/page_alloc: fix memmap_init_zone pageblock alignment Daniel Vacek
2018-03-03  0:40     ` Andrew Morton
2018-03-03  1:08       ` Daniel Vacek
2018-03-12 12:26         ` Sudeep Holla
2018-03-12 14:49           ` Naresh Kamboju
2018-03-12 16:51             ` Daniel Vacek
2018-03-12 17:11               ` Sudeep Holla
2018-03-13  6:34               ` Naresh Kamboju
2018-03-13 22:47                 ` Daniel Vacek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).