From: Dave Hansen <dave.hansen@linux.intel.com> To: linux-kernel@vger.kernel.org Cc: thomas.lendacky@amd.com, mhocko@suse.com, linux-nvdimm@lists.01.org, Dave Hansen <dave.hansen@linux.intel.com>, ying.huang@intel.com, linux-mm@kvack.org, zwisler@kernel.org, fengguang.wu@intel.com, akpm@linux-foundation.org Subject: [PATCH 7/9] dax/kmem: actually perform memory hotplug Date: Mon, 22 Oct 2018 13:13:29 -0700 [thread overview] Message-ID: <20181022201329.518577A4@viggo.jf.intel.com> (raw) In-Reply-To: <20181022201317.8558C1D8@viggo.jf.intel.com> This is the meat of this whole series. When the "kmem" device's probe function is called and we know we have a good persistent memory device, hotplug the memory back into the main kernel. Cc: Dan Williams <dan.j.williams@intel.com> Cc: Dave Jiang <dave.jiang@intel.com> Cc: Ross Zwisler <zwisler@kernel.org> Cc: Vishal Verma <vishal.l.verma@intel.com> Cc: Tom Lendacky <thomas.lendacky@amd.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Michal Hocko <mhocko@suse.com> Cc: linux-nvdimm@lists.01.org Cc: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org Cc: Huang Ying <ying.huang@intel.com> Cc: Fengguang Wu <fengguang.wu@intel.com> --- b/drivers/dax/kmem.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff -puN drivers/dax/kmem.c~dax-kmem-hotplug drivers/dax/kmem.c --- a/drivers/dax/kmem.c~dax-kmem-hotplug 2018-10-22 13:12:24.069930387 -0700 +++ b/drivers/dax/kmem.c 2018-10-22 13:12:24.072930387 -0700 @@ -55,10 +55,12 @@ static void dax_kmem_percpu_kill(void *d static int dax_kmem_probe(struct device *dev) { void *addr; + int numa_node; struct resource res; int rc, id, region_id; struct nd_pfn_sb *pfn_sb; struct dev_dax *dev_dax; + struct resource *new_res; struct dax_kmem *dax_kmem; struct nd_namespace_io *nsio; struct dax_region *dax_region; @@ -86,13 +88,30 @@ static int dax_kmem_probe(struct device pfn_sb = nd_pfn->pfn_sb; - if (!devm_request_mem_region(dev, nsio->res.start, - resource_size(&nsio->res), - dev_name(&ndns->dev))) { + new_res = devm_request_mem_region(dev, nsio->res.start, + resource_size(&nsio->res), + "System RAM (pmem)"); + if (!new_res) { dev_warn(dev, "could not reserve region %pR\n", &nsio->res); return -EBUSY; } + /* + * Set flags appropriate for System RAM. Leave ..._BUSY clear + * so that add_memory() can add a child resource. + */ + new_res->flags = IORESOURCE_SYSTEM_RAM; + + numa_node = dev_to_node(dev); + if (numa_node < 0) { + pr_warn_once("bad numa_node: %d, forcing to 0\n", numa_node); + numa_node = 0; + } + + rc = add_memory(numa_node, nsio->res.start, resource_size(&nsio->res)); + if (rc) + return rc; + dax_kmem->dev = dev; init_completion(&dax_kmem->cmp); rc = percpu_ref_init(&dax_kmem->ref, dax_kmem_percpu_release, 0, @@ -106,6 +125,9 @@ static int dax_kmem_probe(struct device return rc; dax_kmem->pgmap.ref = &dax_kmem->ref; + + dax_kmem->pgmap.res.name = "name_kmem_override2"; + addr = devm_memremap_pages(dev, &dax_kmem->pgmap); if (IS_ERR(addr)) return PTR_ERR(addr); _ _______________________________________________ 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: Dave Hansen <dave.hansen@linux.intel.com> To: linux-kernel@vger.kernel.org Cc: Dave Hansen <dave.hansen@linux.intel.com>, dan.j.williams@intel.com, dave.jiang@intel.com, zwisler@kernel.org, vishal.l.verma@intel.com, thomas.lendacky@amd.com, akpm@linux-foundation.org, mhocko@suse.com, linux-nvdimm@lists.01.org, linux-mm@kvack.org, ying.huang@intel.com, fengguang.wu@intel.com Subject: [PATCH 7/9] dax/kmem: actually perform memory hotplug Date: Mon, 22 Oct 2018 13:13:29 -0700 [thread overview] Message-ID: <20181022201329.518577A4@viggo.jf.intel.com> (raw) In-Reply-To: <20181022201317.8558C1D8@viggo.jf.intel.com> This is the meat of this whole series. When the "kmem" device's probe function is called and we know we have a good persistent memory device, hotplug the memory back into the main kernel. Cc: Dan Williams <dan.j.williams@intel.com> Cc: Dave Jiang <dave.jiang@intel.com> Cc: Ross Zwisler <zwisler@kernel.org> Cc: Vishal Verma <vishal.l.verma@intel.com> Cc: Tom Lendacky <thomas.lendacky@amd.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Michal Hocko <mhocko@suse.com> Cc: linux-nvdimm@lists.01.org Cc: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org Cc: Huang Ying <ying.huang@intel.com> Cc: Fengguang Wu <fengguang.wu@intel.com> --- b/drivers/dax/kmem.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff -puN drivers/dax/kmem.c~dax-kmem-hotplug drivers/dax/kmem.c --- a/drivers/dax/kmem.c~dax-kmem-hotplug 2018-10-22 13:12:24.069930387 -0700 +++ b/drivers/dax/kmem.c 2018-10-22 13:12:24.072930387 -0700 @@ -55,10 +55,12 @@ static void dax_kmem_percpu_kill(void *d static int dax_kmem_probe(struct device *dev) { void *addr; + int numa_node; struct resource res; int rc, id, region_id; struct nd_pfn_sb *pfn_sb; struct dev_dax *dev_dax; + struct resource *new_res; struct dax_kmem *dax_kmem; struct nd_namespace_io *nsio; struct dax_region *dax_region; @@ -86,13 +88,30 @@ static int dax_kmem_probe(struct device pfn_sb = nd_pfn->pfn_sb; - if (!devm_request_mem_region(dev, nsio->res.start, - resource_size(&nsio->res), - dev_name(&ndns->dev))) { + new_res = devm_request_mem_region(dev, nsio->res.start, + resource_size(&nsio->res), + "System RAM (pmem)"); + if (!new_res) { dev_warn(dev, "could not reserve region %pR\n", &nsio->res); return -EBUSY; } + /* + * Set flags appropriate for System RAM. Leave ..._BUSY clear + * so that add_memory() can add a child resource. + */ + new_res->flags = IORESOURCE_SYSTEM_RAM; + + numa_node = dev_to_node(dev); + if (numa_node < 0) { + pr_warn_once("bad numa_node: %d, forcing to 0\n", numa_node); + numa_node = 0; + } + + rc = add_memory(numa_node, nsio->res.start, resource_size(&nsio->res)); + if (rc) + return rc; + dax_kmem->dev = dev; init_completion(&dax_kmem->cmp); rc = percpu_ref_init(&dax_kmem->ref, dax_kmem_percpu_release, 0, @@ -106,6 +125,9 @@ static int dax_kmem_probe(struct device return rc; dax_kmem->pgmap.ref = &dax_kmem->ref; + + dax_kmem->pgmap.res.name = "name_kmem_override2"; + addr = devm_memremap_pages(dev, &dax_kmem->pgmap); if (IS_ERR(addr)) return PTR_ERR(addr); _
next prev parent reply other threads:[~2018-10-22 20:18 UTC|newest] Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-10-22 20:13 [PATCH 0/9] Allow persistent memory to be used like normal RAM Dave Hansen 2018-10-22 20:13 ` Dave Hansen 2018-10-22 20:13 ` [PATCH 1/9] mm/resource: return real error codes from walk failures Dave Hansen 2018-10-22 20:13 ` Dave Hansen 2018-10-22 20:13 ` [PATCH 2/9] dax: kernel memory driver for mm ownership of DAX Dave Hansen 2018-10-22 20:13 ` Dave Hansen 2018-10-23 1:56 ` Randy Dunlap 2018-10-23 1:56 ` Randy Dunlap 2018-10-22 20:13 ` [PATCH 3/9] dax: add more kmem device infrastructure Dave Hansen 2018-10-22 20:13 ` Dave Hansen 2018-10-22 20:13 ` [PATCH 4/9] dax/kmem: allow PMEM devices to bind to KMEM driver Dave Hansen 2018-10-22 20:13 ` Dave Hansen 2018-10-22 20:13 ` [PATCH 5/9] dax/kmem: add more nd dax kmem infrastructure Dave Hansen 2018-10-22 20:13 ` Dave Hansen 2018-10-22 20:13 ` [PATCH 6/9] mm/memory-hotplug: allow memory resources to be children Dave Hansen 2018-10-22 20:13 ` Dave Hansen 2018-10-22 20:13 ` Dave Hansen [this message] 2018-10-22 20:13 ` [PATCH 7/9] dax/kmem: actually perform memory hotplug Dave Hansen 2018-10-22 20:13 ` [PATCH 8/9] dax/kmem: let walk_system_ram_range() search child resources Dave Hansen 2018-10-22 20:13 ` Dave Hansen 2018-10-22 20:13 ` [PATCH 9/9] dax/kmem: actually enable the code in Makefile Dave Hansen 2018-10-22 20:13 ` Dave Hansen 2018-10-23 1:05 ` [PATCH 0/9] Allow persistent memory to be used like normal RAM Dan Williams 2018-10-23 1:11 ` Dan Williams 2018-10-23 1:11 ` Dan Williams 2018-10-26 8:03 ` Xishi Qiu 2018-10-26 13:58 ` Dave Hansen 2018-10-26 13:58 ` Dave Hansen 2018-10-27 4:45 ` Dan Williams 2018-10-27 4:45 ` Dan Williams 2018-10-23 18:12 ` Elliott, Robert (Persistent Memory) 2018-10-23 18:12 ` Elliott, Robert (Persistent Memory) 2018-10-23 18:16 ` Dave Hansen 2018-10-23 18:16 ` Dave Hansen 2018-10-23 18:58 ` Dan Williams 2018-10-23 18:58 ` Dan Williams 2018-10-26 5:42 ` Xishi Qiu 2018-10-26 5:42 ` Xishi Qiu 2018-10-26 9:03 ` Fengguang Wu 2018-10-26 9:03 ` Fengguang Wu 2018-10-27 11:00 ` Fengguang Wu 2018-10-27 11:00 ` Fengguang Wu 2018-10-31 5:11 ` Yang Shi 2018-10-31 5:11 ` Yang Shi 2018-12-03 9:22 ` Brice Goglin 2018-12-03 16:56 ` Dave Hansen 2018-12-03 16:56 ` Dave Hansen 2018-12-03 17:16 ` Dan Williams 2018-12-03 17:16 ` 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=20181022201329.518577A4@viggo.jf.intel.com \ --to=dave.hansen@linux.intel.com \ --cc=akpm@linux-foundation.org \ --cc=fengguang.wu@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-nvdimm@lists.01.org \ --cc=mhocko@suse.com \ --cc=thomas.lendacky@amd.com \ --cc=ying.huang@intel.com \ --cc=zwisler@kernel.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.