Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

linvdimm, pmem: Preserve read-only setting for pmem devices

The pmem driver does not honor a forced read-only setting for very long:
$ blockdev --setro /dev/pmem0
$ blockdev --getro /dev/pmem0
1

followed by various commands like these:
$ blockdev --rereadpt /dev/pmem0
or
$ mkfs.ext4 /dev/pmem0

results in this in the kernel serial log:
nd_pmem namespace0.0: region0 read-write, marking pmem0 read-write

with the read-only setting lost:
$ blockdev --getro /dev/pmem0
0

That's from bus.c nvdimm_revalidate_disk(), which always applies the
setting from nd_region (which is initially based on the ACPI NFIT
NVDIMM state flags not_armed bit).

In contrast, commit 20bd1d026aac ("scsi: sd: Keep disk read-only when
re-reading partition") fixed this issue for SCSI devices to preserve
the previous setting if it was set to read-only.

This patch modifies bus.c to preserve any previous read-only setting.
It also eliminates the kernel serial log print except for cases where
read-write is changed to read-only, so it doesn't print read-only to
read-only non-changes.

Cc: <stable@vger.kernel.org>
Fixes: 581388209405 ("libnvdimm, nfit: handle unarmed dimms, mark namespaces read-only")
Signed-off-by: Robert Elliott <elliott@hpe.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

authored by

Robert Elliott and committed by
Dan Williams
254a4cd5 b04e2177

+9 -5
+9 -5
drivers/nvdimm/bus.c
··· 566 566 { 567 567 struct device *dev = disk_to_dev(disk)->parent; 568 568 struct nd_region *nd_region = to_nd_region(dev->parent); 569 - const char *pol = nd_region->ro ? "only" : "write"; 569 + int disk_ro = get_disk_ro(disk); 570 570 571 - if (nd_region->ro == get_disk_ro(disk)) 571 + /* 572 + * Upgrade to read-only if the region is read-only preserve as 573 + * read-only if the disk is already read-only. 574 + */ 575 + if (disk_ro || nd_region->ro == disk_ro) 572 576 return 0; 573 577 574 - dev_info(dev, "%s read-%s, marking %s read-%s\n", 575 - dev_name(&nd_region->dev), pol, disk->disk_name, pol); 576 - set_disk_ro(disk, nd_region->ro); 578 + dev_info(dev, "%s read-only, marking %s read-only\n", 579 + dev_name(&nd_region->dev), disk->disk_name); 580 + set_disk_ro(disk, 1); 577 581 578 582 return 0; 579 583