From: Christoph Hellwig <hch@lst.de>
To: "Dan Williams" <dan.j.williams@intel.com>,
"Jérôme Glisse" <jglisse@redhat.com>,
"Jason Gunthorpe" <jgg@mellanox.com>,
"Ben Skeggs" <bskeggs@redhat.com>
Cc: linux-mm@kvack.org, nouveau@lists.freedesktop.org,
dri-devel@lists.freedesktop.org, linux-nvdimm@lists.01.org,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 06/22] mm: factor out a devm_request_free_mem_region helper
Date: Thu, 13 Jun 2019 11:43:09 +0200 [thread overview]
Message-ID: <20190613094326.24093-7-hch@lst.de> (raw)
In-Reply-To: <20190613094326.24093-1-hch@lst.de>
Keep the physical address allocation that hmm_add_device does with the
rest of the resource code, and allow future reuse of it without the hmm
wrapper.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
include/linux/ioport.h | 2 ++
kernel/resource.c | 39 +++++++++++++++++++++++++++++++++++++++
mm/hmm.c | 33 ++++-----------------------------
3 files changed, 45 insertions(+), 29 deletions(-)
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index da0ebaec25f0..76a33ae3bf6c 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -286,6 +286,8 @@ static inline bool resource_overlaps(struct resource *r1, struct resource *r2)
return (r1->start <= r2->end && r1->end >= r2->start);
}
+struct resource *devm_request_free_mem_region(struct device *dev,
+ struct resource *base, unsigned long size);
#endif /* __ASSEMBLY__ */
#endif /* _LINUX_IOPORT_H */
diff --git a/kernel/resource.c b/kernel/resource.c
index 158f04ec1d4f..99c58134ed1c 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -1628,6 +1628,45 @@ void resource_list_free(struct list_head *head)
}
EXPORT_SYMBOL(resource_list_free);
+#ifdef CONFIG_DEVICE_PRIVATE
+/**
+ * devm_request_free_mem_region - find free region for device private memory
+ *
+ * @dev: device struct to bind the resource too
+ * @size: size in bytes of the device memory to add
+ * @base: resource tree to look in
+ *
+ * This function tries to find an empty range of physical address big enough to
+ * contain the new resource, so that it can later be hotpluged as ZONE_DEVICE
+ * memory, which in turn allocates struct pages.
+ */
+struct resource *devm_request_free_mem_region(struct device *dev,
+ struct resource *base, unsigned long size)
+{
+ resource_size_t end, addr;
+ struct resource *res;
+
+ size = ALIGN(size, 1UL << PA_SECTION_SHIFT);
+ end = min_t(unsigned long, base->end, (1UL << MAX_PHYSMEM_BITS) - 1);
+ addr = end - size + 1UL;
+
+ for (; addr > size && addr >= base->start; addr -= size) {
+ if (region_intersects(addr, size, 0, IORES_DESC_NONE) !=
+ REGION_DISJOINT)
+ continue;
+
+ res = devm_request_mem_region(dev, addr, size, dev_name(dev));
+ if (!res)
+ return ERR_PTR(-ENOMEM);
+ res->desc = IORES_DESC_DEVICE_PRIVATE_MEMORY;
+ return res;
+ }
+
+ return ERR_PTR(-ERANGE);
+}
+EXPORT_SYMBOL_GPL(devm_request_free_mem_region);
+#endif /* CONFIG_DEVICE_PRIVATE */
+
static int __init strict_iomem(char *str)
{
if (strstr(str, "relaxed"))
diff --git a/mm/hmm.c b/mm/hmm.c
index e1dc98407e7b..13a16faf0a77 100644
--- a/mm/hmm.c
+++ b/mm/hmm.c
@@ -26,8 +26,6 @@
#include <linux/mmu_notifier.h>
#include <linux/memory_hotplug.h>
-#define PA_SECTION_SIZE (1UL << PA_SECTION_SHIFT)
-
#if IS_ENABLED(CONFIG_HMM_MIRROR)
static const struct mmu_notifier_ops hmm_mmu_notifier_ops;
@@ -1372,7 +1370,6 @@ struct hmm_devmem *hmm_devmem_add(const struct hmm_devmem_ops *ops,
unsigned long size)
{
struct hmm_devmem *devmem;
- resource_size_t addr;
void *result;
int ret;
@@ -1398,32 +1395,10 @@ struct hmm_devmem *hmm_devmem_add(const struct hmm_devmem_ops *ops,
if (ret)
return ERR_PTR(ret);
- size = ALIGN(size, PA_SECTION_SIZE);
- addr = min((unsigned long)iomem_resource.end,
- (1UL << MAX_PHYSMEM_BITS) - 1);
- addr = addr - size + 1UL;
-
- /*
- * FIXME add a new helper to quickly walk resource tree and find free
- * range
- *
- * FIXME what about ioport_resource resource ?
- */
- for (; addr > size && addr >= iomem_resource.start; addr -= size) {
- ret = region_intersects(addr, size, 0, IORES_DESC_NONE);
- if (ret != REGION_DISJOINT)
- continue;
-
- devmem->resource = devm_request_mem_region(device, addr, size,
- dev_name(device));
- if (!devmem->resource)
- return ERR_PTR(-ENOMEM);
- break;
- }
- if (!devmem->resource)
- return ERR_PTR(-ERANGE);
-
- devmem->resource->desc = IORES_DESC_DEVICE_PRIVATE_MEMORY;
+ devmem->resource = devm_request_free_mem_region(device, &iomem_resource,
+ size);
+ if (IS_ERR(devmem->resource))
+ return ERR_CAST(devmem->resource);
devmem->pfn_first = devmem->resource->start >> PAGE_SHIFT;
devmem->pfn_last = devmem->pfn_first +
(resource_size(devmem->resource) >> PAGE_SHIFT);
--
2.20.1
next prev parent reply other threads:[~2019-06-13 9:43 UTC|newest]
Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-13 9:43 dev_pagemap related cleanups Christoph Hellwig
2019-06-13 9:43 ` [PATCH 01/22] mm: remove the unused ARCH_HAS_HMM_DEVICE Kconfig option Christoph Hellwig
2019-06-13 18:30 ` Jason Gunthorpe
2019-06-13 9:43 ` [PATCH 02/22] mm: remove the struct hmm_device infrastructure Christoph Hellwig
2019-06-13 18:46 ` Jason Gunthorpe
2019-06-13 23:06 ` [Nouveau] " John Hubbard
2019-06-13 9:43 ` [PATCH 03/22] mm: remove hmm_devmem_add_resource Christoph Hellwig
2019-06-13 18:52 ` Jason Gunthorpe
2019-06-14 6:19 ` Christoph Hellwig
2019-06-14 0:54 ` [Nouveau] " John Hubbard
2019-06-20 19:32 ` Michal Hocko
2019-06-13 9:43 ` [PATCH 04/22] mm: don't clear ->mapping in hmm_devmem_free Christoph Hellwig
2019-06-13 19:05 ` Jason Gunthorpe
2019-06-14 6:21 ` Christoph Hellwig
2019-06-14 1:46 ` John Hubbard
2019-06-20 19:36 ` Michal Hocko
2019-06-13 9:43 ` [PATCH 05/22] mm: export alloc_pages_vma Christoph Hellwig
2019-06-14 1:47 ` John Hubbard
2019-06-14 6:23 ` Christoph Hellwig
2019-06-20 19:17 ` Michal Hocko
2019-06-24 18:24 ` Dan Williams
2019-06-25 7:23 ` Christoph Hellwig
2019-06-25 15:00 ` Michal Hocko
2019-06-25 18:03 ` Dan Williams
2019-06-25 19:00 ` Michal Hocko
2019-06-25 19:52 ` Dan Williams
2019-06-26 5:46 ` Michal Hocko
2019-06-26 16:14 ` Dan Williams
2019-06-27 6:41 ` Michal Hocko
2019-06-13 9:43 ` Christoph Hellwig [this message]
2019-06-13 19:16 ` [PATCH 06/22] mm: factor out a devm_request_free_mem_region helper Jason Gunthorpe
2019-06-14 6:24 ` Christoph Hellwig
2019-06-15 2:21 ` John Hubbard
2019-06-15 14:30 ` Christoph Hellwig
2019-06-13 9:43 ` [PATCH 07/22] memremap: move dev_pagemap callbacks into a separate structure Christoph Hellwig
2019-06-13 19:18 ` Jason Gunthorpe
2019-06-13 20:14 ` Logan Gunthorpe
2019-06-13 9:43 ` [PATCH 08/22] memremap: pass a struct dev_pagemap to ->kill Christoph Hellwig
2019-06-13 19:26 ` Jason Gunthorpe
2019-06-13 20:12 ` Logan Gunthorpe
2019-06-13 20:15 ` Dan Williams
2019-06-13 9:43 ` [PATCH 09/22] memremap: lift the devmap_enable manipulation into devm_memremap_pages Christoph Hellwig
2019-06-13 19:34 ` Jason Gunthorpe
2019-06-13 20:13 ` Dan Williams
2019-06-14 6:28 ` Christoph Hellwig
2019-06-13 9:43 ` [PATCH 10/22] memremap: add a migrate callback to struct dev_pagemap_ops Christoph Hellwig
2019-06-13 23:42 ` Ralph Campbell
2019-06-14 6:33 ` Christoph Hellwig
2019-06-13 9:43 ` [PATCH 11/22] memremap: remove the data field in struct dev_pagemap Christoph Hellwig
2019-06-13 19:37 ` Jason Gunthorpe
2019-06-13 9:43 ` [PATCH 12/22] memremap: provide an optional internal refcount " Christoph Hellwig
2019-06-13 9:43 ` [PATCH 13/22] device-dax: use the dev_pagemap internal refcount Christoph Hellwig
2019-06-14 0:22 ` Ira Weiny
2019-06-14 6:35 ` Christoph Hellwig
2019-06-13 9:43 ` [PATCH 14/22] nouveau: use alloc_page_vma directly Christoph Hellwig
2019-06-13 19:39 ` Jason Gunthorpe
2019-06-13 9:43 ` [PATCH 15/22] nouveau: use devm_memremap_pages directly Christoph Hellwig
2019-06-13 9:43 ` [PATCH 16/22] mm: remove hmm_vma_alloc_locked_page Christoph Hellwig
2019-06-13 9:43 ` [PATCH 17/22] mm: remove hmm_devmem_add Christoph Hellwig
2019-06-13 19:42 ` Jason Gunthorpe
2019-06-14 6:39 ` Christoph Hellwig
2019-06-13 9:43 ` [PATCH 18/22] mm: mark DEVICE_PUBLIC as broken Christoph Hellwig
2019-06-13 19:44 ` Jason Gunthorpe
2019-06-13 19:53 ` Ralph Campbell
2019-06-13 19:58 ` Jason Gunthorpe
2019-06-14 0:43 ` Ira Weiny
2019-06-14 1:23 ` John Hubbard
2019-06-19 19:27 ` Jason Gunthorpe
2019-06-19 19:46 ` Dan Williams
2019-06-26 3:15 ` John Hubbard
2019-06-26 5:45 ` Michal Hocko
2019-06-26 6:07 ` John Hubbard
2019-06-14 6:43 ` Christoph Hellwig
2019-06-20 19:26 ` Michal Hocko
2019-06-25 7:29 ` Christoph Hellwig
2019-06-25 11:44 ` Jason Gunthorpe
2019-06-25 11:59 ` Christoph Hellwig
2019-06-13 9:43 ` [PATCH 19/22] mm: simplify ZONE_DEVICE page private data Christoph Hellwig
2019-06-13 9:43 ` [PATCH 20/22] mm: sort out the DEVICE_PRIVATE Kconfig mess Christoph Hellwig
2019-06-13 19:55 ` Jason Gunthorpe
2019-06-13 9:43 ` [PATCH 21/22] mm: remove the HMM config option Christoph Hellwig
2019-06-13 20:01 ` Jason Gunthorpe
2019-06-14 6:47 ` Christoph Hellwig
2019-06-13 9:43 ` [PATCH 22/22] mm: don't select MIGRATE_VMA_HELPER from HMM_MIRROR Christoph Hellwig
2019-06-13 20:04 ` Jason Gunthorpe
2019-06-14 1:53 ` [Nouveau] " John Hubbard
2019-06-14 6:48 ` Christoph Hellwig
2019-06-13 14:16 ` dev_pagemap related cleanups Jason Gunthorpe
2019-06-14 6:12 ` Christoph Hellwig
2019-06-13 18:27 ` Dan Williams
2019-06-13 20:17 ` Logan Gunthorpe
2019-06-13 20:21 ` Dan Williams
2019-06-13 20:24 ` Logan Gunthorpe
2019-06-13 20:48 ` Andrew Morton
2019-06-13 20:40 ` Jason Gunthorpe
2019-06-13 21:21 ` Christoph Hellwig
2019-06-13 23:10 ` Jason Gunthorpe
2019-06-14 6:14 ` Christoph Hellwig
2019-06-14 0:31 ` Ira Weiny
2019-06-14 6:13 ` Christoph Hellwig
2019-06-15 1:14 ` Dan Williams
2019-06-15 8:33 ` Christoph Hellwig
2019-06-15 18:09 ` 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=20190613094326.24093-7-hch@lst.de \
--to=hch@lst.de \
--cc=bskeggs@redhat.com \
--cc=dan.j.williams@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jgg@mellanox.com \
--cc=jglisse@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nvdimm@lists.01.org \
--cc=linux-pci@vger.kernel.org \
--cc=nouveau@lists.freedesktop.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).