Merge tag 'libnvdimm-fixes-6.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

torvalds · torvalds · commit e4a55b555db6 · 2024-08-16T11:36:40.000-07:00
Pull libnvdimm fix from Ira Weiny: "Commit f467fee ("block: move the dax flag to queue_limits") broke the DAX tests by skipping over the legacy pmem mapping pages case. Set the DAX flag in this case as well" * tag 'libnvdimm-fixes-6.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: nvdimm/pmem: Set dax flag for all 'PFN_MAP' cases
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
@@ -498,7 +498,7 @@ static int pmem_attach_disk(struct device *dev,
 	}
 	if (fua)
 		lim.features |= BLK_FEAT_FUA;
-	if (is_nd_pfn(dev))
+	if (is_nd_pfn(dev) || pmem_should_map_pages(dev))
 		lim.features |= BLK_FEAT_DAX;
 
 	if (!devm_request_mem_region(dev, res->start, resource_size(res),

Original file line number	Diff line number	Diff line change
`@@ -498,7 +498,7 @@ static int pmem_attach_disk(struct device *dev,`
`498`	`498`	`}`
`499`	`499`	`if (fua)`
`500`	`500`	`lim.features \|= BLK_FEAT_FUA;`
`501`		`- if (is_nd_pfn(dev))`
	`501`	`+ if (is_nd_pfn(dev) \|\| pmem_should_map_pages(dev))`
`502`	`502`	`lim.features \|= BLK_FEAT_DAX;`
`503`	`503`
`504`	`504`	`if (!devm_request_mem_region(dev, res->start, resource_size(res),`