block: Fix BLKRRPART regression
Subsystems (2)
PATCH 1/1 block: Fix BLKRRPART regression
The BLKRRPART ioctl used to report errors such as EIO before we changed the blkdev_reread_part() logic.
Lets add a flag and capture the errors returned by bdev_disk_changed() when the flag is set. Setting this flag for the BLKRRPART path when we want the errors to be reported when rereading partitions on the disk.
Tested: Tested by simulating failure to the block device and will propose a new test to blktests.
Change-Id: Idf3d97390ed78061556f8468d10d6cab24ae20b1
--- block/bdev.c | 31 +++++++++++++++++++++---------- block/ioctl.c | 3 ++- include/linux/blkdev.h | 3 +++ 3 files changed, 26 insertions(+), 11 deletions(-)
block/bdev.c +21 -10
@@ -632,6 +632,14 @@ static void blkdev_flush_mapping(struct block_device *bdev)bdev_write_inode (bdev); } +static void blkdev_put_whole (struct block_device *bdev) +{ +if (atomic_dec_and_test (&bdev->bd_openers)) +blkdev_flush_mapping (bdev); +if (bdev->bd_disk->fops->release) + bdev->bd_disk->fops->release (bdev->bd_disk); +} +static int blkdev_get_whole (struct block_device *bdev,blk_mode_t mode) {struct gendisk *disk = bdev->bd_disk;
@@ -650,18 +658,21 @@ static int blkdev_get_whole(struct block_device *bdev, blk_mode_t mode)if (!atomic_read (&bdev->bd_openers))set_init_blocksize (bdev); -if (test_bit (GD_NEED_PART_SCAN , &disk->state)) -bdev_disk_changed (disk, false);atomic_inc (&bdev->bd_openers); -return 0 ; -} -static void blkdev_put_whole (struct block_device *bdev) -{ -if (atomic_dec_and_test (&bdev->bd_openers)) -blkdev_flush_mapping (bdev); -if (bdev->bd_disk->fops->release) - bdev->bd_disk->fops->release (bdev->bd_disk); +if (test_bit (GD_NEED_PART_SCAN , &disk->state)) { +/* +* Only return scanning errors if we are called from contexts +* that explicitly want them, e.g. the BLKRRPART ioctl. +*/ + ret =bdev_disk_changed (disk, false); +if (ret && (mode &BLK_OPEN_STRICT_SCAN )) { +blkdev_put_whole (bdev); +return ret; + } + } + +return 0 ; }static int blkdev_get_part (struct block_device *part,blk_mode_t mode)
block/ioctl.c +2 -1
@@ -557,7 +557,8 @@ static int blkdev_common_ioctl(struct block_device *bdev, blk_mode_t mode,return -EACCES ;if (bdev_is_partition (bdev))return -EINVAL ; -return disk_scan_partitions (bdev->bd_disk, mode); +return disk_scan_partitions (bdev->bd_disk, + mode |BLK_OPEN_STRICT_SCAN );case BLKTRACESTART :case BLKTRACESTOP :case BLKTRACETEARDOWN :
include/linux/blkdev.h +3 -0
@@ -151,6 +151,9 @@ struct access_rules_head {int max_rules; }; +/* return partition scanning errors */ +#define BLK_OPEN_STRICT_SCAN ((__force blk_mode_t)(1 << 5)) +struct gendisk {/* * major/first_minor/minors should not be set by any new driver, the
Signature · 1 line
2.44.0.478.gd926399ef9-goog
kernel test robot
build botFYI: kernel test robot notices the stable kernel rule is not satisfied.
Hi,
Thanks for your patch.
FYI: kernel test robot notices the stable kernel rule is not satisfied.
The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html#option-1
Rule: add the tag "Cc: [email protected]" in the sign-off area to have the patch automatically included in the stable tree.
Subject: [PATCH] block: Fix BLKRRPART regression
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Hmm, what is this? It looks kinda like the patch I sent out, but with the flag moved into an odd place?
PATCH 1/1 block: Fix BLKRRPART regression
The BLKRRPART ioctl used to report errors such as EIO before we changed the blkdev_reread_part() logic.
Lets add a flag and capture the errors returned by bdev_disk_changed() when the flag is set. Setting this flag for the BLKRRPART path when we want the errors to be reported when rereading partitions on the disk.
Tested: Tested by simulating failure to the block device and will propose a new test to blktests.
Change-Id: Idf3d97390ed78061556f8468d10d6cab24ae20b1
--- block/bdev.c | 29 +++++++++++++++++++---------- block/ioctl.c | 3 ++- include/linux/blkdev.h | 2 ++ 3 files changed, 23 insertions(+), 11 deletions(-)
block/bdev.c +19 -10
@@ -652,6 +652,14 @@ static void blkdev_flush_mapping(struct block_device *bdev)bdev_write_inode (bdev); } +static void blkdev_put_whole (struct block_device *bdev) +{ +if (atomic_dec_and_test (&bdev->bd_openers)) +blkdev_flush_mapping (bdev); +if (bdev->bd_disk->fops->release) + bdev->bd_disk->fops->release (bdev->bd_disk); +} +static int blkdev_get_whole (struct block_device *bdev,blk_mode_t mode) {struct gendisk *disk = bdev->bd_disk;
@@ -670,20 +678,21 @@ static int blkdev_get_whole(struct block_device *bdev, blk_mode_t mode)if (!atomic_read (&bdev->bd_openers))set_init_blocksize (bdev); -if (test_bit (GD_NEED_PART_SCAN , &disk->state)) -bdev_disk_changed (disk, false);atomic_inc (&bdev->bd_openers); +if (test_bit (GD_NEED_PART_SCAN , &disk->state)) { +/* +* Only return scanning errors if we are called from conexts +* that explicitly want them, e.g. the BLKRRPART ioctl. +*/ + ret =bdev_disk_changed (disk, false); +if (ret && (mode &BLK_OPEN_STRICT_SCAN )) { +blkdev_put_whole (bdev); +return ret; + } + }return 0 ; } -static void blkdev_put_whole (struct block_device *bdev) -{ -if (atomic_dec_and_test (&bdev->bd_openers)) -blkdev_flush_mapping (bdev); -if (bdev->bd_disk->fops->release) - bdev->bd_disk->fops->release (bdev->bd_disk); -} -static int blkdev_get_part (struct block_device *part,blk_mode_t mode) {struct gendisk *disk = part->bd_disk;
block/ioctl.c +2 -1
@@ -562,7 +562,8 @@ static int blkdev_common_ioctl(struct block_device *bdev, blk_mode_t mode,return -EACCES ;if (bdev_is_partition (bdev))return -EINVAL ; -return disk_scan_partitions (bdev->bd_disk, mode); +return disk_scan_partitions (bdev->bd_disk, + mode |BLK_OPEN_STRICT_SCAN );case BLKTRACESTART :case BLKTRACESTOP :case BLKTRACETEARDOWN :
include/linux/blkdev.h +2 -0
@@ -128,6 +128,8 @@ typedef unsigned int __bitwise blk_mode_t;#define BLK_OPEN_WRITE_IOCTL ((__force blk_mode_t)(1 << 4))/* open is exclusive wrt all other BLK_OPEN_WRITE opens to the device */ #define BLK_OPEN_RESTRICT_WRITES ((__force blk_mode_t)(1 << 5)) +/* return partition scanning errors */ +#define BLK_OPEN_STRICT_SCAN ((__force blk_mode_t)(1 << 5))struct gendisk {/*
Signature · 1 line
2.44.0.478.gd926399ef9-goog
kernel test robot
build botFYI: kernel test robot notices the stable kernel rule is not satisfied.
Hi,
Thanks for your patch.
FYI: kernel test robot notices the stable kernel rule is not satisfied.
The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html#option-1
Rule: add the tag "Cc: [email protected]" in the sign-off area to have the patch automatically included in the stable tree.
Subject: [PATCH] block: Fix BLKRRPART regression
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Saranya, while I evaluate the corresponding patch for blktests, I found a weird behavior, and had a chance to look into this patch. Please find my comments in line.
Quoted 6 lines · Saranya Muruganandam
The BLKRRPART ioctl used to report errors such as EIO before we changed the
blkdev_reread_part()logic.Lets add a flag and capture the errors returned by
bdev_disk_changed()when the flag is set. Setting this flag for the BLKRRPART path when we want the errors to be reported when rereading partitions on the disk.
Documentation/process/submitting-patches.rst guides to describe changes in imperative mood, then the sentences above can be rephrased like,
Add a flag...
Set this flag...
Quoted 36 lines
Suggested-by Christoph Hellwig <[email protected]>Tested: Tested by simulating failure to the block device and will propose a new test to blktests.
Fixes 4601b4b130de ("block: reopen the device in blkdev_reread_part")Reported-by Saranya Muruganandam <[email protected]>Signed-off-by Saranya Muruganandam <[email protected]>Change-Id: Idf3d97390ed78061556f8468d10d6cab24ae20b1
--- block/bdev.c | 29 +++++++++++++++++++---------- block/ioctl.c | 3 ++- include/linux/blkdev.h | 2 ++ 3 files changed, 23 insertions(+), 11 deletions(-)block/bdev.c +8
-0@@ -652,6 +652,14 @@ static void blkdev_flush_mapping(struct block_device *bdev)bdev_write_inode (bdev); } +static void blkdev_put_whole (struct block_device *bdev) +{ +if (atomic_dec_and_test (&bdev->bd_openers)) +blkdev_flush_mapping (bdev); +if (bdev->bd_disk->fops->release) + bdev->bd_disk->fops->release (bdev->bd_disk); +} +static int blkdev_get_whole (struct block_device *bdev,blk_mode_t mode) {struct gendisk *disk = bdev->bd_disk;
block/bdev.c static int blkdev_get_whole(struct block_device *bdev, blk_mode_t mode) · line 684
Quoted 9 lines
block/bdev.c +3
-2@@ -670,20 +678,21 @@ static int blkdev_get_whole(struct block_device *bdev, blk_mode_t mode)if (!atomic_read (&bdev->bd_openers))set_init_blocksize (bdev); -if (test_bit (GD_NEED_PART_SCAN , &disk->state)) -bdev_disk_changed (disk, false);atomic_inc (&bdev->bd_openers); +if (test_bit (GD_NEED_PART_SCAN , &disk->state)) { +/* +* Only return scanning errors if we are called from conexts
s/conexts/contexts/
Quoted 41 lines
block/bdev.c +8
-8+* that explicitly want them, e.g. the BLKRRPART ioctl. +*/ + ret =bdev_disk_changed (disk, false); +if (ret && (mode &BLK_OPEN_STRICT_SCAN )) { +blkdev_put_whole (bdev); +return ret; + } + }return 0 ; } -static void blkdev_put_whole (struct block_device *bdev) -{ -if (atomic_dec_and_test (&bdev->bd_openers)) -blkdev_flush_mapping (bdev); -if (bdev->bd_disk->fops->release) - bdev->bd_disk->fops->release (bdev->bd_disk); -} -static int blkdev_get_part (struct block_device *part,blk_mode_t mode) {struct gendisk *disk = part->bd_disk;block/ioctl.c +2
-1@@ -562,7 +562,8 @@ static int blkdev_common_ioctl(struct block_device *bdev, blk_mode_t mode,return -EACCES ;if (bdev_is_partition (bdev))return -EINVAL ; -return disk_scan_partitions (bdev->bd_disk, mode); +return disk_scan_partitions (bdev->bd_disk, + mode |BLK_OPEN_STRICT_SCAN );case BLKTRACESTART :case BLKTRACESTOP :case BLKTRACETEARDOWN :include/linux/blkdev.h +0
-0
include/linux/blkdev.h typedef unsigned int __bitwise blk_mode_t; · line 132
Quoted 5 lines
include/linux/blkdev.h +2
-0@@ -128,6 +128,8 @@ typedef unsigned int __bitwise blk_mode_t;#define BLK_OPEN_WRITE_IOCTL ((__force blk_mode_t)(1 << 4))/* open is exclusive wrt all other BLK_OPEN_WRITE opens to the device */ #define BLK_OPEN_RESTRICT_WRITES ((__force blk_mode_t)(1 << 5)) +/* return partition scanning errors */ +#define BLK_OPEN_STRICT_SCAN ((__force blk_mode_t)(1 << 5))
The line above assigns the same number for BLK_OPEN_STRICT_SCAN and BLK_OPEN_RESTRICT_WRITES, then blockdev --rereadpt fails with EINVAL, not EIO. I modified it to "1 << 6", then it looks working good.
Quoted 6 lines
include/linux/blkdev.h +0
-0struct gendisk {/* Signature · 1 line
2.44.0.478.gd926399ef9-goog
PATCH 1/1 block: Fix BLKRRPART regression
The BLKRRPART ioctl used to report errors such as EIO before we changed the blkdev_reread_part() logic.
Add a flag and capture the errors returned by bdev_disk_changed() when the flag is set. Set this flag for the BLKRRPART path when we want the errors to be reported when rereading partitions on the disk.
Tested: Tested by simulating failure to the block device and will propose a new test to blktests.
Change-Id: Idf3d97390ed78061556f8468d10d6cab24ae20b1
--- block/bdev.c | 29 +++++++++++++++++++---------- block/ioctl.c | 3 ++- include/linux/blkdev.h | 2 ++ 3 files changed, 23 insertions(+), 11 deletions(-)
block/bdev.c +19 -10
@@ -652,6 +652,14 @@ static void blkdev_flush_mapping(struct block_device *bdev)bdev_write_inode (bdev); } +static void blkdev_put_whole (struct block_device *bdev) +{ +if (atomic_dec_and_test (&bdev->bd_openers)) +blkdev_flush_mapping (bdev); +if (bdev->bd_disk->fops->release) + bdev->bd_disk->fops->release (bdev->bd_disk); +} +static int blkdev_get_whole (struct block_device *bdev,blk_mode_t mode) {struct gendisk *disk = bdev->bd_disk;
@@ -670,20 +678,21 @@ static int blkdev_get_whole(struct block_device *bdev, blk_mode_t mode)if (!atomic_read (&bdev->bd_openers))set_init_blocksize (bdev); -if (test_bit (GD_NEED_PART_SCAN , &disk->state)) -bdev_disk_changed (disk, false);atomic_inc (&bdev->bd_openers); +if (test_bit (GD_NEED_PART_SCAN , &disk->state)) { +/* +* Only return scanning errors if we are called from contexts +* that explicitly want them, e.g. the BLKRRPART ioctl. +*/ + ret =bdev_disk_changed (disk, false); +if (ret && (mode &BLK_OPEN_STRICT_SCAN )) { +blkdev_put_whole (bdev); +return ret; + } + }return 0 ; } -static void blkdev_put_whole (struct block_device *bdev) -{ -if (atomic_dec_and_test (&bdev->bd_openers)) -blkdev_flush_mapping (bdev); -if (bdev->bd_disk->fops->release) - bdev->bd_disk->fops->release (bdev->bd_disk); -} -static int blkdev_get_part (struct block_device *part,blk_mode_t mode) {struct gendisk *disk = part->bd_disk;
block/ioctl.c +2 -1
@@ -562,7 +562,8 @@ static int blkdev_common_ioctl(struct block_device *bdev, blk_mode_t mode,return -EACCES ;if (bdev_is_partition (bdev))return -EINVAL ; -return disk_scan_partitions (bdev->bd_disk, mode); +return disk_scan_partitions (bdev->bd_disk, + mode |BLK_OPEN_STRICT_SCAN );case BLKTRACESTART :case BLKTRACESTOP :case BLKTRACETEARDOWN :
include/linux/blkdev.h +2 -0
@@ -128,6 +128,8 @@ typedef unsigned int __bitwise blk_mode_t;#define BLK_OPEN_WRITE_IOCTL ((__force blk_mode_t)(1 << 4))/* open is exclusive wrt all other BLK_OPEN_WRITE opens to the device */ #define BLK_OPEN_RESTRICT_WRITES ((__force blk_mode_t)(1 << 5)) +/* return partition scanning errors */ +#define BLK_OPEN_STRICT_SCAN ((__force blk_mode_t)(1 << 6))struct gendisk {/*
Signature · 1 line
2.44.0.683.g7961c838ac-goog
kernel test robot
build botFYI: kernel test robot notices the stable kernel rule is not satisfied.
Hi,
Thanks for your patch.
FYI: kernel test robot notices the stable kernel rule is not satisfied.
The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html#option-1
Rule: add the tag "Cc: [email protected]" in the sign-off area to have the patch automatically included in the stable tree.
Subject: [PATCH] block: Fix BLKRRPART regression
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Quoted 7 lines · Saranya Muruganandam
The BLKRRPART ioctl used to report errors such as EIO before we changed the
blkdev_reread_part()logic.Add a flag and capture the errors returned by
bdev_disk_changed()when the flag is set. Set this flag for the BLKRRPART path when we want the errors to be reported when rereading partitions on the disk.
Quoted 7 lines
Suggested-by Christoph Hellwig <[email protected]>Tested: Tested by simulating failure to the block device and will propose a new test to blktests.
Fixes 4601b4b130de ("block: reopen the device in blkdev_reread_part")Reported-by Saranya Muruganandam <[email protected]>Signed-off-by Saranya Muruganandam <[email protected]>
The change looks good to me. I also confirmed the fix with the new, corresponding blktests test case.
Quoted 16 lines · Shinichiro Kawasaki
Quoted 7 lines · Saranya Muruganandam
The BLKRRPART ioctl used to report errors such as EIO before we changed the
blkdev_reread_part()logic.Add a flag and capture the errors returned by
bdev_disk_changed()when the flag is set. Set this flag for the BLKRRPART path when we want the errors to be reported when rereading partitions on the disk.Quoted 7 lines
Suggested-by Christoph Hellwig <[email protected]>Tested: Tested by simulating failure to the block device and will propose a new test to blktests.
Fixes 4601b4b130de ("block: reopen the device in blkdev_reread_part")Reported-by Saranya Muruganandam <[email protected]>Signed-off-by Saranya Muruganandam <[email protected]>
Quoted 5 lines
The change looks good to me. I also confirmed the fix with the new, corresponding blktests test case.
Reviewed-by Shin'ichiro Kawasaki <[email protected]>Tested-by Shin'ichiro Kawasaki <[email protected]>
which patch is the final one ? Is it this one or the one posted with title :-
"block: propagate partition scanning errors to the BLKRRPART ioctl" ?
Please clarify so I can make sure to run some tests at my end.
-ck
Quoted 23 lines · Chaitanya Kulkarni
Quoted 16 lines · Shinichiro Kawasaki
Quoted 7 lines · Saranya Muruganandam
The BLKRRPART ioctl used to report errors such as EIO before we changed the
blkdev_reread_part()logic.Add a flag and capture the errors returned by
bdev_disk_changed()when the flag is set. Set this flag for the BLKRRPART path when we want the errors to be reported when rereading partitions on the disk.Quoted 7 lines
Suggested-by Christoph Hellwig <[email protected]>Tested: Tested by simulating failure to the block device and will propose a new test to blktests.
Fixes 4601b4b130de ("block: reopen the device in blkdev_reread_part")Reported-by Saranya Muruganandam <[email protected]>Signed-off-by Saranya Muruganandam <[email protected]>Quoted 5 lines
The change looks good to me. I also confirmed the fix with the new, corresponding blktests test case.
Reviewed-by Shin'ichiro Kawasaki <[email protected]>Tested-by Shin'ichiro Kawasaki <[email protected]>
Quoted 6 lines
which patch is the final one ? Is it this one or the one posted with title :-
"block: propagate partition scanning errors to the BLKRRPART ioctl" ?
Please clarify so I can make sure to run some tests at my end.
The patch I reviewed and tested is the one that Saranya reflected my comment. It is found here:
https://lore.kernel.org/linux-block/[email protected]/
Quoted 2 lines · Chaitanya Kulkarni
which patch is the final one ? Is it this one or the one posted with title :-
The correct patch is still the one I sent on Marc 28th and not any version that reattributes the changes and moves the flag into a totally weird place.