From: Christoph Hellwig <hch@lst.de> To: Dan Williams <dan.j.williams@intel.com>, Jason Gunthorpe <jgg@mellanox.com> Cc: linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org, Bharata B Rao <bharata@linux.ibm.com>, linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org> Subject: [PATCH 3/4] memremap: don't use a separate devm action for devmap_managed_enable_get Date: Sun, 18 Aug 2019 11:05:56 +0200 [thread overview] Message-ID: <20190818090557.17853-4-hch@lst.de> (raw) In-Reply-To: <20190818090557.17853-1-hch@lst.de> Just clean up for early failures and then piggy back on devm_memremap_pages_release. This helps with a pending not device managed version of devm_memremap_pages. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Ira Weiny <ira.weiny@intel.com> --- kernel/memremap.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/kernel/memremap.c b/kernel/memremap.c index 600a14cbe663..09a087ca30ff 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -21,13 +21,13 @@ DEFINE_STATIC_KEY_FALSE(devmap_managed_key); EXPORT_SYMBOL(devmap_managed_key); static atomic_t devmap_managed_enable; -static void devmap_managed_enable_put(void *data) +static void devmap_managed_enable_put(void) { if (atomic_dec_and_test(&devmap_managed_enable)) static_branch_disable(&devmap_managed_key); } -static int devmap_managed_enable_get(struct device *dev, struct dev_pagemap *pgmap) +static int devmap_managed_enable_get(struct dev_pagemap *pgmap) { if (!pgmap->ops || !pgmap->ops->page_free) { WARN(1, "Missing page_free method\n"); @@ -36,13 +36,16 @@ static int devmap_managed_enable_get(struct device *dev, struct dev_pagemap *pgm if (atomic_inc_return(&devmap_managed_enable) == 1) static_branch_enable(&devmap_managed_key); - return devm_add_action_or_reset(dev, devmap_managed_enable_put, NULL); + return 0; } #else -static int devmap_managed_enable_get(struct device *dev, struct dev_pagemap *pgmap) +static int devmap_managed_enable_get(struct dev_pagemap *pgmap) { return -EINVAL; } +static void devmap_managed_enable_put(void) +{ +} #endif /* CONFIG_DEV_PAGEMAP_OPS */ static void pgmap_array_delete(struct resource *res) @@ -123,6 +126,7 @@ static void devm_memremap_pages_release(void *data) untrack_pfn(NULL, PHYS_PFN(res->start), resource_size(res)); pgmap_array_delete(res); WARN_ONCE(pgmap->altmap.alloc, "failed to free all reserved pages\n"); + devmap_managed_enable_put(); } static void dev_pagemap_percpu_release(struct percpu_ref *ref) @@ -212,7 +216,7 @@ void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap) } if (need_devmap_managed) { - error = devmap_managed_enable_get(dev, pgmap); + error = devmap_managed_enable_get(pgmap); if (error) return ERR_PTR(error); } @@ -321,6 +325,7 @@ void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap) err_array: dev_pagemap_kill(pgmap); dev_pagemap_cleanup(pgmap); + devmap_managed_enable_put(); return ERR_PTR(error); } EXPORT_SYMBOL_GPL(devm_memremap_pages); -- 2.20.1 _______________________________________________ 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>, Jason Gunthorpe <jgg@mellanox.com> Cc: Bharata B Rao <bharata@linux.ibm.com>, Andrew Morton <akpm@linux-foundation.org>, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-nvdimm@lists.01.org, Ira Weiny <ira.weiny@intel.com> Subject: [PATCH 3/4] memremap: don't use a separate devm action for devmap_managed_enable_get Date: Sun, 18 Aug 2019 11:05:56 +0200 [thread overview] Message-ID: <20190818090557.17853-4-hch@lst.de> (raw) In-Reply-To: <20190818090557.17853-1-hch@lst.de> Just clean up for early failures and then piggy back on devm_memremap_pages_release. This helps with a pending not device managed version of devm_memremap_pages. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Ira Weiny <ira.weiny@intel.com> --- kernel/memremap.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/kernel/memremap.c b/kernel/memremap.c index 600a14cbe663..09a087ca30ff 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -21,13 +21,13 @@ DEFINE_STATIC_KEY_FALSE(devmap_managed_key); EXPORT_SYMBOL(devmap_managed_key); static atomic_t devmap_managed_enable; -static void devmap_managed_enable_put(void *data) +static void devmap_managed_enable_put(void) { if (atomic_dec_and_test(&devmap_managed_enable)) static_branch_disable(&devmap_managed_key); } -static int devmap_managed_enable_get(struct device *dev, struct dev_pagemap *pgmap) +static int devmap_managed_enable_get(struct dev_pagemap *pgmap) { if (!pgmap->ops || !pgmap->ops->page_free) { WARN(1, "Missing page_free method\n"); @@ -36,13 +36,16 @@ static int devmap_managed_enable_get(struct device *dev, struct dev_pagemap *pgm if (atomic_inc_return(&devmap_managed_enable) == 1) static_branch_enable(&devmap_managed_key); - return devm_add_action_or_reset(dev, devmap_managed_enable_put, NULL); + return 0; } #else -static int devmap_managed_enable_get(struct device *dev, struct dev_pagemap *pgmap) +static int devmap_managed_enable_get(struct dev_pagemap *pgmap) { return -EINVAL; } +static void devmap_managed_enable_put(void) +{ +} #endif /* CONFIG_DEV_PAGEMAP_OPS */ static void pgmap_array_delete(struct resource *res) @@ -123,6 +126,7 @@ static void devm_memremap_pages_release(void *data) untrack_pfn(NULL, PHYS_PFN(res->start), resource_size(res)); pgmap_array_delete(res); WARN_ONCE(pgmap->altmap.alloc, "failed to free all reserved pages\n"); + devmap_managed_enable_put(); } static void dev_pagemap_percpu_release(struct percpu_ref *ref) @@ -212,7 +216,7 @@ void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap) } if (need_devmap_managed) { - error = devmap_managed_enable_get(dev, pgmap); + error = devmap_managed_enable_get(pgmap); if (error) return ERR_PTR(error); } @@ -321,6 +325,7 @@ void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap) err_array: dev_pagemap_kill(pgmap); dev_pagemap_cleanup(pgmap); + devmap_managed_enable_put(); return ERR_PTR(error); } EXPORT_SYMBOL_GPL(devm_memremap_pages); -- 2.20.1
next prev parent reply other threads:[~2019-08-18 9:14 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-18 9:05 add a not device managed memremap_pages v3 Christoph Hellwig 2019-08-18 9:05 ` [PATCH 1/4] resource: add a not device managed request_free_mem_region variant Christoph Hellwig 2019-08-18 9:05 ` Christoph Hellwig 2019-08-20 1:28 ` Dan Williams 2019-08-20 1:28 ` Dan Williams 2019-08-20 1:28 ` Dan Williams 2019-08-20 2:26 ` Christoph Hellwig 2019-08-20 2:26 ` Christoph Hellwig 2019-08-20 4:38 ` Dan Williams 2019-08-20 4:38 ` Dan Williams 2019-08-20 4:38 ` Dan Williams 2019-08-18 9:05 ` [PATCH 2/4] memremap: remove the dev field in struct dev_pagemap Christoph Hellwig 2019-08-18 9:05 ` Christoph Hellwig 2019-08-20 1:44 ` Dan Williams 2019-08-20 1:44 ` Dan Williams 2019-08-20 13:26 ` Jason Gunthorpe 2019-08-21 2:58 ` Dan Williams 2019-08-21 2:58 ` Dan Williams 2019-08-21 2:58 ` Dan Williams 2019-08-21 16:24 ` Jason Gunthorpe 2019-08-21 16:24 ` Jason Gunthorpe 2019-08-21 23:51 ` Jason Gunthorpe 2019-08-21 23:51 ` Jason Gunthorpe 2019-08-22 3:39 ` Dan Williams 2019-08-22 3:39 ` Dan Williams 2019-08-22 3:39 ` Dan Williams 2019-08-18 9:05 ` Christoph Hellwig [this message] 2019-08-18 9:05 ` [PATCH 3/4] memremap: don't use a separate devm action for devmap_managed_enable_get Christoph Hellwig 2019-08-20 2:22 ` Dan Williams 2019-08-20 2:22 ` Dan Williams 2019-08-20 2:22 ` Dan Williams 2019-08-18 9:05 ` [PATCH 4/4] memremap: provide a not device managed memremap_pages Christoph Hellwig 2019-08-18 9:05 ` Christoph Hellwig 2019-08-20 2:24 ` Dan Williams 2019-08-20 2:24 ` Dan Williams 2019-08-20 2:24 ` Dan Williams 2019-08-19 5:27 ` add a not device managed memremap_pages v3 Bharata B Rao 2019-08-19 6:30 ` Christoph Hellwig 2019-08-19 6:30 ` Christoph Hellwig 2019-08-20 13:26 ` Jason Gunthorpe -- strict thread matches above, loose matches on Subject: below -- 2019-08-16 6:54 add a not device managed memremap_pages v2 Christoph Hellwig 2019-08-16 6:54 ` [PATCH 3/4] memremap: don't use a separate devm action for devmap_managed_enable_get Christoph Hellwig 2019-08-16 6:54 ` Christoph Hellwig
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=20190818090557.17853-4-hch@lst.de \ --to=hch@lst.de \ --cc=akpm@linux-foundation.org \ --cc=bharata@linux.ibm.com \ --cc=dan.j.williams@intel.com \ --cc=jgg@mellanox.com \ --cc=linux-kernel@vger.kernel.org \ --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.