Commit 9b06860d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull libnvdimm and dax updates from Dan Williams:
 "There were multiple touches outside of drivers/nvdimm/ this round to
  add cross arch compatibility to the devm_memremap_pages() interface,
  enhance numa information for persistent memory ranges, and add a
  zero_page_range() dax operation.

  This cycle I switched from the patchwork api to Konstantin's b4 script
  for collecting tags (from x86, PowerPC, filesystem, and device-mapper
  folks), and everything looks to have gone ok there. This has all
  appeared in -next with no reported issues.

  Summary:

   - Add support for region alignment configuration and enforcement to
     fix compatibility across architectures and PowerPC page size
     configurations.

   - Introduce 'zero_page_range' as a dax operation. This facilitates
     filesystem-dax operation without a block-device.

   - Introduce phys_to_target_node() to facilitate drivers that want to
     know resulting numa node if a given reserved address range was
     onlined.

   - Advertise a persistence-domain for of_pmem and papr_scm. The
     persistence domain indicates where cpu-store cycles need to reach
     in the platform-memory subsystem before the platform will consider
     them power-fail protected.

   - Promote numa_map_to_online_node() to a cross-kernel generic
     facility.

   - Save x86 numa information to allow for node-id lookups for reserved
     memory ranges, deploy that capability for the e820-pmem driver.

   - Pick up some miscellaneous minor fixes, that missed v5.6-final,
     including a some smatch reports in the ioctl path and some unit
     test compilation fixups.

   - Fixup some flexible-array declarations"

* tag 'libnvdimm-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: (29 commits)
  dax: Move mandatory ->zero_page_range() check in alloc_dax()
  dax,iomap: Add helper dax_iomap_zero() to zero a range
  dax: Use new dax zero page method for zeroing a page
  dm,dax: Add dax zero_page_range operation
  s390,dcssblk,dax: Add dax zero_page_range operation to dcssblk driver
  dax, pmem: Add a dax operation zero_page_range
  pmem: Add functions for reading/writing page to/from pmem
  libnvdimm: Update persistence domain value for of_pmem and papr_scm device
  tools/test/nvdimm: Fix out of tree build
  libnvdimm/region: Fix build error
  libnvdimm/region: Replace zero-length array with flexible-array member
  libnvdimm/label: Replace zero-length array with flexible-array member
  ACPI: NFIT: Replace zero-length array with flexible-array member
  libnvdimm/region: Introduce an 'align' attribute
  libnvdimm/region: Introduce NDD_LABELING
  libnvdimm/namespace: Enforce memremap_compat_align()
  libnvdimm/pfn: Prevent raw mode fallback if pfn-infoblock valid
  libnvdimm: Out of bounds read in __nd_ioctl()
  acpi/nfit: improve bounds checking for 'func'
  mm/memremap_pages: Introduce memremap_compat_align()
  ...
parents 0906d8b9 f6d2b802

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -9670,6 +9670,7 @@ F: drivers/acpi/nfit/* 
F:	include/linux/nd.h

F:	include/linux/libnvdimm.h

F:	include/uapi/linux/ndctl.h

F:	tools/testing/nvdimm/















LICENSES and SPDX stuff















M:	Thomas Gleixner <tglx@linutronix.de>

































arch/powerpc/Kconfig



+1
−0






























Original line number
Diff line number
Diff line








@@ -122,6 +122,7 @@ config PPC













	select ARCH_HAS_GCOV_PROFILE_ALL















	select ARCH_HAS_KCOV















	select ARCH_HAS_HUGEPD			if HUGETLB_PAGE













	select ARCH_HAS_MEMREMAP_COMPAT_ALIGN















	select ARCH_HAS_MMIOWB			if PPC64















	select ARCH_HAS_PHYS_TO_DMA















	select ARCH_HAS_PMEM_API

































arch/powerpc/mm/ioremap.c



+21
−0






























Original line number
Diff line number
Diff line








@@ -2,6 +2,7 @@





























#include <linux/io.h>















#include <linux/slab.h>













#include <linux/mmzone.h>















#include <linux/vmalloc.h>















#include <asm/io-workarounds.h>


























@@ -97,3 +98,23 @@ void __iomem *do_ioremap(phys_addr_t pa, phys_addr_t offset, unsigned long size,





























	return NULL;















}



























#ifdef CONFIG_ZONE_DEVICE













/*













 * Override the generic version in mm/memremap.c.













 *













 * With hash translation, the direct-map range is mapped with just one













 * page size selected by htab_init_page_sizes(). Consult













 * mmu_psize_defs[] to determine the minimum page size alignment.













*/













unsigned long memremap_compat_align(void)













{













	unsigned int shift = mmu_psize_defs[mmu_linear_psize].shift;



























	if (radix_enabled())













		return SUBSECTION_SIZE;













	return max(SUBSECTION_SIZE, 1UL << shift);



























}













EXPORT_SYMBOL_GPL(memremap_compat_align);













#endif
























arch/powerpc/platforms/pseries/papr_scm.c



+5
−22






























Original line number
Diff line number
Diff line








@@ -286,25 +286,6 @@ static int papr_scm_ndctl(struct nvdimm_bus_descriptor *nd_desc,













	return 0;















}





























static inline int papr_scm_node(int node)













{













	int min_dist = INT_MAX, dist;













	int nid, min_node;



























	if ((node == NUMA_NO_NODE) || node_online(node))













		return node;



























	min_node = first_online_node;













	for_each_online_node(nid) {













		dist = node_distance(node, nid);













		if (dist < min_dist) {













			min_dist = dist;













			min_node = nid;













		}













	}













	return min_node;













}





























static int papr_scm_nvdimm_init(struct papr_scm_priv *p)















{















	struct device *dev = &p->pdev->dev;









@@ -329,7 +310,7 @@ static int papr_scm_nvdimm_init(struct papr_scm_priv *p)













	}































	dimm_flags = 0;













	set_bit(NDD_ALIASING, &dimm_flags);













	set_bit(NDD_LABELING, &dimm_flags);































	p->nvdimm = nvdimm_create(p->bus, p, NULL, dimm_flags,















				  PAPR_SCM_DIMM_CMD_MASK, 0, NULL);









@@ -350,7 +331,7 @@ static int papr_scm_nvdimm_init(struct papr_scm_priv *p)





























	memset(&ndr_desc, 0, sizeof(ndr_desc));















	target_nid = dev_to_node(&p->pdev->dev);













	online_nid = papr_scm_node(target_nid);













	online_nid = numa_map_to_online_node(target_nid);















	ndr_desc.numa_node = online_nid;















	ndr_desc.target_node = target_nid;















	ndr_desc.res = &p->res;









@@ -362,8 +343,10 @@ static int papr_scm_nvdimm_init(struct papr_scm_priv *p)





























	if (p->is_volatile)















		p->region = nvdimm_volatile_region_create(p->bus, &ndr_desc);













	else













	else {













		set_bit(ND_REGION_PERSIST_MEMCTRL, &ndr_desc.flags);















		p->region = nvdimm_pmem_region_create(p->bus, &ndr_desc);













	}















	if (!p->region) {















		dev_err(dev, "Error registering region %pR from %pOF\n",















				ndr_desc.res, p->dn);

































arch/x86/Kconfig



+1
−0






























Original line number
Diff line number
Diff line








@@ -1661,6 +1661,7 @@ config X86_PMEM_LEGACY













	depends on PHYS_ADDR_T_64BIT















	depends on BLK_DEV















	select X86_PMEM_LEGACY_DEVICE













	select NUMA_KEEP_MEMINFO if NUMA















	select LIBNVDIMM















	help















	  Treat memory marked using the non-standard e820 type of 12 as used









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE