Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mm/memory_hotplug.c: check start_pfn in test_pages_in_a_zone()

Patch series "fix a kernel oops when reading sysfs valid_zones", v2.

A sysfs memory file is created for each 2GiB memory block on x86-64 when
the system has 64GiB or more memory. [1] When the start address of a
memory block is not backed by struct page, i.e. a memory range is not
aligned by 2GiB, reading its 'valid_zones' attribute file leads to a
kernel oops. This issue was observed on multiple x86-64 systems with
more than 64GiB of memory. This patch-set fixes this issue.

Patch 1 first fixes an issue in test_pages_in_a_zone(), which does not
test the start section.

Patch 2 then fixes the kernel oops by extending test_pages_in_a_zone()
to return valid [start, end).

Note for stable kernels: The memory block size change was made by commit
bdee237c0343 ("x86: mm: Use 2GB memory block size on large-memory x86-64
systems"), which was accepted to 3.9. However, this patch-set depends
on (and fixes) the change to test_pages_in_a_zone() made by commit
5f0f2887f4de ("mm/memory_hotplug.c: check for missing sections in
test_pages_in_a_zone()"), which was accepted to 4.4.

So, I recommend that we backport it up to 4.4.

[1] 'Commit bdee237c0343 ("x86: mm: Use 2GB memory block size on
large-memory x86-64 systems")'

This patch (of 2):

test_pages_in_a_zone() does not check 'start_pfn' when it is aligned by
section since 'sec_end_pfn' is set equal to 'pfn'. Since this function
is called for testing the range of a sysfs memory file, 'start_pfn' is
always aligned by section.

Fix it by properly setting 'sec_end_pfn' to the next section pfn.

Also make sure that this function returns 1 only when the range belongs
to a zone.

Link: http://lkml.kernel.org/r/20170127222149.30893-2-toshi.kani@hpe.com
Signed-off-by: Toshi Kani <toshi.kani@hpe.com>
Cc: Andrew Banman <abanman@sgi.com>
Cc: Reza Arbab <arbab@linux.vnet.ibm.com>
Cc: Greg KH <greg@kroah.com>
Cc: <stable@vger.kernel.org> [4.4+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Toshi Kani and committed by
Linus Torvalds
deb88a2a 35f860f9

+8 -4
+8 -4
mm/memory_hotplug.c
··· 1483 1483 } 1484 1484 1485 1485 /* 1486 - * Confirm all pages in a range [start, end) is belongs to the same zone. 1486 + * Confirm all pages in a range [start, end) belong to the same zone. 1487 1487 */ 1488 1488 int test_pages_in_a_zone(unsigned long start_pfn, unsigned long end_pfn) 1489 1489 { ··· 1491 1491 struct zone *zone = NULL; 1492 1492 struct page *page; 1493 1493 int i; 1494 - for (pfn = start_pfn, sec_end_pfn = SECTION_ALIGN_UP(start_pfn); 1494 + for (pfn = start_pfn, sec_end_pfn = SECTION_ALIGN_UP(start_pfn + 1); 1495 1495 pfn < end_pfn; 1496 - pfn = sec_end_pfn + 1, sec_end_pfn += PAGES_PER_SECTION) { 1496 + pfn = sec_end_pfn, sec_end_pfn += PAGES_PER_SECTION) { 1497 1497 /* Make sure the memory section is present first */ 1498 1498 if (!present_section_nr(pfn_to_section_nr(pfn))) 1499 1499 continue; ··· 1512 1512 zone = page_zone(page); 1513 1513 } 1514 1514 } 1515 - return 1; 1515 + 1516 + if (zone) 1517 + return 1; 1518 + else 1519 + return 0; 1516 1520 } 1517 1521 1518 1522 /*