mm/sparsemem: get address to page struct instead of address to pfn
Subsystems (2)
PATCH v2 1/1 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.
---
v2:
* adjust comment to mention the mismatch data would affect kdump
--- mm/sparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/sparse.c +1 -1
@@ -887,7 +887,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 ;
Signature · 1 line
2.17.1
Quoted 2 lines · Wei Yang
memmap should be the address to page struct instead of address to pfn.
"mm/sparsemem: fix wrong address in ms->section_mem_map with sub-sections
We want to store the address of the memmap, not the address of the first pfn.
E.g., we can have both (boot) system memory and devmem residing in a single section. Once we hot-add the devmem part, the address stored in ms->section_mem_map would be wrong, and kdump would not be able to dump the right memory.
"
? See below
Quoted 26 lines
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 <[email protected]>CC Dan Williams <[email protected]>CC David Hildenbrand <[email protected]>CC Baoquan He <[email protected]>---
v2:
* adjust comment to mention the mismatch data would affect kdump--- mm/sparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)mm/sparse.c +0
-0
mm/sparse.c int __meminit sparse_add_section(int nid, unsigned long start_pfn, · line 890
Quoted 5 lines
mm/sparse.c +1
-1@@ -887,7 +887,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));
I think this whole code should be reworked.
Callee returns a pointer. Caller: Nah, I know it better.
Just nasty.
Can we do something like this instead:
mm/sparse-vmemmap.c +0 -0
@@ -266,5 +266,5 @@ struct page * __meminit
__populate_section_memmap(unsigned long pfn,
if (vmemmap_populate(start, end, nid, altmap))
return NULL;
- return pfn_to_page(pfn);
+ return pfn_to_page(SECTION_ALIGN_DOWN(pfn));
}
mm/sparse.c +0 -0
@@ -788,6 +788,10 @@ static void section_deactivate(unsigned long pfn,
unsigned long nr_pages,
depopulate_section_memmap(pfn, nr_pages, altmap);
}
+/*
+ * Returns the memmap of the first pfn of the section (not of
+ * sub-sections).
+ */
static struct page * __meminit section_activate(int nid, unsigned long pfn,
unsigned long nr_pages, struct vmem_altmap *altmap)
{
@@ -882,9 +886,6 @@ int __meminit sparse_add_section(int nid, unsigned long start_pfn,
set_section_nid(section_nr, nid);
section_mark_present(ms);- /* 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));
sparse_init_one_section(ms, section_nr, memmap, ms->usage, 0);
return 0;Untested, of course :)
Signature · 3 lines
Thanks, David / dhildenb
Quoted 100 lines · David Hildenbrand
Quoted 2 lines · Wei Yang
memmap should be the address to page struct instead of address to pfn.
"mm/sparsemem: fix wrong address in
ms->section_mem_mapwith sub-sectionsWe want to store the address of the memmap, not the address of the first pfn.
E.g., we can have both (boot) system memory and devmem residing in a single section. Once we hot-add the devmem part, the address stored in
ms->section_mem_mapwould be wrong, and kdump would not be able to dump the right memory.
"? See below
Quoted 26 lines
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 <[email protected]>CC Dan Williams <[email protected]>CC David Hildenbrand <[email protected]>CC Baoquan He <[email protected]>---
v2:
* adjust comment to mention the mismatch data would affect kdump--- mm/sparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)mm/sparse.c +0
-0mm/sparse.c int __meminit sparse_add_section(int nid, unsigned long start_pfn, · line 890
Quoted 5 lines
mm/sparse.c +1
-1@@ -887,7 +887,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));I think this whole code should be reworked.
Callee returns a pointer. Caller: Nah, I know it better.
Just nasty.
Can we do something like this instead:
mm/sparse-vmemmap.c +1
-1@@ -266,5 +266,5 @@ struct page * __meminit __populate_section_memmap(unsigned long pfn,if (vmemmap_populate (start, end, nid, altmap))return NULL ; -return pfn_to_page (pfn); +return pfn_to_page (SECTION_ALIGN_DOWN (pfn));}
mm/sparse.c +4
-0@@ -788,6 +788,10 @@ static void section_deactivate(unsigned long pfn,unsigned long nr_pages,depopulate_section_memmap (pfn ,nr_pages ,altmap ); } +/* +* Returns the memmap of the first pfn of the section (not of +* sub-sections). +*/ static struct page *__meminit section_activate (int nid,unsigned long pfn,unsigned long nr_pages,struct vmem_altmap *altmap){
mm/sparse.c +0
-3@@ -882,9 +886,6 @@ int __meminit sparse_add_section(int nid, unsignedlong start_pfn,set_section_nid (section_nr ,nid );section_mark_present (ms); -/* 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));sparse_init_one_section (ms, section_nr, memmap, ms->usage,0 );return 0;
Quoted 2 lines
Untested, of course :)
I think the following would be needed as well with Wei's fix:
@@ -876,15 +880,13 @@ int __meminit sparse_add_section(int nid, unsigned long start_pfn,
* Poison uninitialized struct pages in order to catch invalid flags
* combinations.
*/
- page_init_poison(pfn_to_page(start_pfn), sizeof(struct page) * nr_pages);
+ page_init_poison(memmap + start_pfn - SECTION_ALIGN_DOWN(start_pfn),
+ sizeof(struct page) * nr_pages);
ms = __nr_to_section(section_nr);
Or we can simply move the poisoning behind sparse_init_one_section().
Signature · 3 lines
Thanks, David / dhildenb
Quoted 100 lines · David Hildenbrand
Quoted 2 lines · Wei Yang
memmap should be the address to page struct instead of address to pfn.
"mm/sparsemem: fix wrong address in
ms->section_mem_mapwith sub-sectionsWe want to store the address of the memmap, not the address of the first pfn.
E.g., we can have both (boot) system memory and devmem residing in a single section. Once we hot-add the devmem part, the address stored in
ms->section_mem_mapwould be wrong, and kdump would not be able to dump the right memory.
"? See below
Quoted 26 lines
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 <[email protected]>CC Dan Williams <[email protected]>CC David Hildenbrand <[email protected]>CC Baoquan He <[email protected]>---
v2:
* adjust comment to mention the mismatch data would affect kdump--- mm/sparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)mm/sparse.c +0
-0mm/sparse.c int __meminit sparse_add_section(int nid, unsigned long start_pfn, · line 890
Quoted 5 lines
mm/sparse.c +1
-1@@ -887,7 +887,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));I think this whole code should be reworked.
Callee returns a pointer. Caller: Nah, I know it better.
Just nasty.
Can we do something like this instead:
mm/sparse-vmemmap.c +1
-1@@ -266,5 +266,5 @@ struct page * __meminit __populate_section_memmap(unsigned long pfn,if (vmemmap_populate (start, end, nid, altmap))return NULL ; -return pfn_to_page (pfn); +return pfn_to_page (SECTION_ALIGN_DOWN (pfn));}
mm/sparse.c +4
-0@@ -788,6 +788,10 @@ static void section_deactivate(unsigned long pfn,unsigned long nr_pages,depopulate_section_memmap (pfn ,nr_pages ,altmap ); } +/* +* Returns the memmap of the first pfn of the section (not of +* sub-sections). +*/ static struct page *__meminit section_activate (int nid,unsigned long pfn,unsigned long nr_pages,struct vmem_altmap *altmap){
mm/sparse.c +0
-3@@ -882,9 +886,6 @@ int __meminit sparse_add_section(int nid, unsignedlong start_pfn,set_section_nid (section_nr ,nid );section_mark_present (ms); -/* 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));sparse_init_one_section (ms, section_nr, memmap, ms->usage,0 );return 0;
Quoted 1 line
Untested, of course :)
I think you get some point. As you mentioned in the following reply, we need to adjust poisoning after this change.
This looks like a trade off between two options. I don't have a strong preference.
Quoted 5 lines
Signature · 4 lines
-- Thanks, David / dhildenb
Signature · 2 lines
Wei Yang Help you, Help me
Quoted 98 lines · Wei Yang
Quoted 97 lines · David Hildenbrand
Quoted 2 lines · Wei Yang
memmap should be the address to page struct instead of address to pfn.
"mm/sparsemem: fix wrong address in
ms->section_mem_mapwith sub-sectionsWe want to store the address of the memmap, not the address of the first pfn.
E.g., we can have both (boot) system memory and devmem residing in a single section. Once we hot-add the devmem part, the address stored in
ms->section_mem_mapwould be wrong, and kdump would not be able to dump the right memory.
"? See below
Quoted 26 lines
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 <[email protected]>CC Dan Williams <[email protected]>CC David Hildenbrand <[email protected]>CC Baoquan He <[email protected]>---
v2:
* adjust comment to mention the mismatch data would affect kdump--- mm/sparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)mm/sparse.c +0
-0mm/sparse.c int __meminit sparse_add_section(int nid, unsigned long start_pfn, · line 890
Quoted 5 lines
mm/sparse.c +1
-1@@ -887,7 +887,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));I think this whole code should be reworked.
Callee returns a pointer. Caller: Nah, I know it better.
Just nasty.
Can we do something like this instead:
mm/sparse-vmemmap.c +1
-1@@ -266,5 +266,5 @@ struct page * __meminit __populate_section_memmap(unsigned long pfn,if (vmemmap_populate (start, end, nid, altmap))return NULL ; -return pfn_to_page (pfn); +return pfn_to_page (SECTION_ALIGN_DOWN (pfn));}
mm/sparse.c +4
-0@@ -788,6 +788,10 @@ static void section_deactivate(unsigned long pfn,unsigned long nr_pages,depopulate_section_memmap (pfn ,nr_pages ,altmap ); } +/* +* Returns the memmap of the first pfn of the section (not of +* sub-sections). +*/ static struct page *__meminit section_activate (int nid,unsigned long pfn,unsigned long nr_pages,struct vmem_altmap *altmap){
mm/sparse.c +0
-3@@ -882,9 +886,6 @@ int __meminit sparse_add_section(int nid, unsignedlong start_pfn,set_section_nid (section_nr ,nid );section_mark_present (ms); -/* 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));sparse_init_one_section (ms, section_nr, memmap, ms->usage,0 );
Quoted 7 lines
Quoted 4 lines
return 0;Untested, of course :)
I think you get some point. As you mentioned in the following reply, we need to adjust poisoning after this change.
We can just poison after setting up the section (IOW, move it further down).
Quoted 3 lines
This looks like a trade off between two options. I don't have a strong preference.
I clearly prefer if *section*_activate() returns the memmap of the section. This code is just confusing. But I can send a cleanup on top if you want to keep it like that for now.
Signature · 3 lines
Thanks, David / dhildenb
Quoted 110 lines · David Hildenbrand
Quoted 98 lines · Wei Yang
Quoted 97 lines · David Hildenbrand
Quoted 2 lines · Wei Yang
memmap should be the address to page struct instead of address to pfn.
"mm/sparsemem: fix wrong address in
ms->section_mem_mapwith sub-sectionsWe want to store the address of the memmap, not the address of the first pfn.
E.g., we can have both (boot) system memory and devmem residing in a single section. Once we hot-add the devmem part, the address stored in
ms->section_mem_mapwould be wrong, and kdump would not be able to dump the right memory.
"? See below
Quoted 26 lines
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 <[email protected]>CC Dan Williams <[email protected]>CC David Hildenbrand <[email protected]>CC Baoquan He <[email protected]>---
v2:
* adjust comment to mention the mismatch data would affect kdump--- mm/sparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)mm/sparse.c +0
-0mm/sparse.c int __meminit sparse_add_section(int nid, unsigned long start_pfn, · line 890
Quoted 5 lines
mm/sparse.c +1
-1@@ -887,7 +887,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));I think this whole code should be reworked.
Callee returns a pointer. Caller: Nah, I know it better.
Just nasty.
Can we do something like this instead:
mm/sparse-vmemmap.c +1
-1@@ -266,5 +266,5 @@ struct page * __meminit __populate_section_memmap(unsigned long pfn,if (vmemmap_populate (start, end, nid, altmap))return NULL ; -return pfn_to_page (pfn); +return pfn_to_page (SECTION_ALIGN_DOWN (pfn));}
mm/sparse.c +4
-0@@ -788,6 +788,10 @@ static void section_deactivate(unsigned long pfn,unsigned long nr_pages,depopulate_section_memmap (pfn ,nr_pages ,altmap ); } +/* +* Returns the memmap of the first pfn of the section (not of +* sub-sections). +*/ static struct page *__meminit section_activate (int nid,unsigned long pfn,unsigned long nr_pages,struct vmem_altmap *altmap){
mm/sparse.c +0
-3@@ -882,9 +886,6 @@ int __meminit sparse_add_section(int nid, unsignedlong start_pfn,set_section_nid (section_nr ,nid );section_mark_present (ms); -/* 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));sparse_init_one_section (ms, section_nr, memmap, ms->usage,0 );Quoted 7 lines
Quoted 4 lines
return 0;Untested, of course :)
I think you get some point. As you mentioned in the following reply, we need to adjust poisoning after this change.
We can just poison after setting up the section (IOW, move it further down).
Quoted 1 line
Quoted 7 lines
Quoted 2 lines
This looks like a trade off between two options. I don't have a strong preference.
I clearly prefer if *section*_activate() returns the memmap of the section. This code is just confusing. But I can send a cleanup on top if you want to keep it like that for now.
Sure, a cleanup patch may help audience get more understanding about the change.
Quoted 5 lines
Signature · 4 lines
-- Thanks, David / dhildenb
Signature · 2 lines
Wei Yang Help you, Help me
David Hildenbrand
Acked-byQuoted 114 lines · Wei Yang
Quoted 113 lines · David Hildenbrand
Quoted 98 lines · Wei Yang
Quoted 97 lines · David Hildenbrand
Quoted 2 lines · Wei Yang
memmap should be the address to page struct instead of address to pfn.
"mm/sparsemem: fix wrong address in
ms->section_mem_mapwith sub-sectionsWe want to store the address of the memmap, not the address of the first pfn.
E.g., we can have both (boot) system memory and devmem residing in a single section. Once we hot-add the devmem part, the address stored in
ms->section_mem_mapwould be wrong, and kdump would not be able to dump the right memory.
"? See below
Quoted 26 lines
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 <[email protected]>CC Dan Williams <[email protected]>CC David Hildenbrand <[email protected]>CC Baoquan He <[email protected]>---
v2:
* adjust comment to mention the mismatch data would affect kdump--- mm/sparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)mm/sparse.c +0
-0mm/sparse.c int __meminit sparse_add_section(int nid, unsigned long start_pfn, · line 890
Quoted 5 lines
mm/sparse.c +1
-1@@ -887,7 +887,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));I think this whole code should be reworked.
Callee returns a pointer. Caller: Nah, I know it better.
Just nasty.
Can we do something like this instead:
mm/sparse-vmemmap.c +1
-1@@ -266,5 +266,5 @@ struct page * __meminit __populate_section_memmap(unsigned long pfn,if (vmemmap_populate (start, end, nid, altmap))return NULL ; -return pfn_to_page (pfn); +return pfn_to_page (SECTION_ALIGN_DOWN (pfn));}
mm/sparse.c +4
-0@@ -788,6 +788,10 @@ static void section_deactivate(unsigned long pfn,unsigned long nr_pages,depopulate_section_memmap (pfn ,nr_pages ,altmap ); } +/* +* Returns the memmap of the first pfn of the section (not of +* sub-sections). +*/ static struct page *__meminit section_activate (int nid,unsigned long pfn,unsigned long nr_pages,struct vmem_altmap *altmap){
mm/sparse.c +0
-3@@ -882,9 +886,6 @@ int __meminit sparse_add_section(int nid, unsignedlong start_pfn,set_section_nid (section_nr ,nid );section_mark_present (ms); -/* 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));sparse_init_one_section (ms, section_nr, memmap, ms->usage,0 );Quoted 7 lines
Quoted 4 lines
return 0;Untested, of course :)
I think you get some point. As you mentioned in the following reply, we need to adjust poisoning after this change.
We can just poison after setting up the section (IOW, move it further down).
Quoted 3 lines
This looks like a trade off between two options. I don't have a strong preference.
Quoted 8 lines
Quoted 4 lines
I clearly prefer if *section*_activate() returns the memmap of the section. This code is just confusing. But I can send a cleanup on top if you want to keep it like that for now.
Sure, a cleanup patch may help audience get more understanding about the change.
For this simple fix for now.
Will send a cleanup in case I don't forget :)
Signature · 3 lines
Thanks, David / dhildenb