nbd: don't update block size after device is started
Subsystems (2)
PATCH 1/1 nbd: don't update block size after device is started
Mounted NBD device can be resized, one use case is rbd-nbd.
Fix the issue by setting up default block size, then not touch it in nbd_size_update() any more. This kind of usage is aligned with loop which has same use case too.
--- drivers/block/nbd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/block/nbd.c +5 -4
@@ -296,7 +296,7 @@ static void nbd_size_clear(struct nbd_device *nbd) } } -static void nbd_size_update (struct nbd_device *nbd) +static void nbd_size_update (struct nbd_device *nbd,bool start) {struct nbd_config *config = nbd->config;struct block_device *bdev =bdget_disk (nbd->disk,0 );
@@ -313,7 +313,8 @@ static void nbd_size_update(struct nbd_device *nbd)if (bdev) {if (bdev->bd_disk) {bd_set_nr_sectors (bdev, nr_sectors); -set_blocksize (bdev, config->blksize); +if (start) +set_blocksize (bdev, config->blksize); }else set_bit (GD_NEED_PART_SCAN , &nbd->disk->state);bdput (bdev);
@@ -328,7 +329,7 @@ static void nbd_size_set(struct nbd_device *nbd, loff_t blocksize, config->blksize = blocksize; config->bytesize = blocksize * nr_blocks;if (nbd->task_recv !=NULL ) -nbd_size_update (nbd); +nbd_size_update (nbd, false); }static void nbd_complete_rq (struct request *req)
@@ -1308,7 +1309,7 @@ static int nbd_start_device(struct nbd_device *nbd) args->index = i;queue_work (nbd->recv_workq, &args->work); } -nbd_size_update (nbd); +nbd_size_update (nbd, true);return error; }
Signature · 1 line
2.25.2
Tested on Ubuntu 20.04.1 LTS with kernel 5.10.0-rc1+, it works fine.
Quoted 56 lines · Ming Lei
Mounted NBD device can be resized, one use case is rbd-nbd.
Fix the issue by setting up default block size, then not touch it in
nbd_size_update()any more. This kind of usage is aligned with loop which has same use case too.Reported-by lining <[email protected]>Cc Josef Bacik <[email protected]>Cc Jan Kara <[email protected]>Signed-off-by Ming Lei <[email protected]>--- drivers/block/nbd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/block/nbd.c +5
-4@@ -296,7 +296,7 @@ static void nbd_size_clear(struct nbd_device *nbd) } } -static void nbd_size_update (struct nbd_device *nbd) +static void nbd_size_update (struct nbd_device *nbd,bool start) {struct nbd_config *config = nbd->config;struct block_device *bdev =bdget_disk (nbd->disk,0 );@@ -313,7 +313,8 @@ static void nbd_size_update(struct nbd_device *nbd)if (bdev) {if (bdev->bd_disk) {bd_set_nr_sectors (bdev, nr_sectors); -set_blocksize (bdev, config->blksize); +if (start) +set_blocksize (bdev, config->blksize); }else set_bit (GD_NEED_PART_SCAN , &nbd->disk->state);bdput (bdev);@@ -328,7 +329,7 @@ static void nbd_size_set(struct nbd_device *nbd, loff_t blocksize, config->blksize = blocksize; config->bytesize = blocksize * nr_blocks;if (nbd->task_recv !=NULL ) -nbd_size_update (nbd); +nbd_size_update (nbd, false); }static void nbd_complete_rq (struct request *req)@@ -1308,7 +1309,7 @@ static int nbd_start_device(struct nbd_device *nbd) args->index = i;queue_work (nbd->recv_workq, &args->work); } -nbd_size_update (nbd); +nbd_size_update (nbd, true);return error; }
Quoted 5 lines · Ming Lei
Mounted NBD device can be resized, one use case is rbd-nbd.
Fix the issue by setting up default block size, then not touch it in
nbd_size_update()any more. This kind of usage is aligned with loop which has same use case too.
Applied, thanks.
Signature · 1 line
Jens Axboe
Quoted 5 lines · Ming Lei
Mounted NBD device can be resized, one use case is rbd-nbd.
Fix the issue by setting up default block size, then not touch it in
nbd_size_update()any more. This kind of usage is aligned with loop which has same use case too.
I think the only reasonable fix here is to remove the set_blocksize call entirely. The concept of block size set by it is a file system construct and nbd has not business setting it at all.
Quoted 10 lines · Christoph Hellwig
Quoted 5 lines · Ming Lei
Mounted NBD device can be resized, one use case is rbd-nbd.
Fix the issue by setting up default block size, then not touch it in
nbd_size_update()any more. This kind of usage is aligned with loop which has same use case too.I think the only reasonable fix here is to remove the
set_blocksizecall entirely. The concept of block size set by it is a file system construct and nbd has not business setting it at all.
I think the idea is reasonable, we have several drivers(loop, nbd, zram, pktcdvd, bcache) which call into set_blocksize().
Also ioctl(BLKBSZSET) which is used by 'blockdev --setbsz', still not understand which kind of use case is served for.
Thanks,
Ming