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

Pull libnvdimm updates from Ross Zwisler:

 - Require struct page by default for filesystem DAX to remove a number
   of surprising failure cases. This includes failures with direct I/O,
   gdb and fork(2).

 - Add support for the new Platform Capabilities Structure added to the
   NFIT in ACPI 6.2a. This new table tells us whether the platform
   supports flushing of CPU and memory controller caches on unexpected
   power loss events.

 - Revamp vmem_altmap and dev_pagemap handling to clean up code and
   better support future future PCI P2P uses.

 - Deprecate the ND_IOCTL_SMART_THRESHOLD command whose payload has
   become out-of-sync with recent versions of the NVDIMM_FAMILY_INTEL
   spec, and instead rely on the generic ND_CMD_CALL approach used by
   the two other IOCTL families, NVDIMM_FAMILY_{HPE,MSFT}.

 - Enhance nfit_test so we can test some of the new things added in
   version 1.6 of the DSM specification. This includes testing firmware
   download and simulating the Last Shutdown State (LSS) status.

* tag 'libnvdimm-for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: (37 commits)
  libnvdimm, namespace: remove redundant initialization of 'nd_mapping'
  acpi, nfit: fix register dimm error handling
  libnvdimm, namespace: make min namespace size 4K
  tools/testing/nvdimm: force nfit_test to depend on instrumented modules
  libnvdimm/nfit_test: adding support for unit testing enable LSS status
  libnvdimm/nfit_test: add firmware download emulation
  nfit-test: Add platform cap support from ACPI 6.2a to test
  libnvdimm: expose platform persistence attribute for nd_region
  acpi: nfit: add persistent memory control flag for nd_region
  acpi: nfit: Add support for detect platform CPU cache flush on power loss
  device-dax: Fix trailing semicolon
  libnvdimm, btt: fix uninitialized err_lock
  dax: require 'struct page' by default for filesystem dax
  ext2: auto disable dax instead of failing mount
  ext4: auto disable dax instead of failing mount
  mm, dax: introduce pfn_t_special()
  mm: Fix devm_memremap_pages() collision handling
  mm: Fix memory size alignment in devm_memremap_pages_release()
  memremap: merge find_dev_pagemap into get_dev_pagemap
  memremap: change devm_memremap_pages interface to use struct dev_pagemap
  ...

1 files changed, 23 insertions, 44 deletions

diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
index 17acf01791fa..bd0276d5f66b 100644
--- a/mm/sparse-vmemmap.c
+++ b/mm/sparse-vmemmap.c
@@ -74,7 +74,7 @@ void * __meminit vmemmap_alloc_block(unsigned long size, int node)
 }
 
 /* need to make sure size is all the same during early stage */
-static void * __meminit alloc_block_buf(unsigned long size, int node)
+void * __meminit vmemmap_alloc_block_buf(unsigned long size, int node)
 {
         void *ptr;
 
@@ -107,33 +107,16 @@ static unsigned long __meminit vmem_altmap_nr_free(struct vmem_altmap *altmap)
 }
 
 /**
- * vmem_altmap_alloc - allocate pages from the vmem_altmap reservation
- * @altmap - reserved page pool for the allocation
- * @nr_pfns - size (in pages) of the allocation
+ * altmap_alloc_block_buf - allocate pages from the device page map
+ * @altmap:     device page map
+ * @size:       size (in bytes) of the allocation
  *
- * Allocations are aligned to the size of the request
+ * Allocations are aligned to the size of the request.
  */
-static unsigned long __meminit vmem_altmap_alloc(struct vmem_altmap *altmap,
-                unsigned long nr_pfns)
-{
-        unsigned long pfn = vmem_altmap_next_pfn(altmap);
-        unsigned long nr_align;
-
-        nr_align = 1UL << find_first_bit(&nr_pfns, BITS_PER_LONG);
-        nr_align = ALIGN(pfn, nr_align) - pfn;
-
-        if (nr_pfns + nr_align > vmem_altmap_nr_free(altmap))
-                return ULONG_MAX;
-        altmap->alloc += nr_pfns;
-        altmap->align += nr_align;
-        return pfn + nr_align;
-}
-
-static void * __meminit altmap_alloc_block_buf(unsigned long size,
+void * __meminit altmap_alloc_block_buf(unsigned long size,
                 struct vmem_altmap *altmap)
 {
-        unsigned long pfn, nr_pfns;
-        void *ptr;
+        unsigned long pfn, nr_pfns, nr_align;
 
         if (size & ~PAGE_MASK) {
                 pr_warn_once("%s: allocations must be multiple of PAGE_SIZE (%ld)\n",
@@ -141,25 +124,20 @@ static void * __meminit altmap_alloc_block_buf(unsigned long size,
                 return NULL;
         }
 
+        pfn = vmem_altmap_next_pfn(altmap);
         nr_pfns = size >> PAGE_SHIFT;
-        pfn = vmem_altmap_alloc(altmap, nr_pfns);
-        if (pfn < ULONG_MAX)
-                ptr = __va(__pfn_to_phys(pfn));
-        else
-                ptr = NULL;
-        pr_debug("%s: pfn: %#lx alloc: %ld align: %ld nr: %#lx\n",
-                        __func__, pfn, altmap->alloc, altmap->align, nr_pfns);
+        nr_align = 1UL << find_first_bit(&nr_pfns, BITS_PER_LONG);
+        nr_align = ALIGN(pfn, nr_align) - pfn;
+        if (nr_pfns + nr_align > vmem_altmap_nr_free(altmap))
+                return NULL;
 
-        return ptr;
-}
+        altmap->alloc += nr_pfns;
+        altmap->align += nr_align;
+        pfn += nr_align;
 
-/* need to make sure size is all the same during early stage */
-void * __meminit __vmemmap_alloc_block_buf(unsigned long size, int node,
-                struct vmem_altmap *altmap)
-{
-        if (altmap)
-                return altmap_alloc_block_buf(size, altmap);
-        return alloc_block_buf(size, node);
+        pr_debug("%s: pfn: %#lx alloc: %ld align: %ld nr: %#lx\n",
+                        __func__, pfn, altmap->alloc, altmap->align, nr_pfns);
+        return __va(__pfn_to_phys(pfn));
 }
 
 void __meminit vmemmap_verify(pte_t *pte, int node,
@@ -178,7 +156,7 @@ pte_t * __meminit vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node)
         pte_t *pte = pte_offset_kernel(pmd, addr);
         if (pte_none(*pte)) {
                 pte_t entry;
-                void *p = alloc_block_buf(PAGE_SIZE, node);
+                void *p = vmemmap_alloc_block_buf(PAGE_SIZE, node);
                 if (!p)
                         return NULL;
                 entry = pfn_pte(__pa(p) >> PAGE_SHIFT, PAGE_KERNEL);
@@ -278,7 +256,8 @@ int __meminit vmemmap_populate_basepages(unsigned long start,
         return 0;
 }
 
-struct page * __meminit sparse_mem_map_populate(unsigned long pnum, int nid)
+struct page * __meminit sparse_mem_map_populate(unsigned long pnum, int nid,
+                struct vmem_altmap *altmap)
 {
         unsigned long start;
         unsigned long end;
@@ -288,7 +267,7 @@ struct page * __meminit sparse_mem_map_populate(unsigned long pnum, int nid)
         start = (unsigned long)map;
         end = (unsigned long)(map + PAGES_PER_SECTION);
 
-        if (vmemmap_populate(start, end, nid))
+        if (vmemmap_populate(start, end, nid, altmap))
                 return NULL;
 
         return map;
@@ -318,7 +297,7 @@ void __init sparse_mem_maps_populate_node(struct page **map_map,
                 if (!present_section_nr(pnum))
                         continue;
 
-                map_map[pnum] = sparse_mem_map_populate(pnum, nodeid);
+                map_map[pnum] = sparse_mem_map_populate(pnum, nodeid, NULL);
                 if (map_map[pnum])
                         continue;
                 ms = __nr_to_section(pnum);