From: Dan Williams <dan.j.williams@intel.com> To: akpm@linux-foundation.org Cc: Michal Hocko <mhocko@suse.com>, linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, hch@lst.de, Vlastimil Babka <vbabka@suse.cz> Subject: [PATCH 01/13] mm: Plumb dev_pagemap instead of vmem_altmap to memmap_init_zone() Date: Wed, 04 Jul 2018 23:49:07 -0700 [thread overview] Message-ID: <153077334720.40830.5284059575516542524.stgit@dwillia2-desk3.amr.corp.intel.com> (raw) In-Reply-To: <153077334130.40830.2714147692560185329.stgit@dwillia2-desk3.amr.corp.intel.com> In preparation for teaching memmap_init_zone() how to initialize ZONE_DEVICE pages, pass in dev_pagemap. Cc: Michal Hocko <mhocko@suse.com> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- include/linux/memory_hotplug.h | 3 ++- include/linux/mm.h | 2 +- kernel/memremap.c | 2 +- mm/memory_hotplug.c | 4 ++-- mm/page_alloc.c | 5 ++++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 4e9828cda7a2..e60085b2824d 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -14,6 +14,7 @@ struct mem_section; struct memory_block; struct resource; struct vmem_altmap; +struct dev_pagemap; #ifdef CONFIG_MEMORY_HOTPLUG /* @@ -326,7 +327,7 @@ extern int add_memory_resource(int nid, struct resource *resource, bool online); extern int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap, bool want_memblock); extern void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn, - unsigned long nr_pages, struct vmem_altmap *altmap); + unsigned long nr_pages, struct dev_pagemap *pgmap); extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages); extern bool is_memblock_offlined(struct memory_block *mem); extern void remove_memory(int nid, u64 start, u64 size); diff --git a/include/linux/mm.h b/include/linux/mm.h index a0fbb9ffe380..319d01372efa 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2140,7 +2140,7 @@ static inline void zero_resv_unavail(void) {} extern void set_dma_reserve(unsigned long new_dma_reserve); extern void memmap_init_zone(unsigned long, int, unsigned long, unsigned long, - enum memmap_context, struct vmem_altmap *); + enum memmap_context, struct dev_pagemap *); extern void setup_per_zone_wmarks(void); extern int __meminit init_per_zone_wmark_min(void); extern void mem_init(void); diff --git a/kernel/memremap.c b/kernel/memremap.c index ecee37b44aa1..58327259420d 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -244,7 +244,7 @@ void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap, zone = &NODE_DATA(nid)->node_zones[ZONE_DEVICE]; if (!error) move_pfn_range_to_zone(zone, align_start >> PAGE_SHIFT, - align_size >> PAGE_SHIFT, altmap); + align_size >> PAGE_SHIFT, pgmap); } mem_hotplug_done(); diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 7deb49f69e27..aae4e6cc65e9 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -779,7 +779,7 @@ static void __meminit resize_pgdat_range(struct pglist_data *pgdat, unsigned lon } void __ref move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn, - unsigned long nr_pages, struct vmem_altmap *altmap) + unsigned long nr_pages, struct dev_pagemap *pgmap) { struct pglist_data *pgdat = zone->zone_pgdat; int nid = pgdat->node_id; @@ -805,7 +805,7 @@ void __ref move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn, * are reserved so nobody should be touching them so we should be safe */ memmap_init_zone(nr_pages, nid, zone_idx(zone), start_pfn, - MEMMAP_HOTPLUG, altmap); + MEMMAP_HOTPLUG, pgmap); set_zone_contiguous(zone); } diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 1521100f1e63..545a5860cce7 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5459,10 +5459,11 @@ void __ref build_all_zonelists(pg_data_t *pgdat) */ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, unsigned long start_pfn, enum memmap_context context, - struct vmem_altmap *altmap) + struct dev_pagemap *pgmap) { unsigned long end_pfn = start_pfn + size; pg_data_t *pgdat = NODE_DATA(nid); + struct vmem_altmap *altmap = NULL; unsigned long pfn; unsigned long nr_initialised = 0; struct page *page; @@ -5477,6 +5478,8 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, * Honor reservation requested by the driver for this ZONE_DEVICE * memory */ + if (pgmap && pgmap->altmap_valid) + altmap = &pgmap->altmap; if (altmap && start_pfn == altmap->base_pfn) start_pfn += altmap->reserve; _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm
WARNING: multiple messages have this Message-ID (diff)
From: Dan Williams <dan.j.williams@intel.com> To: akpm@linux-foundation.org Cc: Michal Hocko <mhocko@suse.com>, Vlastimil Babka <vbabka@suse.cz>, vishal.l.verma@intel.com, hch@lst.de, linux-nvdimm@lists.01.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 01/13] mm: Plumb dev_pagemap instead of vmem_altmap to memmap_init_zone() Date: Wed, 04 Jul 2018 23:49:07 -0700 [thread overview] Message-ID: <153077334720.40830.5284059575516542524.stgit@dwillia2-desk3.amr.corp.intel.com> (raw) In-Reply-To: <153077334130.40830.2714147692560185329.stgit@dwillia2-desk3.amr.corp.intel.com> In preparation for teaching memmap_init_zone() how to initialize ZONE_DEVICE pages, pass in dev_pagemap. Cc: Michal Hocko <mhocko@suse.com> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- include/linux/memory_hotplug.h | 3 ++- include/linux/mm.h | 2 +- kernel/memremap.c | 2 +- mm/memory_hotplug.c | 4 ++-- mm/page_alloc.c | 5 ++++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 4e9828cda7a2..e60085b2824d 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -14,6 +14,7 @@ struct mem_section; struct memory_block; struct resource; struct vmem_altmap; +struct dev_pagemap; #ifdef CONFIG_MEMORY_HOTPLUG /* @@ -326,7 +327,7 @@ extern int add_memory_resource(int nid, struct resource *resource, bool online); extern int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap, bool want_memblock); extern void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn, - unsigned long nr_pages, struct vmem_altmap *altmap); + unsigned long nr_pages, struct dev_pagemap *pgmap); extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages); extern bool is_memblock_offlined(struct memory_block *mem); extern void remove_memory(int nid, u64 start, u64 size); diff --git a/include/linux/mm.h b/include/linux/mm.h index a0fbb9ffe380..319d01372efa 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2140,7 +2140,7 @@ static inline void zero_resv_unavail(void) {} extern void set_dma_reserve(unsigned long new_dma_reserve); extern void memmap_init_zone(unsigned long, int, unsigned long, unsigned long, - enum memmap_context, struct vmem_altmap *); + enum memmap_context, struct dev_pagemap *); extern void setup_per_zone_wmarks(void); extern int __meminit init_per_zone_wmark_min(void); extern void mem_init(void); diff --git a/kernel/memremap.c b/kernel/memremap.c index ecee37b44aa1..58327259420d 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -244,7 +244,7 @@ void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap, zone = &NODE_DATA(nid)->node_zones[ZONE_DEVICE]; if (!error) move_pfn_range_to_zone(zone, align_start >> PAGE_SHIFT, - align_size >> PAGE_SHIFT, altmap); + align_size >> PAGE_SHIFT, pgmap); } mem_hotplug_done(); diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 7deb49f69e27..aae4e6cc65e9 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -779,7 +779,7 @@ static void __meminit resize_pgdat_range(struct pglist_data *pgdat, unsigned lon } void __ref move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn, - unsigned long nr_pages, struct vmem_altmap *altmap) + unsigned long nr_pages, struct dev_pagemap *pgmap) { struct pglist_data *pgdat = zone->zone_pgdat; int nid = pgdat->node_id; @@ -805,7 +805,7 @@ void __ref move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn, * are reserved so nobody should be touching them so we should be safe */ memmap_init_zone(nr_pages, nid, zone_idx(zone), start_pfn, - MEMMAP_HOTPLUG, altmap); + MEMMAP_HOTPLUG, pgmap); set_zone_contiguous(zone); } diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 1521100f1e63..545a5860cce7 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5459,10 +5459,11 @@ void __ref build_all_zonelists(pg_data_t *pgdat) */ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, unsigned long start_pfn, enum memmap_context context, - struct vmem_altmap *altmap) + struct dev_pagemap *pgmap) { unsigned long end_pfn = start_pfn + size; pg_data_t *pgdat = NODE_DATA(nid); + struct vmem_altmap *altmap = NULL; unsigned long pfn; unsigned long nr_initialised = 0; struct page *page; @@ -5477,6 +5478,8 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, * Honor reservation requested by the driver for this ZONE_DEVICE * memory */ + if (pgmap && pgmap->altmap_valid) + altmap = &pgmap->altmap; if (altmap && start_pfn == altmap->base_pfn) start_pfn += altmap->reserve;
next prev parent reply other threads:[~2018-07-05 6:59 UTC|newest] Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-07-05 6:49 [PATCH 00/13] mm: Asynchronous + multithreaded memmap init for ZONE_DEVICE Dan Williams 2018-07-05 6:49 ` Dan Williams 2018-07-05 6:49 ` Dan Williams [this message] 2018-07-05 6:49 ` [PATCH 01/13] mm: Plumb dev_pagemap instead of vmem_altmap to memmap_init_zone() Dan Williams 2018-07-05 6:49 ` [PATCH 02/13] mm: Enable asynchronous __add_pages() and vmemmap_populate_hugepages() Dan Williams 2018-07-05 6:49 ` Dan Williams 2018-07-05 6:49 ` [PATCH 03/13] mm: Teach memmap_init_zone() to initialize ZONE_DEVICE pages Dan Williams 2018-07-05 6:49 ` Dan Williams 2018-07-05 6:49 ` Dan Williams 2018-07-05 6:49 ` [PATCH 04/13] mm: Multithread ZONE_DEVICE initialization Dan Williams 2018-07-05 6:49 ` Dan Williams 2018-07-05 6:49 ` [PATCH 05/13] mm: Allow an external agent to wait for memmap initialization Dan Williams 2018-07-05 6:49 ` Dan Williams 2018-07-05 6:49 ` Dan Williams 2018-07-05 6:49 ` [PATCH 06/13] nvdimm/pmem: check the validity of the pointer pfn Dan Williams 2018-07-05 6:49 ` Dan Williams 2018-07-05 6:49 ` [PATCH 07/13] nvdimm/pmem-dax: " Dan Williams 2018-07-05 6:49 ` Dan Williams 2018-07-05 6:49 ` [PATCH 08/13] s390/block/dcssblk: " Dan Williams 2018-07-05 6:49 ` Dan Williams 2018-07-05 6:49 ` [PATCH 09/13] fs/dax: Assign NULL to pfn of dax_direct_access if useless Dan Williams 2018-07-05 6:49 ` Dan Williams 2018-07-05 6:49 ` [PATCH 10/13] filesystem-dax: Make mount time pfn validation a debug check Dan Williams 2018-07-05 6:49 ` Dan Williams 2018-07-05 6:50 ` [PATCH 11/13] libnvdimm, pmem: Initialize the memmap in the background Dan Williams 2018-07-05 6:50 ` Dan Williams 2018-07-05 6:50 ` [PATCH 12/13] device-dax: " Dan Williams 2018-07-05 6:50 ` Dan Williams 2018-07-05 6:50 ` [PATCH 13/13] libnvdimm, namespace: Publish page structure init state / control Dan Williams 2018-07-05 6:50 ` Dan Williams 2018-07-05 8:29 ` Johannes Thumshirn 2018-07-05 8:29 ` Johannes Thumshirn 2018-07-05 8:29 ` Johannes Thumshirn 2018-07-05 14:46 ` Dan Williams 2018-07-05 14:46 ` Dan Williams 2018-07-05 14:49 ` Johannes Thumshirn 2018-07-05 14:49 ` Johannes Thumshirn 2018-07-05 14:49 ` Johannes Thumshirn 2018-07-05 20:24 ` Andrew Morton 2018-07-05 20:24 ` Andrew Morton 2018-07-05 20:34 ` Dan Williams 2018-07-05 20:34 ` Dan Williams 2018-07-06 8:18 ` Johannes Thumshirn 2018-07-06 8:18 ` Johannes Thumshirn 2018-07-06 8:18 ` Johannes Thumshirn 2018-07-05 21:00 ` Matthew Wilcox 2018-07-05 21:00 ` Matthew Wilcox 2018-07-05 19:49 ` Matthew Wilcox 2018-07-05 19:49 ` Matthew Wilcox 2018-07-05 19:52 ` Dan Williams 2018-07-05 19:52 ` Dan Williams 2018-07-05 20:00 ` Jeff Moyer 2018-07-09 12:56 ` [PATCH 00/13] mm: Asynchronous + multithreaded memmap init for ZONE_DEVICE Jan Kara 2018-07-09 12:56 ` Jan Kara 2018-07-09 16:53 ` 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=153077334720.40830.5284059575516542524.stgit@dwillia2-desk3.amr.corp.intel.com \ --to=dan.j.williams@intel.com \ --cc=akpm@linux-foundation.org \ --cc=hch@lst.de \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-nvdimm@lists.01.org \ --cc=mhocko@suse.com \ --cc=vbabka@suse.cz \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.