Commit 9f9b02e5 authored by Dan Williams's avatar Dan Williams Committed by Linus Torvalds

mm: teach pfn_to_online_page() to consider subsection validity

pfn_to_online_page is primarily used to filter out offline or fully
uninitialized pages.  pfn_valid resp.  online_section_nr have a coarse
per memory section granularity.  If a section shared with a partially
offline memory (e.g.  part of ZONE_DEVICE) then pfn_to_online_page
would lead to a false positive on some pfns.  Fix this by adding
pfn_section_valid check which is subsection aware.

[mhocko@kernel.org: changelog rewrite]

Link: https://lkml.kernel.org/r/161058500148.1840162.4365921007820501696.stgit@dwillia2-desk3.amr.corp.intel.com
Fixes: b13bc351 ("mm/hotplug: invalid PFNs from pfn_to_online_page()")
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Reported-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarOscar Salvador <osalvador@suse.de>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Qian Cai <cai@lca.pw>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Naoya Horiguchi <naoya.horiguchi@nec.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9f605f26
...@@ -308,11 +308,26 @@ static int check_hotplug_memory_addressable(unsigned long pfn, ...@@ -308,11 +308,26 @@ static int check_hotplug_memory_addressable(unsigned long pfn,
struct page *pfn_to_online_page(unsigned long pfn) struct page *pfn_to_online_page(unsigned long pfn)
{ {
unsigned long nr = pfn_to_section_nr(pfn); unsigned long nr = pfn_to_section_nr(pfn);
struct mem_section *ms;
if (nr >= NR_MEM_SECTIONS)
return NULL;
ms = __nr_to_section(nr);
if (!online_section(ms))
return NULL;
/*
* Save some code text when online_section() +
* pfn_section_valid() are sufficient.
*/
if (IS_ENABLED(CONFIG_HAVE_ARCH_PFN_VALID) && !pfn_valid(pfn))
return NULL;
if (!pfn_section_valid(ms, pfn))
return NULL;
if (nr < NR_MEM_SECTIONS && online_section_nr(nr) && return pfn_to_page(pfn);
pfn_valid_within(pfn))
return pfn_to_page(pfn);
return NULL;
} }
EXPORT_SYMBOL_GPL(pfn_to_online_page); EXPORT_SYMBOL_GPL(pfn_to_online_page);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment