| Message ID | 1486750004-2988-1-git-send-email-jbacik@fb.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> On 10 Feb 2017, at 19:06, Josef Bacik <jbacik@fb.com> wrote: > > We noticed when trying to do O_DIRECT to an export on the server side > that we were getting requests smaller than the 4k sectorsize of the > device. This is because the client isn't setting the logical and > physical blocksizes properly for the underlying device. Fix this up by > setting the queue blocksizes and then calling bd_set_size. Interesting. Some input into the info extension (re blocksizes) would definitely be appreciated.
On Fri, 2017-02-10 at 21:07 +0100, Alex Bligh wrote: > > > > On 10 Feb 2017, at 19:06, Josef Bacik <jbacik@fb.com> wrote: > > > > We noticed when trying to do O_DIRECT to an export on the server > > side > > that we were getting requests smaller than the 4k sectorsize of the > > device. This is because the client isn't setting the logical and > > physical blocksizes properly for the underlying device. Fix this > > up by > > setting the queue blocksizes and then calling bd_set_size. > Interesting. Some input into the info extension (re blocksizes) would > definitely be appreciated. > What do you mean? Right now the client is just calling NBD_SET_BLKSIZE with 4k blocksize since all of our devices are 4k drives. Thanks, Josef
On Fri, Feb 10, 2017 at 04:47:42PM -0500, Josef Bacik wrote: > On Fri, 2017-02-10 at 21:07 +0100, Alex Bligh wrote: > > > > > > On 10 Feb 2017, at 19:06, Josef Bacik <jbacik@fb.com> wrote: > > > > > > We noticed when trying to do O_DIRECT to an export on the server > > > side > > > that we were getting requests smaller than the 4k sectorsize of the > > > device. This is because the client isn't setting the logical and > > > physical blocksizes properly for the underlying device. Fix this > > > up by > > > setting the queue blocksizes and then calling bd_set_size. > > Interesting. Some input into the info extension (re blocksizes) would > > definitely be appreciated. > > > > What do you mean? Right now the client is just calling NBD_SET_BLKSIZE > with 4k blocksize since all of our devices are 4k drives. Thanks, He's talking about <https://github.com/NetworkBlockDevice/nbd/blob/extension-info/doc/proto.md#block-size-constraints>, which is a protocol extension that hasn't been implemented yet but would be relevant to this patch.
> On 11 Feb 2017, at 12:43, Wouter Verhelst <w@uter.be> wrote: > >>> Interesting. Some input into the info extension (re blocksizes) would >>> definitely be appreciated. >>> >> >> What do you mean? Right now the client is just calling NBD_SET_BLKSIZE >> with 4k blocksize since all of our devices are 4k drives. Thanks, > > He's talking about > <https://github.com/NetworkBlockDevice/nbd/blob/extension-info/doc/proto.md#block-size-constraints>, > which is a protocol extension that hasn't been implemented yet but would > be relevant to this patch. Indeed. Specifically, review of the patch from a kernel perspective would be useful.
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 34a280a..e0d770c 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -183,7 +183,7 @@ static int nbd_clear_reconnect(struct nbd_device *nbd) static int nbd_size_clear(struct nbd_device *nbd, struct block_device *bdev) { - bdev->bd_inode->i_size = 0; + bd_set_size(bdev, 0); set_capacity(nbd->disk, 0); kobject_uevent(&nbd_to_dev(nbd)->kobj, KOBJ_CHANGE); @@ -192,29 +192,20 @@ static int nbd_size_clear(struct nbd_device *nbd, struct block_device *bdev) static void nbd_size_update(struct nbd_device *nbd, struct block_device *bdev) { - if (!nbd_is_connected(nbd)) - return; - - bdev->bd_inode->i_size = nbd->bytesize; + blk_queue_logical_block_size(nbd->disk->queue, nbd->blksize); + blk_queue_physical_block_size(nbd->disk->queue, nbd->blksize); + bd_set_size(bdev, nbd->bytesize); set_capacity(nbd->disk, nbd->bytesize >> 9); kobject_uevent(&nbd_to_dev(nbd)->kobj, KOBJ_CHANGE); } -static int nbd_size_set(struct nbd_device *nbd, struct block_device *bdev, +static void nbd_size_set(struct nbd_device *nbd, struct block_device *bdev, loff_t blocksize, loff_t nr_blocks) { - int ret; - - ret = set_blocksize(bdev, blocksize); - if (ret) - return ret; - nbd->blksize = blocksize; nbd->bytesize = blocksize * nr_blocks; - - nbd_size_update(nbd, bdev); - - return 0; + if (nbd_is_connected(nbd)) + nbd_size_update(nbd, bdev); } static void nbd_end_request(struct nbd_cmd *cmd) @@ -875,6 +866,7 @@ static void send_disconnects(struct nbd_device *nbd) static int nbd_disconnect(struct nbd_device *nbd, struct block_device *bdev) { + printk(KERN_ERR "%u is the blocksize at disconnect\n", bdev_logical_block_size(bdev)); dev_info(disk_to_dev(nbd->disk), "NBD_DISCONNECT\n"); if (!nbd_socks_get_unless_zero(nbd)) return -EINVAL; @@ -997,15 +989,16 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, case NBD_SET_SOCK: return nbd_add_socket(nbd, bdev, arg); case NBD_SET_BLKSIZE: - return nbd_size_set(nbd, bdev, arg, - div_s64(nbd->bytesize, arg)); + nbd_size_set(nbd, bdev, arg, + div_s64(nbd->bytesize, arg)); + return 0; case NBD_SET_SIZE: - return nbd_size_set(nbd, bdev, nbd->blksize, - div_s64(arg, nbd->blksize)); - + nbd_size_set(nbd, bdev, nbd->blksize, + div_s64(arg, nbd->blksize)); + return 0; case NBD_SET_SIZE_BLOCKS: - return nbd_size_set(nbd, bdev, nbd->blksize, arg); - + nbd_size_set(nbd, bdev, nbd->blksize, arg); + return 0; case NBD_SET_TIMEOUT: nbd->tag_set.timeout = arg * HZ; return 0;
We noticed when trying to do O_DIRECT to an export on the server side that we were getting requests smaller than the 4k sectorsize of the device. This is because the client isn't setting the logical and physical blocksizes properly for the underlying device. Fix this up by setting the queue blocksizes and then calling bd_set_size. Signed-off-by: Josef Bacik <jbacik@fb.com> --- drivers/block/nbd.c | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-)