From: John Hubbard <jhubbard@nvidia.com>
To: Joao Martins <joao.m.martins@oracle.com>, <linux-mm@kvack.org>
Cc: linux-nvdimm@lists.01.org, Matthew Wilcox <willy@infradead.org>,
"Jason Gunthorpe <jgg@ziepe.ca>, Jane Chu <jane.chu@oracle.com>,
Muchun Song" <songmuchun@bytedance.com>,
Mike Kravetz <mike.kravetz@oracle.com>,
Andrew@ml01.01.org
Subject: Re: [PATCH RFC 2/9] sparse-vmemmap: Consolidate arguments in vmemmap section populate
Date: Tue, 8 Dec 2020 22:16:48 -0800 [thread overview]
Message-ID: <0faea767-7af0-6188-5a4e-3d5dd3c4bde9@nvidia.com> (raw)
In-Reply-To: <20201208172901.17384-3-joao.m.martins@oracle.com>
On 12/8/20 9:28 AM, Joao Martins wrote:
> Replace vmem_altmap with an vmem_context argument. That let us
> express how the vmemmap is gonna be initialized e.g. passing
> flags and a page size for reusing pages upon initializing the
> vmemmap.
How about this instead:
Replace the vmem_altmap argument with a vmem_context argument that
contains vmem_altmap for now. Subsequent patches will add additional
member elements to vmem_context, such as flags and page size.
No behavior changes are intended.
?
>
> Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
> ---
> include/linux/memory_hotplug.h | 6 +++++-
> include/linux/mm.h | 2 +-
> mm/memory_hotplug.c | 3 ++-
> mm/sparse-vmemmap.c | 6 +++++-
> mm/sparse.c | 16 ++++++++--------
> 5 files changed, 21 insertions(+), 12 deletions(-)
>
> diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
> index 551093b74596..73f8bcbb58a4 100644
> --- a/include/linux/memory_hotplug.h
> +++ b/include/linux/memory_hotplug.h
> @@ -81,6 +81,10 @@ struct mhp_params {
> pgprot_t pgprot;
> };
>
> +struct vmem_context {
> + struct vmem_altmap *altmap;
> +};
> +
> /*
> * Zone resizing functions
> *
> @@ -353,7 +357,7 @@ extern void remove_pfn_range_from_zone(struct zone *zone,
> unsigned long nr_pages);
> extern bool is_memblock_offlined(struct memory_block *mem);
> extern int sparse_add_section(int nid, unsigned long pfn,
> - unsigned long nr_pages, struct vmem_altmap *altmap);
> + unsigned long nr_pages, struct vmem_context *ctx);
> extern void sparse_remove_section(struct mem_section *ms,
> unsigned long pfn, unsigned long nr_pages,
> unsigned long map_offset, struct vmem_altmap *altmap);
> diff --git a/include/linux/mm.h b/include/linux/mm.h
> index db6ae4d3fb4e..2eb44318bb2d 100644
> --- a/include/linux/mm.h
> +++ b/include/linux/mm.h
> @@ -3000,7 +3000,7 @@ static inline void print_vma_addr(char *prefix, unsigned long rip)
>
> void *sparse_buffer_alloc(unsigned long size);
> struct page * __populate_section_memmap(unsigned long pfn,
> - unsigned long nr_pages, int nid, struct vmem_altmap *altmap);
> + unsigned long nr_pages, int nid, struct vmem_context *ctx);
> pgd_t *vmemmap_pgd_populate(unsigned long addr, int node);
> p4d_t *vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node);
> pud_t *vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node);
> diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
> index 63b2e46b6555..f8870c53fe5e 100644
> --- a/mm/memory_hotplug.c
> +++ b/mm/memory_hotplug.c
> @@ -313,6 +313,7 @@ int __ref __add_pages(int nid, unsigned long pfn, unsigned long nr_pages,
> unsigned long cur_nr_pages;
> int err;
> struct vmem_altmap *altmap = params->altmap;
> + struct vmem_context ctx = { .altmap = params->altmap };
OK, so this is the one place I can see where ctx is set up. And it's never null.
Let's remember that point...
>
> if (WARN_ON_ONCE(!params->pgprot.pgprot))
> return -EINVAL;
> @@ -341,7 +342,7 @@ int __ref __add_pages(int nid, unsigned long pfn, unsigned long nr_pages,
> /* Select all remaining pages up to the next section boundary */
> cur_nr_pages = min(end_pfn - pfn,
> SECTION_ALIGN_UP(pfn + 1) - pfn);
> - err = sparse_add_section(nid, pfn, cur_nr_pages, altmap);
> + err = sparse_add_section(nid, pfn, cur_nr_pages, &ctx);
> if (err)
> break;
> cond_resched();
> diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
> index 16183d85a7d5..bcda68ba1381 100644
> --- a/mm/sparse-vmemmap.c
> +++ b/mm/sparse-vmemmap.c
> @@ -249,15 +249,19 @@ int __meminit vmemmap_populate_basepages(unsigned long start, unsigned long end,
> }
>
> struct page * __meminit __populate_section_memmap(unsigned long pfn,
> - unsigned long nr_pages, int nid, struct vmem_altmap *altmap)
> + unsigned long nr_pages, int nid, struct vmem_context *ctx)
> {
> unsigned long start = (unsigned long) pfn_to_page(pfn);
> unsigned long end = start + nr_pages * sizeof(struct page);
> + struct vmem_altmap *altmap = NULL;
>
> if (WARN_ON_ONCE(!IS_ALIGNED(pfn, PAGES_PER_SUBSECTION) ||
> !IS_ALIGNED(nr_pages, PAGES_PER_SUBSECTION)))
> return NULL;
>
> + if (ctx)
But...ctx can never be null, right?
I didn't spot any other issues, though.
thanks,
--
John Hubbard
NVIDIA
> + altmap = ctx->altmap;
> +
> if (vmemmap_populate(start, end, nid, altmap))
> return NULL;
>
> diff --git a/mm/sparse.c b/mm/sparse.c
> index 7bd23f9d6cef..47ca494398a7 100644
> --- a/mm/sparse.c
> +++ b/mm/sparse.c
> @@ -443,7 +443,7 @@ static unsigned long __init section_map_size(void)
> }
>
> struct page __init *__populate_section_memmap(unsigned long pfn,
> - unsigned long nr_pages, int nid, struct vmem_altmap *altmap)
> + unsigned long nr_pages, int nid, struct vmem_context *ctx)
> {
> unsigned long size = section_map_size();
> struct page *map = sparse_buffer_alloc(size);
> @@ -648,9 +648,9 @@ void offline_mem_sections(unsigned long start_pfn, unsigned long end_pfn)
>
> #ifdef CONFIG_SPARSEMEM_VMEMMAP
> static struct page * __meminit populate_section_memmap(unsigned long pfn,
> - unsigned long nr_pages, int nid, struct vmem_altmap *altmap)
> + unsigned long nr_pages, int nid, struct vmem_context *ctx)
> {
> - return __populate_section_memmap(pfn, nr_pages, nid, altmap);
> + return __populate_section_memmap(pfn, nr_pages, nid, ctx);
> }
>
> static void depopulate_section_memmap(unsigned long pfn, unsigned long nr_pages,
> @@ -842,7 +842,7 @@ static void section_deactivate(unsigned long pfn, unsigned long nr_pages,
> }
>
> static struct page * __meminit section_activate(int nid, unsigned long pfn,
> - unsigned long nr_pages, struct vmem_altmap *altmap)
> + unsigned long nr_pages, struct vmem_context *ctx)
> {
> struct mem_section *ms = __pfn_to_section(pfn);
> struct mem_section_usage *usage = NULL;
> @@ -874,9 +874,9 @@ static struct page * __meminit section_activate(int nid, unsigned long pfn,
> if (nr_pages < PAGES_PER_SECTION && early_section(ms))
> return pfn_to_page(pfn);
>
> - memmap = populate_section_memmap(pfn, nr_pages, nid, altmap);
> + memmap = populate_section_memmap(pfn, nr_pages, nid, ctx);
> if (!memmap) {
> - section_deactivate(pfn, nr_pages, altmap);
> + section_deactivate(pfn, nr_pages, ctx->altmap);
> return ERR_PTR(-ENOMEM);
> }
>
> @@ -902,7 +902,7 @@ static struct page * __meminit section_activate(int nid, unsigned long pfn,
> * * -ENOMEM - Out of memory.
> */
> int __meminit sparse_add_section(int nid, unsigned long start_pfn,
> - unsigned long nr_pages, struct vmem_altmap *altmap)
> + unsigned long nr_pages, struct vmem_context *ctx)
> {
> unsigned long section_nr = pfn_to_section_nr(start_pfn);
> struct mem_section *ms;
> @@ -913,7 +913,7 @@ int __meminit sparse_add_section(int nid, unsigned long start_pfn,
> if (ret < 0)
> return ret;
>
> - memmap = section_activate(nid, start_pfn, nr_pages, altmap);
> + memmap = section_activate(nid, start_pfn, nr_pages, ctx);
> if (IS_ERR(memmap))
> return PTR_ERR(memmap);
>
>
_______________________________________________
Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
To unsubscribe send an email to linux-nvdimm-leave@lists.01.org
next prev parent reply other threads:[~2020-12-09 6:17 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-08 17:28 [PATCH RFC 0/9] mm, sparse-vmemmap: Introduce compound pagemaps Joao Martins
2020-12-08 17:28 ` [PATCH RFC 1/9] memremap: add ZONE_DEVICE support for compound pages Joao Martins
2020-12-09 5:59 ` John Hubbard
2020-12-09 6:33 ` Matthew Wilcox
2020-12-09 13:12 ` Joao Martins
2021-02-20 1:43 ` Dan Williams
2021-02-22 11:24 ` Joao Martins
2021-02-22 20:37 ` Dan Williams
2021-02-23 15:46 ` Joao Martins
2021-02-23 16:50 ` Dan Williams
2021-02-23 17:18 ` Joao Martins
2021-02-23 18:18 ` Dan Williams
2021-03-10 18:12 ` Joao Martins
2021-03-12 5:54 ` Dan Williams
2021-02-20 1:24 ` Dan Williams
2021-02-22 11:09 ` Joao Martins
2020-12-08 17:28 ` [PATCH RFC 2/9] sparse-vmemmap: Consolidate arguments in vmemmap section populate Joao Martins
2020-12-09 6:16 ` John Hubbard [this message]
2020-12-09 13:51 ` Joao Martins
2021-02-20 1:49 ` Dan Williams
2021-02-22 11:26 ` Joao Martins
2020-12-08 17:28 ` [PATCH RFC 3/9] sparse-vmemmap: Reuse vmemmap areas for a given mhp_params::align Joao Martins
2020-12-08 17:38 ` Joao Martins
2020-12-08 17:28 ` [PATCH RFC 3/9] sparse-vmemmap: Reuse vmemmap areas for a given page size Joao Martins
2021-02-20 3:34 ` Dan Williams
2021-02-22 11:42 ` Joao Martins
2021-02-22 22:40 ` Dan Williams
2021-02-23 15:46 ` Joao Martins
2020-12-08 17:28 ` [PATCH RFC 4/9] mm/page_alloc: Reuse tail struct pages for compound pagemaps Joao Martins
2021-02-20 6:17 ` Dan Williams
2021-02-22 12:01 ` Joao Martins
2020-12-08 17:28 ` [PATCH RFC 5/9] device-dax: Compound pagemap support Joao Martins
2020-12-08 17:28 ` [PATCH RFC 6/9] mm/gup: Grab head page refcount once for group of subpages Joao Martins
2020-12-09 4:40 ` John Hubbard
2020-12-09 13:44 ` Joao Martins
[not found] ` <20201208194905.GQ5487@ziepe.ca>
2020-12-09 11:05 ` Joao Martins
[not found] ` <20201209151505.GV5487@ziepe.ca>
2020-12-09 16:02 ` Joao Martins
[not found] ` <20201209162438.GW5487@ziepe.ca>
2020-12-09 17:27 ` Joao Martins
2020-12-09 18:14 ` Matthew Wilcox
2020-12-10 15:43 ` Joao Martins
2020-12-08 17:28 ` [PATCH RFC 7/9] mm/gup: Decrement head page " Joao Martins
[not found] ` <20201208193446.GP5487@ziepe.ca>
2020-12-09 5:06 ` John Hubbard
2020-12-09 12:17 ` Joao Martins
2020-12-17 19:05 ` Joao Martins
[not found] ` <20201217200530.GK5487@ziepe.ca>
2020-12-17 22:34 ` Joao Martins
2020-12-19 2:06 ` John Hubbard
2020-12-19 13:10 ` Joao Martins
2020-12-08 17:29 ` [PATCH RFC 8/9] RDMA/umem: batch page unpin in __ib_mem_release() Joao Martins
2020-12-09 5:18 ` John Hubbard
[not found] ` <20201208192935.GA1908088@ziepe.ca>
2020-12-09 10:59 ` Joao Martins
2020-12-19 13:15 ` Joao Martins
2020-12-08 17:29 ` [PATCH RFC 9/9] mm: Add follow_devmap_page() for devdax vmas Joao Martins
2020-12-09 5:23 ` John Hubbard
[not found] ` <20201208195754.GR5487@ziepe.ca>
2020-12-09 8:05 ` Christoph Hellwig
2020-12-09 11:19 ` Joao Martins
2020-12-09 9:38 ` [PATCH RFC 0/9] mm, sparse-vmemmap: Introduce compound pagemaps David Hildenbrand
2020-12-09 9:52 ` [External] " Muchun Song
2021-02-20 1:18 ` Dan Williams
2021-02-22 11:06 ` Joao Martins
2021-02-22 14:32 ` Joao Martins
2021-02-23 16:28 ` Joao Martins
2021-02-23 16:44 ` Dan Williams
2021-02-23 17:15 ` Joao Martins
2021-02-23 18:15 ` Dan Williams
[not found] ` <20210223185435.GO2643399@ziepe.ca>
2021-02-23 22:48 ` Dan Williams
[not found] ` <20210223230723.GP2643399@ziepe.ca>
2021-02-24 0:14 ` Dan Williams
[not found] ` <20210224010017.GQ2643399@ziepe.ca>
2021-02-24 1:32 ` Dan Williams
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=0faea767-7af0-6188-5a4e-3d5dd3c4bde9@nvidia.com \
--to=jhubbard@nvidia.com \
--cc=Andrew@ml01.01.org \
--cc=joao.m.martins@oracle.com \
--cc=linux-mm@kvack.org \
--cc=linux-nvdimm@lists.01.org \
--cc=mike.kravetz@oracle.com \
--cc=songmuchun@bytedance.com \
--cc=willy@infradead.org \
/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).