nvdimm: preserve read-only setting for pmem devices
PATCH 1/1 nvdimm: preserve read-only setting for pmem devices
The pmem driver don't 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.
--- drivers/nvdimm/bus.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/nvdimm/bus.c +8 -5
@@ -566,14 +566,17 @@ int nvdimm_revalidate_disk(struct gendisk *disk) {struct device *dev =disk_to_dev (disk)->parent;struct nd_region *nd_region =to_nd_region (dev->parent); -const char *pol = nd_region->ro ?"only" :"write" ; +int disk_ro =get_disk_ro (disk); -if (nd_region->ro ==get_disk_ro (disk)) +/* upgrade to read-only if the region is read-only +* preserve as read-only if the disk is already read-only +*/ +if (disk_ro || nd_region->ro == disk_ro)return 0 ; -dev_info (dev,"%s read-%s, marking %s read-%s\n" , -dev_name (&nd_region->dev), pol, disk->disk_name, pol); -set_disk_ro (disk, nd_region->ro); +dev_info (dev,"%s read-only, marking %s read-only\n" , +dev_name (&nd_region->dev), disk->disk_name); +set_disk_ro (disk,1 );return 0 ;
Signature · 6 lines
2.14.3 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
Quoted 25 lines · Robert Elliott
The pmem driver don't honor a forced read-only setting for very long:
$ blockdev --setro /dev/pmem0 $ blockdev --getro /dev/pmem0 1followed by various commands like these:
$ blockdev --rereadpt /dev/pmem0 or $ mkfs.ext4 /dev/pmem0results in this in the kernel serial log:
nd_pmemnamespace0.0: region0 read-write, marking pmem0 read-writewith the read-only setting lost:
$ blockdev --getro /dev/pmem0 0That's from
bus.cnvdimm_revalidate_disk(), which always applies the setting fromnd_region(which is initially based on the ACPI NFIT NVDIMM state flagsnot_armedbit).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.
Quoted 6 lines
This patch modifies
bus.cto 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.Signed-off-by Robert Elliott <[email protected]>
Looks good to me. I'll also add the FIxes: tag and Cc: stable when applying.
One small nit below that I'll fixup when applying.
Quoted 11 lines
--- drivers/nvdimm/bus.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)drivers/nvdimm/bus.c +0
-0@@ -566,14 +566,17 @@ int nvdimm_revalidate_disk(struct gendisk *disk) {struct device *dev =disk_to_dev (disk)->parent;
drivers/nvdimm/bus.c int nvdimm_revalidate_disk(struct gendisk *disk) · line 575
Quoted 10 lines
drivers/nvdimm/bus.c +5
-2struct nd_region *nd_region =to_nd_region (dev->parent); -const char *pol = nd_region->ro ?"only" :"write" ; +int disk_ro =get_disk_ro (disk); -if (nd_region->ro ==get_disk_ro (disk)) +/* upgrade to read-only if the region is read-only +* preserve as read-only if the disk is already read-only +*/ +if (disk_ro || nd_region->ro == disk_ro)return 0 ;
The comment style in libnvdimm for a multi-line comment starts with /* on a line by itself.
_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm