Message ID | 155000669130.348031.13764885263577554365.stgit@dwillia2-desk3.amr.corp.intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | libnvdimm/pfn: Fix section-alignment padding | expand |
Hi, [This is an automated email] This commit has been processed because it contains a "Fixes:" tag, fixing commit: 004f1afbe199 libnvdimm, pmem: direct map legacy pmem by default. The bot has tested the following trees: v4.20.8, v4.19.21, v4.14.99, v4.9.156, v4.4.174. v4.20.8: Build OK! v4.19.21: Build OK! v4.14.99: Build OK! v4.9.156: Build OK! v4.4.174: Failed to apply! Possible dependencies: 0caeef63e6d2 ("libnvdimm: Add a poison list and export badblocks") 0e749e54244e ("dax: increase granularity of dax_clear_blocks() operations") 34c0fd540e79 ("mm, dax, pmem: introduce pfn_t") 4b94ffdc4163 ("x86, mm: introduce vmem_altmap to augment vmemmap_populate()") 52db400fcd50 ("pmem, dax: clean up clear_pmem()") 87ba05dff351 ("libnvdimm: don't fail init for full badblocks list") 9476df7d80df ("mm: introduce find_dev_pagemap()") ad9a8bde2cb1 ("libnvdimm, pmem: move definition of nvdimm_namespace_add_poison to nd.h") b2e0d1625e19 ("dax: fix lifetime of in-kernel dax mappings with dax_map_atomic()") b95f5f4391fa ("libnvdimm: convert to statically allocated badblocks") cfe30b872058 ("libnvdimm, pmem: adjust for section collisions with 'System RAM'") d2c0f041e1bb ("libnvdimm, pfn, pmem: allocate memmap array in persistent memory") d9cbe09d39aa ("libnvdimm, pmem: fix 'pfn' support for section-misaligned namespaces") How should we proceed with this patch? -- Thanks, Sasha
Hi, [This is an automated email] This commit has been processed because it contains a "Fixes:" tag, fixing commit: 004f1afbe199 libnvdimm, pmem: direct map legacy pmem by default. The bot has tested the following trees: v4.20.8, v4.19.21, v4.14.99, v4.9.156, v4.4.174. v4.20.8: Build OK! v4.19.21: Build OK! v4.14.99: Build OK! v4.9.156: Build OK! v4.4.174: Failed to apply! Possible dependencies: 0caeef63e6d2 ("libnvdimm: Add a poison list and export badblocks") 0e749e54244e ("dax: increase granularity of dax_clear_blocks() operations") 34c0fd540e79 ("mm, dax, pmem: introduce pfn_t") 4b94ffdc4163 ("x86, mm: introduce vmem_altmap to augment vmemmap_populate()") 52db400fcd50 ("pmem, dax: clean up clear_pmem()") 87ba05dff351 ("libnvdimm: don't fail init for full badblocks list") 9476df7d80df ("mm: introduce find_dev_pagemap()") ad9a8bde2cb1 ("libnvdimm, pmem: move definition of nvdimm_namespace_add_poison to nd.h") b2e0d1625e19 ("dax: fix lifetime of in-kernel dax mappings with dax_map_atomic()") b95f5f4391fa ("libnvdimm: convert to statically allocated badblocks") cfe30b872058 ("libnvdimm, pmem: adjust for section collisions with 'System RAM'") d2c0f041e1bb ("libnvdimm, pfn, pmem: allocate memmap array in persistent memory") d9cbe09d39aa ("libnvdimm, pmem: fix 'pfn' support for section-misaligned namespaces") How should we proceed with this patch? -- Thanks, Sasha
diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c index 4b077555ac70..33a3b23b3db7 100644 --- a/drivers/nvdimm/namespace_devs.c +++ b/drivers/nvdimm/namespace_devs.c @@ -138,6 +138,7 @@ bool nd_is_uuid_unique(struct device *dev, u8 *uuid) bool pmem_should_map_pages(struct device *dev) { struct nd_region *nd_region = to_nd_region(dev->parent); + struct nd_namespace_common *ndns = to_ndns(dev); struct nd_namespace_io *nsio; if (!IS_ENABLED(CONFIG_ZONE_DEVICE)) @@ -149,6 +150,9 @@ bool pmem_should_map_pages(struct device *dev) if (is_nd_pfn(dev) || is_nd_btt(dev)) return false; + if (ndns->force_raw) + return false; + nsio = to_nd_namespace_io(dev); if (region_intersects(nsio->res.start, resource_size(&nsio->res), IORESOURCE_SYSTEM_RAM,
For recovery, where non-dax access is needed to a given physical address range, and testing, allow the 'force_raw' attribute to override the default establishment of a dev_pagemap. Otherwise without this capability it is possible to end up with a namespace that can not be activated due to corrupted info-block, and one that can not be repaired due to a section collision. Cc: <stable@vger.kernel.org> Fixes: 004f1afbe199 ("libnvdimm, pmem: direct map legacy pmem by default") Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- drivers/nvdimm/namespace_devs.c | 4 ++++ 1 file changed, 4 insertions(+)