From: Christoph Hellwig <hch@lst.de> To: Dan Williams <dan.j.williams@intel.com> Cc: linux-mm@kvack.org, "Jérôme Glisse" <jglisse@redhat.com>, linux-nvdimm@lists.01.org Subject: [PATCH 06/14] mm: better abstract out dev_pagemap start_pfn Date: Thu, 7 Dec 2017 07:08:32 -0800 [thread overview] Message-ID: <20171207150840.28409-7-hch@lst.de> (raw) In-Reply-To: <20171207150840.28409-1-hch@lst.de> Signed-off-by: Christoph Hellwig <hch@lst.de> --- include/linux/memremap.h | 6 ++++++ kernel/memremap.c | 9 +++++++++ mm/page_alloc.c | 4 +--- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/include/linux/memremap.h b/include/linux/memremap.h index d221f4c0ccac..fe60b4895f56 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -139,6 +139,7 @@ static inline bool is_zone_device_page(const struct page *page); int dev_pagemap_add_pages(unsigned long phys_start_pfn, unsigned nr_pages); bool dev_pagemap_free_pages(struct page *page, unsigned nr_pages); unsigned long dev_pagemap_offset(struct page *page); +unsigned long dev_pagemap_start_pfn(unsigned long start_pfn); #else static inline void *devm_memremap_pages(struct device *dev, struct resource *res, struct percpu_ref *ref, @@ -174,6 +175,11 @@ static inline unsigned long dev_pagemap_offset(struct page *page) { return 0; } + +static inline unsigned long dev_pagemap_start_pfn(unsigned long start_pfn) +{ + return 0; +} #endif /* CONFIG_ZONE_DEVICE */ #if defined(CONFIG_DEVICE_PRIVATE) || defined(CONFIG_DEVICE_PUBLIC) diff --git a/kernel/memremap.c b/kernel/memremap.c index 91a5fc1146b5..01025c5f3037 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -493,6 +493,15 @@ int dev_pagemap_add_pages(unsigned long phys_start_pfn, unsigned nr_pages) return 0; } +unsigned long dev_pagemap_start_pfn(unsigned long start_pfn) +{ + struct vmem_altmap *pgmap = to_vmem_altmap(__pfn_to_phys(start_pfn)); + + if (pgmap && start_pfn == pgmap->base_pfn) + return pgmap->reserve; + return 0; +} + bool dev_pagemap_free_pages(struct page *page, unsigned nr_pages) { struct vmem_altmap *pgmap = to_vmem_altmap((uintptr_t)page); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 73f5d4556b3d..cf6a702222c3 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5305,7 +5305,6 @@ 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 = to_vmem_altmap(__pfn_to_phys(start_pfn)); unsigned long end_pfn = start_pfn + size; pg_data_t *pgdat = NODE_DATA(nid); unsigned long pfn; @@ -5321,8 +5320,7 @@ 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 (altmap && start_pfn == altmap->base_pfn) - start_pfn += altmap->reserve; + start_pfn += dev_pagemap_start_pfn(start_pfn); for (pfn = start_pfn; pfn < end_pfn; pfn++) { /* -- 2.14.2 _______________________________________________ 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: Christoph Hellwig <hch@lst.de> To: Dan Williams <dan.j.williams@intel.com> Cc: "Jérôme Glisse" <jglisse@redhat.com>, "Logan Gunthorpe" <logang@deltatee.com>, linux-nvdimm@lists.01.org, linux-mm@kvack.org Subject: [PATCH 06/14] mm: better abstract out dev_pagemap start_pfn Date: Thu, 7 Dec 2017 07:08:32 -0800 [thread overview] Message-ID: <20171207150840.28409-7-hch@lst.de> (raw) In-Reply-To: <20171207150840.28409-1-hch@lst.de> Signed-off-by: Christoph Hellwig <hch@lst.de> --- include/linux/memremap.h | 6 ++++++ kernel/memremap.c | 9 +++++++++ mm/page_alloc.c | 4 +--- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/include/linux/memremap.h b/include/linux/memremap.h index d221f4c0ccac..fe60b4895f56 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -139,6 +139,7 @@ static inline bool is_zone_device_page(const struct page *page); int dev_pagemap_add_pages(unsigned long phys_start_pfn, unsigned nr_pages); bool dev_pagemap_free_pages(struct page *page, unsigned nr_pages); unsigned long dev_pagemap_offset(struct page *page); +unsigned long dev_pagemap_start_pfn(unsigned long start_pfn); #else static inline void *devm_memremap_pages(struct device *dev, struct resource *res, struct percpu_ref *ref, @@ -174,6 +175,11 @@ static inline unsigned long dev_pagemap_offset(struct page *page) { return 0; } + +static inline unsigned long dev_pagemap_start_pfn(unsigned long start_pfn) +{ + return 0; +} #endif /* CONFIG_ZONE_DEVICE */ #if defined(CONFIG_DEVICE_PRIVATE) || defined(CONFIG_DEVICE_PUBLIC) diff --git a/kernel/memremap.c b/kernel/memremap.c index 91a5fc1146b5..01025c5f3037 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -493,6 +493,15 @@ int dev_pagemap_add_pages(unsigned long phys_start_pfn, unsigned nr_pages) return 0; } +unsigned long dev_pagemap_start_pfn(unsigned long start_pfn) +{ + struct vmem_altmap *pgmap = to_vmem_altmap(__pfn_to_phys(start_pfn)); + + if (pgmap && start_pfn == pgmap->base_pfn) + return pgmap->reserve; + return 0; +} + bool dev_pagemap_free_pages(struct page *page, unsigned nr_pages) { struct vmem_altmap *pgmap = to_vmem_altmap((uintptr_t)page); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 73f5d4556b3d..cf6a702222c3 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5305,7 +5305,6 @@ 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 = to_vmem_altmap(__pfn_to_phys(start_pfn)); unsigned long end_pfn = start_pfn + size; pg_data_t *pgdat = NODE_DATA(nid); unsigned long pfn; @@ -5321,8 +5320,7 @@ 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 (altmap && start_pfn == altmap->base_pfn) - start_pfn += altmap->reserve; + start_pfn += dev_pagemap_start_pfn(start_pfn); for (pfn = start_pfn; pfn < end_pfn; pfn++) { /* -- 2.14.2 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2017-12-07 15:04 UTC|newest] Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-12-07 15:08 revamp vmem_altmap / dev_pagemap handling Christoph Hellwig 2017-12-07 15:08 ` Christoph Hellwig 2017-12-07 15:08 ` [PATCH 01/14] mm: move get_dev_pagemap out of line Christoph Hellwig 2017-12-07 15:08 ` Christoph Hellwig 2017-12-07 18:34 ` Logan Gunthorpe 2017-12-07 18:34 ` Logan Gunthorpe 2017-12-07 15:08 ` [PATCH 02/14] mm: optimize dev_pagemap reference counting around get_dev_pagemap Christoph Hellwig 2017-12-07 15:08 ` Christoph Hellwig 2017-12-07 18:46 ` Logan Gunthorpe 2017-12-07 18:46 ` Logan Gunthorpe 2017-12-07 15:08 ` [PATCH 03/14] mm: better abstract out dev_pagemap freeing Christoph Hellwig 2017-12-07 15:08 ` Christoph Hellwig 2017-12-07 18:49 ` Logan Gunthorpe 2017-12-07 18:49 ` Logan Gunthorpe 2017-12-07 15:08 ` [PATCH 04/14] mm: better abstract out dev_pagemap alloc Christoph Hellwig 2017-12-07 15:08 ` Christoph Hellwig 2017-12-07 18:52 ` Logan Gunthorpe 2017-12-07 18:52 ` Logan Gunthorpe 2017-12-07 15:08 ` [PATCH 05/14] mm: better abstract out dev_pagemap offset calculation Christoph Hellwig 2017-12-07 15:08 ` Christoph Hellwig 2017-12-07 18:54 ` Logan Gunthorpe 2017-12-07 18:54 ` Logan Gunthorpe 2017-12-07 15:08 ` Christoph Hellwig [this message] 2017-12-07 15:08 ` [PATCH 06/14] mm: better abstract out dev_pagemap start_pfn Christoph Hellwig 2017-12-07 18:57 ` Logan Gunthorpe 2017-12-07 18:57 ` Logan Gunthorpe 2017-12-07 15:08 ` [PATCH 07/14] mm: split dev_pagemap memory map allocation from normal case Christoph Hellwig 2017-12-07 15:08 ` Christoph Hellwig 2017-12-07 19:08 ` Logan Gunthorpe 2017-12-07 19:08 ` Logan Gunthorpe 2017-12-07 15:08 ` [PATCH 08/14] mm: merge vmem_altmap_alloc into dev_pagemap_alloc_block_buf Christoph Hellwig 2017-12-07 15:08 ` Christoph Hellwig 2017-12-07 19:14 ` Logan Gunthorpe 2017-12-07 19:14 ` Logan Gunthorpe 2017-12-07 15:08 ` [PATCH 09/14] memremap: drop private struct page_map Christoph Hellwig 2017-12-07 15:08 ` Christoph Hellwig 2017-12-07 15:08 ` [PATCH 10/14] memremap: change devm_memremap_pages interface to use struct dev_pagemap Christoph Hellwig 2017-12-07 15:08 ` Christoph Hellwig 2017-12-08 4:03 ` Dan Williams 2017-12-07 15:08 ` [PATCH 11/14] memremap: simplify duplicate region handling in devm_memremap_pages Christoph Hellwig 2017-12-07 15:08 ` Christoph Hellwig 2017-12-07 19:34 ` Logan Gunthorpe 2017-12-07 19:34 ` Logan Gunthorpe 2017-12-07 15:08 ` [PATCH 12/14] memremap: remove find_dev_pagemap Christoph Hellwig 2017-12-07 15:08 ` Christoph Hellwig 2017-12-07 19:35 ` Logan Gunthorpe 2017-12-07 19:35 ` Logan Gunthorpe 2017-12-07 15:08 ` [PATCH 13/14] memremap: remove struct vmem_altmap Christoph Hellwig 2017-12-07 15:08 ` Christoph Hellwig 2017-12-07 19:40 ` Logan Gunthorpe 2017-12-07 19:40 ` Logan Gunthorpe 2017-12-07 15:08 ` [PATCH 14/14] memremap: RCU protect data returned from dev_pagemap lookups Christoph Hellwig 2017-12-07 15:08 ` Christoph Hellwig 2017-12-07 19:53 ` Logan Gunthorpe 2017-12-07 19:53 ` Logan Gunthorpe 2017-12-08 4:14 ` revamp vmem_altmap / dev_pagemap handling Williams, Dan J 2017-12-08 4:14 ` Williams, Dan J
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=20171207150840.28409-7-hch@lst.de \ --to=hch@lst.de \ --cc=dan.j.williams@intel.com \ --cc=jglisse@redhat.com \ --cc=linux-mm@kvack.org \ --cc=linux-nvdimm@lists.01.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: 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.