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 1/4] resource: add a not device managed request_free_mem_region variant Date: Sun, 18 Aug 2019 11:05:54 +0200 [thread overview] Message-ID: <20190818090557.17853-2-hch@lst.de> (raw) In-Reply-To: <20190818090557.17853-1-hch@lst.de> Factor out the guts of devm_request_free_mem_region so that we can implement both a device managed and a manually release version as tiny wrappers around it. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Ira Weiny <ira.weiny@intel.com> --- include/linux/ioport.h | 2 ++ kernel/resource.c | 45 +++++++++++++++++++++++++++++------------- 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/include/linux/ioport.h b/include/linux/ioport.h index 5b6a7121c9f0..7bddddfc76d6 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h @@ -297,6 +297,8 @@ static inline bool resource_overlaps(struct resource *r1, struct resource *r2) struct resource *devm_request_free_mem_region(struct device *dev, struct resource *base, unsigned long size); +struct resource *request_free_mem_region(struct resource *base, + unsigned long size, const char *name); #endif /* __ASSEMBLY__ */ #endif /* _LINUX_IOPORT_H */ diff --git a/kernel/resource.c b/kernel/resource.c index 7ea4306503c5..74877e9d90ca 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -1644,19 +1644,8 @@ 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 to - * @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 hotplugged 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) +static struct resource *__request_free_mem_region(struct device *dev, + struct resource *base, unsigned long size, const char *name) { resource_size_t end, addr; struct resource *res; @@ -1670,7 +1659,10 @@ struct resource *devm_request_free_mem_region(struct device *dev, REGION_DISJOINT) continue; - res = devm_request_mem_region(dev, addr, size, dev_name(dev)); + if (dev) + res = devm_request_mem_region(dev, addr, size, name); + else + res = request_mem_region(addr, size, name); if (!res) return ERR_PTR(-ENOMEM); res->desc = IORES_DESC_DEVICE_PRIVATE_MEMORY; @@ -1679,7 +1671,32 @@ struct resource *devm_request_free_mem_region(struct device *dev, return ERR_PTR(-ERANGE); } + +/** + * devm_request_free_mem_region - find free region for device private memory + * + * @dev: device struct to bind the resource to + * @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 hotplugged 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) +{ + return __request_free_mem_region(dev, base, size, dev_name(dev)); +} EXPORT_SYMBOL_GPL(devm_request_free_mem_region); + +struct resource *request_free_mem_region(struct resource *base, + unsigned long size, const char *name) +{ + return __request_free_mem_region(NULL, base, size, name); +} +EXPORT_SYMBOL_GPL(request_free_mem_region); + #endif /* CONFIG_DEVICE_PRIVATE */ static int __init strict_iomem(char *str) -- 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 1/4] resource: add a not device managed request_free_mem_region variant Date: Sun, 18 Aug 2019 11:05:54 +0200 [thread overview] Message-ID: <20190818090557.17853-2-hch@lst.de> (raw) In-Reply-To: <20190818090557.17853-1-hch@lst.de> Factor out the guts of devm_request_free_mem_region so that we can implement both a device managed and a manually release version as tiny wrappers around it. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Ira Weiny <ira.weiny@intel.com> --- include/linux/ioport.h | 2 ++ kernel/resource.c | 45 +++++++++++++++++++++++++++++------------- 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/include/linux/ioport.h b/include/linux/ioport.h index 5b6a7121c9f0..7bddddfc76d6 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h @@ -297,6 +297,8 @@ static inline bool resource_overlaps(struct resource *r1, struct resource *r2) struct resource *devm_request_free_mem_region(struct device *dev, struct resource *base, unsigned long size); +struct resource *request_free_mem_region(struct resource *base, + unsigned long size, const char *name); #endif /* __ASSEMBLY__ */ #endif /* _LINUX_IOPORT_H */ diff --git a/kernel/resource.c b/kernel/resource.c index 7ea4306503c5..74877e9d90ca 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -1644,19 +1644,8 @@ 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 to - * @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 hotplugged 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) +static struct resource *__request_free_mem_region(struct device *dev, + struct resource *base, unsigned long size, const char *name) { resource_size_t end, addr; struct resource *res; @@ -1670,7 +1659,10 @@ struct resource *devm_request_free_mem_region(struct device *dev, REGION_DISJOINT) continue; - res = devm_request_mem_region(dev, addr, size, dev_name(dev)); + if (dev) + res = devm_request_mem_region(dev, addr, size, name); + else + res = request_mem_region(addr, size, name); if (!res) return ERR_PTR(-ENOMEM); res->desc = IORES_DESC_DEVICE_PRIVATE_MEMORY; @@ -1679,7 +1671,32 @@ struct resource *devm_request_free_mem_region(struct device *dev, return ERR_PTR(-ERANGE); } + +/** + * devm_request_free_mem_region - find free region for device private memory + * + * @dev: device struct to bind the resource to + * @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 hotplugged 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) +{ + return __request_free_mem_region(dev, base, size, dev_name(dev)); +} EXPORT_SYMBOL_GPL(devm_request_free_mem_region); + +struct resource *request_free_mem_region(struct resource *base, + unsigned long size, const char *name) +{ + return __request_free_mem_region(NULL, base, size, name); +} +EXPORT_SYMBOL_GPL(request_free_mem_region); + #endif /* CONFIG_DEVICE_PRIVATE */ static int __init strict_iomem(char *str) -- 2.20.1
next prev parent reply other threads:[~2019-08-18 9:12 UTC|newest] Thread overview: 46+ 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 ` Christoph Hellwig [this message] 2019-08-18 9:05 ` [PATCH 1/4] resource: add a not device managed request_free_mem_region variant 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 ` [PATCH 3/4] memremap: don't use a separate devm action for devmap_managed_enable_get Christoph Hellwig 2019-08-18 9:05 ` 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 1/4] resource: add a not device managed request_free_mem_region variant Christoph Hellwig 2019-08-16 6:54 ` Christoph Hellwig 2019-08-16 21:01 ` Andrew Morton 2019-08-16 21:01 ` Andrew Morton 2019-08-18 9:03 ` Christoph Hellwig 2019-08-18 9:03 ` 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-2-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.