History

mm/memremap_pages: Introduce memremap_compat_align()

The "sub-section memory hotplug" facility allows memremap_pages() users like libnvdimm to compensate for hardware platforms like x86 that have a section size larger than their hardware memory mapping granularity. The compensation that sub-section support affords is being tolerant of physical memory resources shifting by units smaller (64MiB on x86) than the memory-hotplug section size (128 MiB). Where the platform physical-memory mapping granularity is limited by the number and capability of address-decode-registers in the memory controller. While the sub-section support allows memremap_pages() to operate on sub-section (2MiB) granularity, the Power architecture may still require 16MiB alignment on "!radix_enabled()" platforms. In order for libnvdimm to be able to detect and manage this per-arch limitation, introduce memremap_compat_align() as a common minimum alignment across all driver-facing memory-mapping interfaces, and let Power override it to 16MiB in the "!radix_enabled()" case. The assumption / requirement for 16MiB to be a viable memremap_compat_align() value is that Power does not have platforms where its equivalent of address-decode-registers never hardware remaps a persistent memory resource on smaller than 16MiB boundaries. Note that I tried my best to not add a new Kconfig symbol, but header include entanglements defeated the #ifndef memremap_compat_align design pattern and the need to export it defeats the __weak design pattern for arch overrides. Based on an initial patch by Aneesh.

Dan Williams committed 6 years ago

Commit 9ffc1d11 parent 1d0827b7 files · +58 −1Browse files

Unified · Split

7 files
  1. arch/powerpc/Kconfig +1 −0
  2. arch/powerpc/mm/ioremap.c +21 −0
  3. drivers/nvdimm/pfn_devs.c +1 −1
  4. include/linux/memremap.h +8 −0
  5. include/linux/mmzone.h +1 −0
  6. lib/Kconfig +3 −0
  7. mm/memremap.c +23 −0
arch/powerpc/Kconfig+1−0
@@ -122,6 +122,7 @@ config PPC · 121 unmodified lines
122122 select ARCH_HAS_GCOV_PROFILE_ALL
123123 select ARCH_HAS_KCOV
124124 select ARCH_HAS_HUGEPD if HUGETLB_PAGE
125+ select ARCH_HAS_MEMREMAP_COMPAT_ALIGN
125126 select ARCH_HAS_MMIOWB if PPC64
126127 select ARCH_HAS_PHYS_TO_DMA
127128 select ARCH_HAS_PMEM_API
arch/powerpc/mm/ioremap.c+21−0
@@ -2,6 +2,7 @@ · 1 unmodified line
22
33 #include <linux/io.h>
44 #include <linux/slab.h>
5+#include <linux/mmzone.h>
56 #include <linux/vmalloc.h>
67 #include <asm/io-workarounds.h>
78
@@ -97,3 +98,23 @@ void __iomem *do_ioremap(phys_addr_t pa, phys_addr_t offset, unsigned long size, · 89 unmodified lines
9798
9899 return NULL;
99100 }
101+
102+#ifdef CONFIG_ZONE_DEVICE
103+/*
104+ * Override the generic version in mm/memremap.c.
105+ *
106+ * With hash translation, the direct-map range is mapped with just one
107+ * page size selected by htab_init_page_sizes(). Consult
108+ * mmu_psize_defs[] to determine the minimum page size alignment.
109+*/
110+unsigned long memremap_compat_align(void)
111+{
112+ unsigned int shift = mmu_psize_defs[mmu_linear_psize].shift;
113+
114+ if (radix_enabled())
115+ return SUBSECTION_SIZE;
116+ return max(SUBSECTION_SIZE, 1UL << shift);
117+
118+}
119+EXPORT_SYMBOL_GPL(memremap_compat_align);
120+#endif
drivers/nvdimm/pfn_devs.c+1−1
@@ -750,7 +750,7 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn) · 749 unmodified lines
750750 start = nsio->res.start;
751751 size = resource_size(&nsio->res);
752752 npfns = PHYS_PFN(size - SZ_8K);
753− align = max(nd_pfn->align, (1UL << SUBSECTION_SHIFT));
753+ align = max(nd_pfn->align, SUBSECTION_SIZE);
754754 end_trunc = start + size - ALIGN_DOWN(start + size, align);
755755 if (nd_pfn->mode == PFN_MODE_PMEM) {
756756 /*
include/linux/memremap.h+8−0
@@ -132,6 +132,7 @@ struct dev_pagemap *get_dev_pagemap(unsigned long pfn, · 131 unmodified lines
132132
133133 unsigned long vmem_altmap_offset(struct vmem_altmap *altmap);
134134 void vmem_altmap_free(struct vmem_altmap *altmap, unsigned long nr_pfns);
135+unsigned long memremap_compat_align(void);
135136 #else
136137 static inline void *devm_memremap_pages(struct device *dev,
137138 struct dev_pagemap *pgmap)
@@ -165,6 +166,12 @@ static inline void vmem_altmap_free(struct vmem_altmap *altmap, · 27 unmodified lines
165166 unsigned long nr_pfns)
166167 {
167168 }
169+
170+/* when memremap_pages() is disabled all archs can remap a single page */
171+static inline unsigned long memremap_compat_align(void)
172+{
173+ return PAGE_SIZE;
174+}
168175 #endif /* CONFIG_ZONE_DEVICE */
169176
170177 static inline void put_dev_pagemap(struct dev_pagemap *pgmap)
@@ -172,4 +179,5 @@ static inline void put_dev_pagemap(struct dev_pagemap *pgmap) · 1 unmodified line
172179 if (pgmap)
173180 percpu_ref_put(pgmap->ref);
174181 }
182+
175183 #endif /* _LINUX_MEMREMAP_H_ */
include/linux/mmzone.h+1−0
@@ -1170,6 +1170,7 @@ static inline unsigned long section_nr_to_pfn(unsigned long sec) · 1169 unmodified lines
11701170 #define SECTION_ALIGN_DOWN(pfn) ((pfn) & PAGE_SECTION_MASK)
11711171
11721172 #define SUBSECTION_SHIFT 21
1173+#define SUBSECTION_SIZE (1UL << SUBSECTION_SHIFT)
11731174
11741175 #define PFN_SUBSECTION_SHIFT (SUBSECTION_SHIFT - PAGE_SHIFT)
11751176 #define PAGES_PER_SUBSECTION (1UL << PFN_SUBSECTION_SHIFT)
lib/Kconfig+3−0
@@ -615,6 +615,9 @@ config ARCH_HAS_PMEM_API · 614 unmodified lines
615615 config MEMREGION
616616 bool
617617
618+config ARCH_HAS_MEMREMAP_COMPAT_ALIGN
619+ bool
620+
618621 # use memcpy to implement user copies for nommu architectures
619622 config UACCESS_MEMCPY
620623 bool
mm/memremap.c+23−0
@@ -7,6 +7,7 @@ · 6 unmodified lines
77 #include <linux/mm.h>
88 #include <linux/pfn_t.h>
99 #include <linux/swap.h>
10+#include <linux/mmzone.h>
1011 #include <linux/swapops.h>
1112 #include <linux/types.h>
1213 #include <linux/wait_bit.h>
@@ -14,6 +15,28 @@ · 1 unmodified line
1415
1516 static DEFINE_XARRAY(pgmap_array);
1617
18+/*
19+ * The memremap() and memremap_pages() interfaces are alternately used
20+ * to map persistent memory namespaces. These interfaces place different
21+ * constraints on the alignment and size of the mapping (namespace).
22+ * memremap() can map individual PAGE_SIZE pages. memremap_pages() can
23+ * only map subsections (2MB), and at least one architecture (PowerPC)
24+ * the minimum mapping granularity of memremap_pages() is 16MB.
25+ *
26+ * The role of memremap_compat_align() is to communicate the minimum
27+ * arch supported alignment of a namespace such that it can freely
28+ * switch modes without violating the arch constraint. Namely, do not
29+ * allow a namespace to be PAGE_SIZE aligned since that namespace may be
30+ * reconfigured into a mode that requires SUBSECTION_SIZE alignment.
31+ */
32+#ifndef CONFIG_ARCH_HAS_MEMREMAP_COMPAT_ALIGN
33+unsigned long memremap_compat_align(void)
34+{
35+ return SUBSECTION_SIZE;
36+}
37+EXPORT_SYMBOL_GPL(memremap_compat_align);
38+#endif
39+
1740 #ifdef CONFIG_DEV_PAGEMAP_OPS
1841 DEFINE_STATIC_KEY_FALSE(devmap_managed_key);
1942 EXPORT_SYMBOL(devmap_managed_key);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t