split hard read-only vs read-only policy v2
Subsystems (5)
Christoph Hellwig
maintainerHi Jens,
this series resurrects a patch from Martin to properly split the flag indicating a disk has been set read-only by the hardware vs the userspace policy set through the BLKROSET ioctl.
Note that the last patch only applies to for-next and not to for-5.11/block. I can hold it back for the first NVMe pull request after Linus pulled the block tree.
A git tree is available here:
git://git.infradead.org/users/hch/block.git block-hard-ro
Gitweb:
http://git.infradead.org/users/hch/block.git/shortlog/refs/heads/block-hard-ro
Changes since v2:
- fix a few typos
- add a patch to propagate the read-only status from the whole device to partitions
- add a patch to remove a pointless check from bdev_read_only
Changes since v1:
- don't propagate the policy flag from the whole disk to partitions
- rebased on top of the merge block_device and hd_struct series
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Christoph Hellwig
maintainerPATCH 1/6 dm: use bdev_read_only to check if a device is read-only
dm-thin and dm-cache also work on partitions, so use the proper interface to check if the device is read-only.
--- drivers/md/dm-cache-metadata.c | 2 +- drivers/md/dm-thin-metadata.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/md/dm-cache-metadata.c +1 -1
@@ -449,7 +449,7 @@ static int __check_incompat_features(struct cache_disk_superblock *disk_super,/* * Check for read-only metadata to skip the following RDWR checks. */ -if (get_disk_ro (cmd->bdev->bd_disk)) +if (bdev_read_only (cmd->bdev))return 0 ; features =le32_to_cpu (disk_super->compat_ro_flags) & ~DM_CACHE_FEATURE_COMPAT_RO_SUPP ;
drivers/md/dm-thin-metadata.c +1 -1
@@ -636,7 +636,7 @@ static int __check_incompat_features(struct thin_disk_superblock *disk_super,/* * Check for read-only metadata to skip the following RDWR checks. */ -if (get_disk_ro (pmd->bdev->bd_disk)) +if (bdev_read_only (pmd->bdev))return 0 ; features =le32_to_cpu (disk_super->compat_ro_flags) & ~THIN_FEATURE_COMPAT_RO_SUPP ;
Signature · 7 lines
2.29.2 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Re: [PATCH 1/6] dm: use bdev_read_only to check if a device is read-only
Christoph,
Quoted 2 lines
dm-thin and dm-cache also work on partitions, so use the proper interface to check if the device is read-only.
Signature · 6 lines
Martin K. Petersen Oracle Linux Engineering _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Re: [PATCH 1/6] dm: use bdev_read_only to check if a device is read-only
In reply to Christoph HellwigQuoted 39 lines · Christoph Hellwig
dm-thin and dm-cache also work on partitions, so use the proper interface to check if the device is read-only.
Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>--- drivers/md/dm-cache-metadata.c | 2 +- drivers/md/dm-thin-metadata.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/md/dm-cache-metadata.c +1
-1@@ -449,7 +449,7 @@ static int __check_incompat_features(struct cache_disk_superblock *disk_super,/* * Check for read-only metadata to skip the following RDWR checks. */ -if (get_disk_ro (cmd->bdev->bd_disk)) +if (bdev_read_only (cmd->bdev))return 0 ; features =le32_to_cpu (disk_super->compat_ro_flags) & ~DM_CACHE_FEATURE_COMPAT_RO_SUPP ;drivers/md/dm-thin-metadata.c +1
-1@@ -636,7 +636,7 @@ static int __check_incompat_features(struct thin_disk_superblock *disk_super,/* * Check for read-only metadata to skip the following RDWR checks. */ -if (get_disk_ro (pmd->bdev->bd_disk)) +if (bdev_read_only (pmd->bdev))return 0 ; features =le32_to_cpu (disk_super->compat_ro_flags) & ~THIN_FEATURE_COMPAT_RO_SUPP ;Signature · 1 line
2.29.2
Signature · 6 lines
Ming -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
Christoph Hellwig
maintainerPATCH 2/6 block: remove the NULL bdev check in bdev_read_only
In reply to Christoph HellwigOnly a single caller can end up in bdev_read_only, so move the check there.
--- block/genhd.c | 3 --- fs/super.c | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-)
block/genhd.c +0 -3
@@ -1445,11 +1445,8 @@ EXPORT_SYMBOL(set_disk_ro);int bdev_read_only (struct block_device *bdev) { -if (!bdev) -return 0 ;return bdev->bd_read_only; } -EXPORT_SYMBOL (bdev_read_only);/*
fs/super.c +2 -1
@@ -865,7 +865,8 @@ int reconfigure_super(struct fs_context *fc)if (fc->sb_flags_mask &SB_RDONLY ) {#ifdef CONFIG_BLOCK -if (!(fc->sb_flags &SB_RDONLY ) &&bdev_read_only (sb->s_bdev)) +if (!(fc->sb_flags &SB_RDONLY ) && sb->s_bdev && +bdev_read_only (sb->s_bdev))return -EACCES ;#endif
Signature · 7 lines
2.29.2 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Re: [PATCH 2/6] block: remove the NULL bdev check in bdev_read_only
Christoph,
Quoted 1 line
Only a single caller can end up in
bdev_read_only, so move the check there.
Signature · 6 lines
Martin K. Petersen Oracle Linux Engineering _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Re: [PATCH 2/6] block: remove the NULL bdev check in bdev_read_only
In reply to Christoph HellwigQuoted 41 lines · Christoph Hellwig
Only a single caller can end up in
bdev_read_only, so move the check there.Signed-off-by Christoph Hellwig <[email protected]>--- block/genhd.c | 3 --- fs/super.c | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-)block/genhd.c +0
-3@@ -1445,11 +1445,8 @@ EXPORT_SYMBOL(set_disk_ro);int bdev_read_only (struct block_device *bdev) { -if (!bdev) -return 0 ;return bdev->bd_read_only; } -EXPORT_SYMBOL (bdev_read_only);/* fs/super.c +2
-1@@ -865,7 +865,8 @@ int reconfigure_super(struct fs_context *fc)if (fc->sb_flags_mask &SB_RDONLY ) {#ifdef CONFIG_BLOCK -if (!(fc->sb_flags &SB_RDONLY ) &&bdev_read_only (sb->s_bdev)) +if (!(fc->sb_flags &SB_RDONLY ) && sb->s_bdev && +bdev_read_only (sb->s_bdev))return -EACCES ;#endif Signature · 1 line
2.29.2
Signature · 7 lines
Ming _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Christoph Hellwig
maintainerPATCH 3/6 block: add a hard-readonly flag to struct gendisk
In reply to Christoph HellwigCommit 20bd1d026aac ("scsi: sd: Keep disk read-only when re-reading partition") addressed a long-standing problem with user read-only policy being overridden as a result of a device-initiated revalidate. The commit has since been reverted due to a regression that left some USB devices read-only indefinitely.
To fix the underlying problems with revalidate we need to keep track of hardware state and user policy separately.
The gendisk has been updated to reflect the current hardware state set by the device driver. This is done to allow returning the device to the hardware state once the user clears the BLKROSET flag.
The resulting semantics are as follows:
- If BLKROSET sets a given partition read-only, that partition will remain read-only even if the underlying storage stack initiates a revalidate. However, the BLKRRPART ioctl will cause the partition table to be dropped and any user policy on partitions will be lost.
- If BLKROSET has not been set, both the whole disk device and any partitions will reflect the current write-protect state of the underlying device.
Based on a patch from Martin K. Petersen <[email protected]>.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=201221
--- block/blk-core.c | 2 +- block/genhd.c | 33 +++++++++++++++++++-------------- block/partitions/core.c | 3 +-- include/linux/genhd.h | 6 ++++-- 4 files changed, 25 insertions(+), 19 deletions(-)
block/blk-core.c +1 -1
@@ -693,7 +693,7 @@ static inline bool should_fail_request(struct block_device *part,static inline bool bio_check_ro (struct bio *bio) { -if (op_is_write (bio_op (bio)) && bio->bi_bdev->bd_read_only) { +if (op_is_write (bio_op (bio)) &&bdev_read_only (bio->bi_bdev)) char b[BDEVNAME_SIZE];if (op_is_flush (bio->bi_opf) && !bio_sectors (bio))
block/genhd.c +19 -14
@@ -1425,27 +1425,32 @@ static void set_disk_ro_uevent(struct gendisk *gd, int ro)kobject_uevent_env (&disk_to_dev (gd)->kobj,KOBJ_CHANGE , envp); } -void set_disk_ro (struct gendisk *disk,int flag) +/** +* set_disk_ro - set a gendisk read-only +* @disk: gendisk to operate on +* @ready_only: %true to set the disk read-only, %false set the disk read/write +* +* This function is used to indicate whether a given disk device should have its +* read-only flag set. set_disk_ro() is typically used by device drivers to +* indicate whether the underlying physical device is write-protected. +*/ +void set_disk_ro (struct gendisk *disk,bool read_only) { -struct disk_part_iter piter; -struct block_device *part; - -if (disk->part0->bd_read_only != flag) { -set_disk_ro_uevent (disk, flag); - disk->part0->bd_read_only = flag; +if (read_only) { +if (test_and_set_bit (GD_READ_ONLY , &disk->state)) +return ; + }else { +if (!test_and_clear_bit (GD_READ_ONLY , &disk->state)) +return ; } - -disk_part_iter_init (&piter, disk,DISK_PITER_INCL_EMPTY ); -while ((part =disk_part_iter_next (&piter))) - part->bd_read_only = flag; -disk_part_iter_exit (&piter); +set_disk_ro_uevent (disk, read_only); } -EXPORT_SYMBOL (set_disk_ro);int bdev_read_only (struct block_device *bdev) { -return bdev->bd_read_only; +return bdev->bd_read_only || +test_bit (GD_READ_ONLY , &bdev->bd_disk->state); }EXPORT_SYMBOL (bdev_read_only);
block/partitions/core.c +1 -2
@@ -194,7 +194,7 @@ static ssize_t part_start_show(struct device *dev,static ssize_t part_ro_show (struct device *dev,struct device_attribute *attr,char *buf) { -return sprintf (buf,"%d\n" ,dev_to_bdev (dev)->bd_read_only); +return sprintf (buf,"%d\n" ,bdev_read_only (dev_to_bdev (dev))); } static ssize_t part_alignment_offset_show(struct device *dev,
@@ -348,7 +348,6 @@ static struct block_device *add_partition(struct gendisk *disk, int partno, bdev->bd_start_sect = start;bdev_set_nr_sectors (bdev, len); - bdev->bd_read_only =get_disk_ro (disk);if (info) { err = -ENOMEM ;
include/linux/genhd.h +4 -2
@@ -152,6 +152,7 @@ struct gendisk {int flags;unsigned long state;#define GD_NEED_PART_SCAN 0 +#define GD_READ_ONLY 1struct kobject *slave_dir;struct timer_rand_state *random;
@@ -238,11 +239,12 @@ static inline void add_disk_no_queue_reg(struct gendisk *disk)extern void del_gendisk (struct gendisk *gp);extern struct block_device *bdget_disk (struct gendisk *disk,int partno); -extern void set_disk_ro (struct gendisk *disk,int flag); +void set_disk_ro (struct gendisk *disk,bool read_only);static inline int get_disk_ro (struct gendisk *disk) { -return disk->part0->bd_read_only; +return disk->part0->bd_read_only || +test_bit (GD_READ_ONLY , &disk->state); }extern void disk_block_events (struct gendisk *disk);
Signature · 7 lines
2.29.2 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Re: [PATCH 3/6] block: add a hard-readonly flag to struct gendisk
Christoph,
Quoted 5 lines
Commit
20bd1d026aac("scsi: sd: Keep disk read-only when re-reading partition") addressed a long-standing problem with user read-only policy being overridden as a result of a device-initiated revalidate. The commit has since been reverted due to a regression that left some USB devices read-only indefinitely.
Signature · 6 lines
Martin K. Petersen Oracle Linux Engineering _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Re: [PATCH 3/6] block: add a hard-readonly flag to struct gendisk
In reply to Christoph HellwigChristoph,
block/blk-core.c static inline bool should_fail_request(struct block_device *part, · line 696
Quoted 10 lines
block/blk-core.c +1
-1@@ -693,7 +693,7 @@ static inline bool should_fail_request(struct block_device *part,static inline bool bio_check_ro (struct bio *bio) { -if (op_is_write (bio_op (bio)) && bio->bi_bdev->bd_read_only) { +if (op_is_write (bio_op (bio)) &&bdev_read_only (bio->bi_bdev))
Build failure, opening brace is missing ^^^^^
Quoted 3 lines
block/blk-core.c +0
-0char b[BDEVNAME_SIZE ];if (op_is_flush (bio->bi_opf) && !bio_sectors (bio))
Signature · 6 lines
Martin K. Petersen Oracle Linux Engineering _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Re: [PATCH 3/6] block: add a hard-readonly flag to struct gendisk
In reply to Christoph HellwigQuoted 90 lines · Christoph Hellwig
Commit
20bd1d026aac("scsi: sd: Keep disk read-only when re-reading partition") addressed a long-standing problem with user read-only policy being overridden as a result of a device-initiated revalidate. The commit has since been reverted due to a regression that left some USB devices read-only indefinitely.To fix the underlying problems with revalidate we need to keep track of hardware state and user policy separately.
The gendisk has been updated to reflect the current hardware state set by the device driver. This is done to allow returning the device to the hardware state once the user clears the BLKROSET flag.
The resulting semantics are as follows:
- If BLKROSET sets a given partition read-only, that partition will remain read-only even if the underlying storage stack initiates a revalidate. However, the BLKRRPART ioctl will cause the partition table to be dropped and any user policy on partitions will be lost.
- If BLKROSET has not been set, both the whole disk device and any partitions will reflect the current write-protect state of the underlying device.
Based on a patch from Martin K. Petersen <[email protected]>.
Reported-by Oleksii Kurochko <[email protected]>Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=201221
Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>--- block/blk-core.c | 2 +- block/genhd.c | 33 +++++++++++++++++++-------------- block/partitions/core.c | 3 +-- include/linux/genhd.h | 6 ++++-- 4 files changed, 25 insertions(+), 19 deletions(-)block/blk-core.c +1
-1@@ -693,7 +693,7 @@ static inline bool should_fail_request(struct block_device *part,static inline bool bio_check_ro (struct bio *bio) { -if (op_is_write (bio_op (bio)) && bio->bi_bdev->bd_read_only) { +if (op_is_write (bio_op (bio)) &&bdev_read_only (bio->bi_bdev)) char b[BDEVNAME_SIZE];if (op_is_flush (bio->bi_opf) && !bio_sectors (bio))block/genhd.c +17
-12@@ -1425,27 +1425,32 @@ static void set_disk_ro_uevent(struct gendisk *gd, int ro)kobject_uevent_env (&disk_to_dev (gd)->kobj,KOBJ_CHANGE , envp); } -void set_disk_ro (struct gendisk *disk,int flag) +/** +* set_disk_ro - set a gendisk read-only +* @disk: gendisk to operate on +* @ready_only: %true to set the disk read-only, %false set the disk read/write +* +* This function is used to indicate whether a given disk device should have its +* read-only flag set. set_disk_ro() is typically used by device drivers to +* indicate whether the underlying physical device is write-protected. +*/ +void set_disk_ro (struct gendisk *disk,bool read_only) { -struct disk_part_iter piter; -struct block_device *part; - -if (disk->part0->bd_read_only != flag) { -set_disk_ro_uevent (disk, flag); - disk->part0->bd_read_only = flag; +if (read_only) { +if (test_and_set_bit (GD_READ_ONLY , &disk->state)) +return ; + }else { +if (!test_and_clear_bit (GD_READ_ONLY , &disk->state)) +return ; } - -disk_part_iter_init (&piter, disk,DISK_PITER_INCL_EMPTY ); -while ((part =disk_part_iter_next (&piter))) - part->bd_read_only = flag; -disk_part_iter_exit (&piter); +set_disk_ro_uevent (disk, read_only); }
block/genhd.c static void set_disk_ro_uevent(struct gendisk *gd, int ro) · line 1455
Quoted 10 lines
block/genhd.c +2
-2-EXPORT_SYMBOL (set_disk_ro);int bdev_read_only (struct block_device *bdev) { -return bdev->bd_read_only; +return bdev->bd_read_only || +test_bit (GD_READ_ONLY , &bdev->bd_disk->state); }EXPORT_SYMBOL (bdev_read_only);
Maybe one inline version can be added for fast path(bio_check_ro()), and the approach is good:
Signature · 6 lines
Ming -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
Christoph Hellwig
maintainerRe: [PATCH 3/6] block: add a hard-readonly flag to struct gendisk
Quoted 10 lines · Ming Lei
block/genhd.c static void set_disk_ro_uevent(struct gendisk *gd, int ro) · line 1455
Quoted 7 lines
int
bdev_read_only(struct block_device *bdev)
{block/genhd.c +2
-1-return bdev->bd_read_only; +return bdev->bd_read_only || +test_bit (GD_READ_ONLY , &bdev->bd_disk->state); }EXPORT_SYMBOL (bdev_read_only);Maybe one inline version can be added for fast path(bio_check_ro()), and the approach is good:
I thought of that, but our header mess means it would have to be a macro. I have a plan to reorganize the headers in the not too far future, at which point this should become an inline.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Christoph Hellwig
maintainerPATCH 4/6 block: propagate BLKROSET on the whole device to all partitions
In reply to Christoph HellwigChange the policy so that a BLKROSET on the whole device also affects partitions. To quote Martin K. Petersen:
It's very common for database folks to twiddle the read-only state of block devices and partitions. I know that our users will find it very counter-intuitive that setting /dev/sda read-only won't prevent writes to /dev/sda1.
The existing behavior is inconsistent in the sense that doing:
permits writes. But:
<something triggers revalidate>
doesn't.
And a subsequent:
doesn't work either since sda1's read-only policy has been inherited from the whole-disk device.
You need to do:
after setting the whole-disk device rw to effectuate the same change on the partitions, otherwise they are stuck being read-only indefinitely.
However, setting the read-only policy on a partition does *not* require the revalidate step. As a matter of fact, doing the revalidate will blow away the policy setting you just made.
So the user needs to take different actions depending on whether they are trying to read-protect a whole-disk device or a partition. Despite using the same ioctl. That is really confusing.
I have lost count how many times our customers have had data clobbered because of ambiguity of the existing whole-disk device policy. The current behavior violates the principle of least surprise by letting the user think they write protected the whole disk when they actually didn't.
--- block/genhd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
block/genhd.c +1 -2
@@ -1449,8 +1449,7 @@ EXPORT_SYMBOL(set_disk_ro);int bdev_read_only (struct block_device *bdev) { -return bdev->bd_read_only || -test_bit (GD_READ_ONLY , &bdev->bd_disk->state); +return bdev->bd_read_only ||get_disk_ro (bdev->bd_disk); }EXPORT_SYMBOL (bdev_read_only);
Signature · 7 lines
2.29.2 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Re: [PATCH 4/6] block: propagate BLKROSET on the whole device to all partitions
Christoph,
Quoted 9 lines
The existing behavior is inconsistent in the sense that doing:
permits writes. But:
<something triggers revalidate>
doesn't.
And a subsequent:
Looks like the command line pieces got zapped from the commit description.
In any case this fixes the issue for me. My read-only blktests succeed with this change in place.
Signature · 6 lines
Martin K. Petersen Oracle Linux Engineering _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Christoph Hellwig
maintainerRe: [PATCH 4/6] block: propagate BLKROSET on the whole device to all partitions
Quoted 7 lines · Martin K. Petersen
Christoph,
Quoted 4 lines
The existing behavior is inconsistent in the sense that doing:
permits writes. But:
Quoted 8 lines
Quoted 5 lines
<something triggers revalidate>
doesn't.
And a subsequent:
Looks like the command line pieces got zapped from the commit description.
Yeah. It seems like git commit just removed them after I pasted them, weird.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Re: [PATCH 4/6] block: propagate BLKROSET on the whole device to all partitions
Quoted 12 lines · Christoph Hellwig
Quoted 11 lines · Martin K. Petersen
Christoph,
Quoted 8 lines
The existing behavior is inconsistent in the sense that doing:
permits writes. But:
<something triggers revalidate>
doesn't.
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
And a subsequent:
Looks like the command line pieces got zapped from the commit description.
Yeah. It seems like git commit just removed them after I pasted them, weird.
Might be because of a leading #, happened to me as well in the past. Just add a single space on the start of the line and git commit is happy.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Re: [PATCH 4/6] block: propagate BLKROSET on the whole device to all partitions
In reply to Christoph HellwigQuoted 51 lines · Christoph Hellwig
Change the policy so that a BLKROSET on the whole device also affects partitions. To quote Martin K. Petersen:
It's very common for database folks to twiddle the read-only state of block devices and partitions. I know that our users will find it very counter-intuitive that setting
/dev/sdaread-only won't prevent writes to/dev/sda1.The existing behavior is inconsistent in the sense that doing:
permits writes. But:
<something triggers revalidate>
doesn't.
And a subsequent:
doesn't work either since sda1's read-only policy has been inherited from the whole-disk device.
You need to do:
after setting the whole-disk device rw to effectuate the same change on the partitions, otherwise they are stuck being read-only indefinitely.
However, setting the read-only policy on a partition does *not* require the revalidate step. As a matter of fact, doing the revalidate will blow away the policy setting you just made.
So the user needs to take different actions depending on whether they are trying to read-protect a whole-disk device or a partition. Despite using the same ioctl. That is really confusing.
I have lost count how many times our customers have had data clobbered because of ambiguity of the existing whole-disk device policy. The current behavior violates the principle of least surprise by letting the user think they write protected the whole disk when they actually didn't.
Suggested-by Martin K. Petersen <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>--- block/genhd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)block/genhd.c +0
-0
block/genhd.c EXPORT_SYMBOL(set_disk_ro); · line 1454
Quoted 8 lines
block/genhd.c +1
-2@@ -1449,8 +1449,7 @@ EXPORT_SYMBOL(set_disk_ro);int bdev_read_only (struct block_device *bdev) { -return bdev->bd_read_only || -test_bit (GD_READ_ONLY , &bdev->bd_disk->state); +return bdev->bd_read_only ||get_disk_ro (bdev->bd_disk); }EXPORT_SYMBOL (bdev_read_only);
I think this patch should be folded into previous one, otherwise bdev_read_only(part) may return false even though ioctl(BLKROSET) has been done on the whole disk.
Signature · 7 lines
Ming _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Christoph Hellwig
maintainerRe: [PATCH 4/6] block: propagate BLKROSET on the whole device to all partitions
Quoted 8 lines · Ming Lei
block/genhd.c EXPORT_SYMBOL(set_disk_ro); · line 1454
Quoted 4 lines
block/genhd.c +1
-1-test_bit (GD_READ_ONLY , &bdev->bd_disk->state); +return bdev->bd_read_only ||get_disk_ro (bdev->bd_disk); }EXPORT_SYMBOL (bdev_read_only);I think this patch should be folded into previous one, otherwise
bdev_read_only(part)may return false even though ioctl(BLKROSET) has been done on the whole disk.
The above is the existing behavior going back back very far, and I feel much more comfortable having a small self-contained patch that changes this behavior.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Ming Lei
Reviewed-byRe: [PATCH 4/6] block: propagate BLKROSET on the whole device to all partitions
Quoted 10 lines · Christoph Hellwig
Quoted 8 lines · Ming Lei
block/genhd.c EXPORT_SYMBOL(set_disk_ro); · line 1454
Quoted 4 lines
block/genhd.c +1
-1-test_bit (GD_READ_ONLY , &bdev->bd_disk->state); +return bdev->bd_read_only ||get_disk_ro (bdev->bd_disk); }EXPORT_SYMBOL (bdev_read_only);I think this patch should be folded into previous one, otherwise
bdev_read_only(part)may return false even though ioctl(BLKROSET) has been done on the whole disk.
Quoted 4 lines
The above is the existing behavior going back back very far, and I feel much more comfortable having a small self-contained patch that changes this behavior.
OK, then looks fine:
Signature · 6 lines
Ming -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
Christoph Hellwig
maintainerPATCH 5/6 rbd: remove the ->set_read_only method
In reply to Christoph HellwigNow that the hardware read-only state can't be changed by the BLKROSET ioctl, the code in this method is not required anymore.
--- drivers/block/rbd.c | 19 ------------------- 1 file changed, 19 deletions(-)
drivers/block/rbd.c +0 -19
@@ -692,29 +692,10 @@ static void rbd_release(struct gendisk *disk, fmode_t mode)put_device (&rbd_dev->dev); } -static int rbd_set_read_only (struct block_device *bdev,bool ro) -{ -struct rbd_device *rbd_dev = bdev->bd_disk->private_data; - -/* -* Both images mapped read-only and snapshots can't be marked -* read-write. -*/ -if (!ro) { -if (rbd_is_ro (rbd_dev)) -return -EROFS ; - -rbd_assert (!rbd_is_snap (rbd_dev)); - } - -return 0 ; -} -static const struct block_device_operations rbd_bd_ops = { .owner =THIS_MODULE , .open = rbd_open, .release = rbd_release, - .set_read_only = rbd_set_read_only, };/*
Signature · 7 lines
2.29.2 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Re: [PATCH 5/6] rbd: remove the ->set_read_only method
Quoted 45 lines · Christoph Hellwig
Now that the hardware read-only state can't be changed by the BLKROSET ioctl, the code in this method is not required anymore.
Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>--- drivers/block/rbd.c | 19 ------------------- 1 file changed, 19 deletions(-)drivers/block/rbd.c +0
-20@@ -692,29 +692,10 @@ static void rbd_release(struct gendisk *disk, fmode_t mode)put_device (&rbd_dev->dev); } -static int rbd_set_read_only (struct block_device *bdev,bool ro) -{ -struct rbd_device *rbd_dev = bdev->bd_disk->private_data; - -/* -* Both images mapped read-only and snapshots can't be marked -* read-write. -*/ -if (!ro) { -if (rbd_is_ro (rbd_dev)) -return -EROFS ; - -rbd_assert (!rbd_is_snap (rbd_dev)); - } - -return 0 ; -} -static const struct block_device_operations rbd_bd_ops = { .owner =THIS_MODULE , .open = rbd_open, .release = rbd_release, - .set_read_only = rbd_set_read_only, };/* --
Quoted 2 lines
2.29.2
If nothing can mess with read-only state after set_disk_ro(disk, true), looks good.
Thanks,
Ilya
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Re: [PATCH 5/6] rbd: remove the ->set_read_only method
In reply to Christoph HellwigChristoph,
Quoted 2 lines
Now that the hardware read-only state can't be changed by the BLKROSET ioctl, the code in this method is not required anymore.
Signature · 6 lines
Martin K. Petersen Oracle Linux Engineering _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Christoph Hellwig
maintainerPATCH 6/6 nvme: allow revalidate to set a namespace read-only
In reply to Christoph HellwigUnconditionally call set_disk_ro now that it only updates the hardware state. This allows to properly set up the Linux devices read-only when the controller turns a previously writable namespace read-only.
--- drivers/nvme/host/core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/nvme/host/core.c +2 -3
@@ -2114,9 +2114,8 @@ static void nvme_update_disk_info(struct gendisk *disk,nvme_config_discard (disk, ns);nvme_config_write_zeroes (disk, ns); -if ((id->nsattr &NVME_NS_ATTR_RO ) || -test_bit (NVME_NS_FORCE_RO , &ns->flags)) -set_disk_ro (disk, true); +set_disk_ro (disk, (id->nsattr &NVME_NS_ATTR_RO ) || +test_bit (NVME_NS_FORCE_RO , &ns->flags)); }static inline bool nvme_first_scan (struct gendisk *disk)
Signature · 7 lines
2.29.2 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Re: [PATCH 6/6] nvme: allow revalidate to set a namespace read-only
Quoted 5 lines · Christoph Hellwig
Unconditionally call
set_disk_ronow that it only updates the hardware state. This allows to properly set up the Linux devices read-only when the controller turns a previously writable namespace read-only.Signed-off-by Christoph Hellwig <[email protected]>
Looks good.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Re: [PATCH 6/6] nvme: allow revalidate to set a namespace read-only
In reply to Christoph HellwigChristoph,
Quoted 3 lines
Unconditionally call
set_disk_ronow that it only updates the hardware state. This allows to properly set up the Linux devices read-only when the controller turns a previously writable namespace read-only.
Signature · 6 lines
Martin K. Petersen Oracle Linux Engineering _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Christoph Hellwig
maintainerJens, can you pick this up for 5.11?
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme