Merge tag 'libnvdimm-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

Pull libnvdimm updates from Dan Williams:
 "Outside of the new ACPI-NFIT hot-add support this pull request is more
  notable for what it does not contain, than what it does.  There were a
  handful of development topics this cycle, dax get_user_pages, dax
  fsync, and raw block dax, that need more more iteration and will wait
  for 4.5.

  The patches to make devm and the pmem driver NUMA aware have been in
  -next for several weeks.  The hot-add support has not, but is
  contained to the NFIT driver and is passing unit tests.  The coredump
  support is straightforward and was looked over by Jeff.  All of it has
  received a 0day build success notification across 107 configs.

  Summary:

   - Add support for the ACPI 6.0 NFIT hot add mechanism to process
     updates of the NFIT at runtime.

   - Teach the coredump implementation how to filter out DAX mappings.

   - Introduce NUMA hints for allocations made by the pmem driver, and
     as a side effect all devm allocations now hint their NUMA node by
     default"

* tag 'libnvdimm-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  coredump: add DAX filtering for FDPIC ELF coredumps
  coredump: add DAX filtering for ELF coredumps
  acpi: nfit: Add support for hot-add
  nfit: in acpi_nfit_init, break on a 0-length table
  pmem, memremap: convert to numa aware allocations
  devm_memremap_pages: use numa_mem_id
  devm: make allocations numa aware by default
  devm_memremap: convert to return ERR_PTR
  devm_memunmap: use devres_release()
  pmem: kill memremap_pmem()
  x86, mm: quiet arch_add_memory()

1 files changed, 13 insertions, 15 deletions

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 0ba6a978f227..349f03e7ed06 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -150,18 +150,15 @@ static struct pmem_device *pmem_alloc(struct device *dev,
                 return ERR_PTR(-EBUSY);
         }
 
-        if (pmem_should_map_pages(dev)) {
-                void *addr = devm_memremap_pages(dev, res);
+        if (pmem_should_map_pages(dev))
+                pmem->virt_addr = (void __pmem *) devm_memremap_pages(dev, res);
+        else
+                pmem->virt_addr = (void __pmem *) devm_memremap(dev,
+                                pmem->phys_addr, pmem->size,
+                                ARCH_MEMREMAP_PMEM);
 
-                if (IS_ERR(addr))
-                        return addr;
-                pmem->virt_addr = (void __pmem *) addr;
-        } else {
-                pmem->virt_addr = memremap_pmem(dev, pmem->phys_addr,
-                                pmem->size);
-                if (!pmem->virt_addr)
-                        return ERR_PTR(-ENXIO);
-        }
+        if (IS_ERR(pmem->virt_addr))
+                return (void __force *) pmem->virt_addr;
 
         return pmem;
 }
@@ -179,9 +176,10 @@ static void pmem_detach_disk(struct pmem_device *pmem)
 static int pmem_attach_disk(struct device *dev,
                 struct nd_namespace_common *ndns, struct pmem_device *pmem)
 {
+        int nid = dev_to_node(dev);
         struct gendisk *disk;
 
-        pmem->pmem_queue = blk_alloc_queue(GFP_KERNEL);
+        pmem->pmem_queue = blk_alloc_queue_node(GFP_KERNEL, nid);
         if (!pmem->pmem_queue)
                 return -ENOMEM;
 
@@ -191,7 +189,7 @@ static int pmem_attach_disk(struct device *dev,
         blk_queue_bounce_limit(pmem->pmem_queue, BLK_BOUNCE_ANY);
         queue_flag_set_unlocked(QUEUE_FLAG_NONROT, pmem->pmem_queue);
 
-        disk = alloc_disk(0);
+        disk = alloc_disk_node(0, nid);
         if (!disk) {
                 blk_cleanup_queue(pmem->pmem_queue);
                 return -ENOMEM;
@@ -363,8 +361,8 @@ static int nvdimm_namespace_attach_pfn(struct nd_namespace_common *ndns)
 
         /* establish pfn range for lookup, and switch to direct map */
         pmem = dev_get_drvdata(dev);
-        memunmap_pmem(dev, pmem->virt_addr);
-        pmem->virt_addr = (void __pmem *)devm_memremap_pages(dev, &nsio->res);
+        devm_memunmap(dev, (void __force *) pmem->virt_addr);
+        pmem->virt_addr = (void __pmem *) devm_memremap_pages(dev, &nsio->res);
         if (IS_ERR(pmem->virt_addr)) {
                 rc = PTR_ERR(pmem->virt_addr);
                 goto err;