summaryrefslogtreecommitdiffstats
path: root/mm/sparse.c
diff options
context:
space:
mode:
authorWei Yang <richardw.yang@linux.intel.com>2020-04-01 21:09:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-04-02 09:35:30 -0700
commit4627d76dcf0482c56e925a3477948df136255f0c (patch)
tree68629f4d3d557cb9743e0761a0cd8eb13fa235f8 /mm/sparse.c
parent0c28759ee3c91fa8ae14d7672b781b979be274e1 (diff)
downloadlinux-stable-4627d76dcf0482c56e925a3477948df136255f0c.tar.gz
linux-stable-4627d76dcf0482c56e925a3477948df136255f0c.tar.bz2
linux-stable-4627d76dcf0482c56e925a3477948df136255f0c.zip
mm/sparsemem: get address to page struct instead of address to pfn
memmap should be the address to page struct instead of address to pfn. As mentioned by David, if system memory and devmem sit within a section, the mismatch address would lead kdump to dump unexpected memory. Since sub-section only works for SPARSEMEM_VMEMMAP, pfn_to_page() is valid to get the page struct address at this point. Fixes: ba72b4c8cf60 ("mm/sparsemem: support sub-section hotplug") Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: David Hildenbrand <david@redhat.com> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Baoquan He <bhe@redhat.com> Link: http://lkml.kernel.org/r/20200210005048.10437-1-richardw.yang@linux.intel.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/sparse.c')
-rw-r--r--mm/sparse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/sparse.c b/mm/sparse.c
index 65599e8bd636..55fe305e8d7b 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -894,7 +894,7 @@ int __meminit sparse_add_section(int nid, unsigned long start_pfn,
/* Align memmap to section boundary in the subsection case */
if (section_nr_to_pfn(section_nr) != start_pfn)
- memmap = pfn_to_kaddr(section_nr_to_pfn(section_nr));
+ memmap = pfn_to_page(section_nr_to_pfn(section_nr));
sparse_init_one_section(ms, section_nr, memmap, ms->usage, 0);
return 0;