FAILED: patch "[PATCH] libnvdimm, dax: fix 1GB-aligned namespaces vs physical" failed to apply to 4.9-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
41fce90f26333c4fa82e8e43b9ace86c4e8a0120Mon Sep 17 00:00:00 2001
From: Dan Williams <[email protected]>
Date: Mon, 4 Dec 2017 14:07:43 -0800
Subject: [PATCH] libnvdimm, dax: fix 1GB-aligned namespaces vs physical
misalignment
The following namespace configuration attempt:
# ndctl create-namespace -e namespace0.0 -m devdax -a 1G -f
libndctl: ndctl_dax_enable: dax0.1: failed to enable
Error: namespace0.0: failed to enablefailed to reconfigure namespace: No such device or address
...fails when the backing memory range is not physically aligned to 1G:
# cat /proc/iomem | grep Persistent
210000000-30fffffff : Persistent Memory (legacy)In the above example the 4G persistent memory range starts and ends on a 256MB boundary.
We handle this case correctly when needing to handle cases that violate section alignment (128MB) collisions against "System RAM", and we simply need to extend that padding/truncation for the 1GB alignment use case.
drivers/nvdimm/pfn_devs.c +12 -3
@@ -583,6 +583,12 @@ static struct vmem_altmap *__nvdimm_setup_pfn(struct nd_pfn *nd_pfn,return altmap; } +static u64 phys_pmem_align_down (struct nd_pfn *nd_pfn,u64 phys) +{ +return min_t (u64,PHYS_SECTION_ALIGN_DOWN (phys), +ALIGN_DOWN (phys, nd_pfn->align)); +} +static int nd_pfn_init (struct nd_pfn *nd_pfn) {u32 dax_label_reserve =is_nd_dax (&nd_pfn->dev) ?SZ_128K :0 ;
@@ -638,13 +644,16 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn) start = nsio->res.start; size =PHYS_SECTION_ALIGN_UP (start + size) - start;if (region_intersects (start, size,IORESOURCE_SYSTEM_RAM , -IORES_DESC_NONE ) ==REGION_MIXED ) { +IORES_DESC_NONE ) ==REGION_MIXED + || !IS_ALIGNED (start +resource_size (&nsio->res), + nd_pfn->align)) { size =resource_size (&nsio->res); - end_trunc = start + size -PHYS_SECTION_ALIGN_DOWN (start + size); + end_trunc = start + size -phys_pmem_align_down (nd_pfn, + start + size); }if (start_pad + end_trunc) -dev_info (&nd_pfn->dev,"%s section collision, truncate %d bytes\n" , +dev_info (&nd_pfn->dev,"%s alignment collision, truncate %d bytes\n" ,dev_name (&ndns->dev), start_pad + end_trunc);/*