Skip to content

Commit e86a876

Browse files
toshikanigregkh
authored andcommitted
mm/memory_hotplug.c: check start_pfn in test_pages_in_a_zone()
commit deb88a2a19e85842d79ba96b05031739ec327ff4 upstream. 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 bdee237 ("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 5f0f288 ("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 bdee237 ("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> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 920bba1 commit e86a876

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

mm/memory_hotplug.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,17 +1371,17 @@ int is_mem_section_removable(unsigned long start_pfn, unsigned long nr_pages)
13711371
}
13721372

13731373
/*
1374-
* Confirm all pages in a range [start, end) is belongs to the same zone.
1374+
* Confirm all pages in a range [start, end) belong to the same zone.
13751375
*/
13761376
int test_pages_in_a_zone(unsigned long start_pfn, unsigned long end_pfn)
13771377
{
13781378
unsigned long pfn, sec_end_pfn;
13791379
struct zone *zone = NULL;
13801380
struct page *page;
13811381
int i;
1382-
for (pfn = start_pfn, sec_end_pfn = SECTION_ALIGN_UP(start_pfn);
1382+
for (pfn = start_pfn, sec_end_pfn = SECTION_ALIGN_UP(start_pfn + 1);
13831383
pfn < end_pfn;
1384-
pfn = sec_end_pfn + 1, sec_end_pfn += PAGES_PER_SECTION) {
1384+
pfn = sec_end_pfn, sec_end_pfn += PAGES_PER_SECTION) {
13851385
/* Make sure the memory section is present first */
13861386
if (!present_section_nr(pfn_to_section_nr(pfn)))
13871387
continue;
@@ -1400,7 +1400,11 @@ int test_pages_in_a_zone(unsigned long start_pfn, unsigned long end_pfn)
14001400
zone = page_zone(page);
14011401
}
14021402
}
1403-
return 1;
1403+
1404+
if (zone)
1405+
return 1;
1406+
else
1407+
return 0;
14041408
}
14051409

14061410
/*

0 commit comments

Comments
 (0)