Re: [-rc7 regression] Buggy commit: "mm: use aligned zone start for pfn_to_bitidx calculation"

[Linus Torvalds <torvalds@linux-foundation.org>]

[-- Attachment #1: Type: text/plain, Size: 1220 bytes --]

On Fri, Feb 15, 2013 at 3:44 AM, Ingo Molnar <mingo@kernel.org> wrote:
>>
>> c060f943d092 may be related as you config does not have
>> CONFIG_SPARSEMEM defined.
>
> Right, that's the commit causing the x86 regression:
>
>  c060f943d0929f3e429c5d9522290584f6281d6e is the first bad commit
>  commit c060f943d0929f3e429c5d9522290584f6281d6e
>  Date:   Fri Jan 11 14:31:51 2013 -0800
>
>      mm: use aligned zone start for pfn_to_bitidx calculation

Ok, looking more at this, I don't really want to revert it, and I have
an idea of what is wrong.

When we allocate the zone use bitmap, we do not take the
zone_start_pfn into account. So I *think* that what happens is that
"pfn_to_bitidx()" simply overruns the allocation for unaligned zonesm
and the spinlock just happens to be right after (or the overrun causes
some other memory corruption that then indirectly causes the spinlock
corruption).

So I'm wondering if the fix is simply something like the attached
patch. It takes the zone_start_pfn into account when allocating the
zone bitmap.

Laura? Mel?

Ingo, can you test this? I was going to do the 3.8 today, but I guess
I can just wait, and if you can test this we could get it in..

                      Linus

[-- Attachment #2: patch.diff --]
[-- Type: application/octet-stream, Size: 1633 bytes --]

 mm/page_alloc.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 9673d96b1ba7..e8a5acdadfdc 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4420,10 +4420,11 @@ static void __meminit calculate_node_totalpages(struct pglist_data *pgdat,
  * round what is now in bits to nearest long in bits, then return it in
  * bytes.
  */
-static unsigned long __init usemap_size(unsigned long zonesize)
+static unsigned long __init usemap_size(unsigned long zone_start_pfn, unsigned long zonesize)
 {
 	unsigned long usemapsize;
 
+	zonesize += zone_start_pfn & (pageblock_nr_pages-1);
 	usemapsize = roundup(zonesize, pageblock_nr_pages);
 	usemapsize = usemapsize >> pageblock_order;
 	usemapsize *= NR_PAGEBLOCK_BITS;
@@ -4433,9 +4434,11 @@ static unsigned long __init usemap_size(unsigned long zonesize)
 }
 
 static void __init setup_usemap(struct pglist_data *pgdat,
-				struct zone *zone, unsigned long zonesize)
+				struct zone *zone,
+				unsigned long zone_start_pfn,
+				unsigned long zonesize)
 {
-	unsigned long usemapsize = usemap_size(zonesize);
+	unsigned long usemapsize = usemap_size(zone_start_pfn, zonesize);
 	zone->pageblock_flags = NULL;
 	if (usemapsize)
 		zone->pageblock_flags = alloc_bootmem_node_nopanic(pgdat,
@@ -4594,7 +4597,7 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat,
 			continue;
 
 		set_pageblock_order();
-		setup_usemap(pgdat, zone, size);
+		setup_usemap(pgdat, zone, zone_start_pfn, size);
 		ret = init_currently_empty_zone(zone, zone_start_pfn,
 						size, MEMMAP_EARLY);
 		BUG_ON(ret);