From: David Hildenbrand <david@redhat.com>
To: Wei Yang <richardw.yang@linux.intel.com>,
akpm@linux-foundation.org, osalvador@suse.de,
dan.j.williams@intel.com
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Baoquan He <bhe@redhat.com>
Subject: Re: [Patch v2] mm/sparsemem: get address to page struct instead of address to pfn
Date: Mon, 10 Feb 2020 10:00:47 +0100 [thread overview]
Message-ID: <90742479-cbb1-4ea9-c20c-53a1df34b806@redhat.com> (raw)
In-Reply-To: <20200210005048.10437-1-richardw.yang@linux.intel.com>
On 10.02.20 01:50, Wei Yang wrote:
> 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
> 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>
> CC: Dan Williams <dan.j.williams@intel.com>
> CC: David Hildenbrand <david@redhat.com>
> CC: Baoquan He <bhe@redhat.com>
>
> ---
> v2:
> * adjust comment to mention the mismatch data would affect kdump
>
> ---
> mm/sparse.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/mm/sparse.c b/mm/sparse.c
> index 586d85662978..4862ec2cfbc0 100644
> --- a/mm/sparse.c
> +++ b/mm/sparse.c
> @@ -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:
diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
index 200aef686722..c5091feef29e 100644
--- a/mm/sparse-vmemmap.c
+++ b/mm/sparse-vmemmap.c
@@ -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));
}
diff --git a/mm/sparse.c b/mm/sparse.c
index c184b69460b7..21902d7931e4 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -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 :)
--
Thanks,
David / dhildenb
next prev parent reply other threads:[~2020-02-10 9:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-10 0:50 [Patch v2] mm/sparsemem: get address to page struct instead of address to pfn Wei Yang
2020-02-10 9:00 ` David Hildenbrand [this message]
2020-02-10 9:13 ` David Hildenbrand
2020-02-10 23:16 ` Wei Yang
2020-02-11 14:01 ` David Hildenbrand
2020-02-12 2:28 ` Wei Yang
2020-02-12 11:22 ` David Hildenbrand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=90742479-cbb1-4ea9-c20c-53a1df34b806@redhat.com \
--to=david@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=bhe@redhat.com \
--cc=dan.j.williams@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=osalvador@suse.de \
--cc=richardw.yang@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).