| Message ID | 20190526214918.9495-1-mchristi@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/1] nbd: add netlink reconfigure resize support | expand |
On 05/26/2019 04:49 PM, Mike Christie wrote: > If the device is setup with ioctl we can resize the device after the > initial setup, but if the device is setup with netlink we cannot use the > resize related ioctls and there is no netlink reconfigure size ATTR > handling code. > > This patch adds netlink reconfigure resize support to match the ioctl > interface. > > Signed-off-by: Mike Christie <mchristi@redhat.com> > --- > > V2: > - Merge reconfig and connect resize related code to helper and avoid > multiple nbd_size_set calls. > > drivers/block/nbd.c | 29 +++++++++++++++++++---------- > 1 file changed, 19 insertions(+), 10 deletions(-) > > diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c > index 053958a8a2ba..d75b67c12392 100644 > --- a/drivers/block/nbd.c > +++ b/drivers/block/nbd.c > @@ -1674,6 +1674,21 @@ nbd_device_policy[NBD_DEVICE_ATTR_MAX + 1] = { > [NBD_DEVICE_CONNECTED] = { .type = NLA_U8 }, > }; > > +static void nbd_genl_set_size(struct genl_info *info, struct nbd_device *nbd) > +{ > + struct nbd_config *config = nbd->config; > + u64 bsize = config->blksize; > + u64 bytes = config->bytesize; > + > + if (info->attrs[NBD_ATTR_SIZE_BYTES]) > + bytes = nla_get_u64(info->attrs[NBD_ATTR_SIZE_BYTES]); > + > + if (info->attrs[NBD_ATTR_BLOCK_SIZE_BYTES]) > + bsize = nla_get_u64(info->attrs[NBD_ATTR_BLOCK_SIZE_BYTES]); > + > + nbd_size_set(nbd, bsize, div64_u64(bytes, bsize)); > +} > + I'm sorry. I do not know what I am thinking. Ignore this patch too. It is bad. It will always be called in the reconfig case.
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 053958a8a2ba..d75b67c12392 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -1674,6 +1674,21 @@ nbd_device_policy[NBD_DEVICE_ATTR_MAX + 1] = { [NBD_DEVICE_CONNECTED] = { .type = NLA_U8 }, }; +static void nbd_genl_set_size(struct genl_info *info, struct nbd_device *nbd) +{ + struct nbd_config *config = nbd->config; + u64 bsize = config->blksize; + u64 bytes = config->bytesize; + + if (info->attrs[NBD_ATTR_SIZE_BYTES]) + bytes = nla_get_u64(info->attrs[NBD_ATTR_SIZE_BYTES]); + + if (info->attrs[NBD_ATTR_BLOCK_SIZE_BYTES]) + bsize = nla_get_u64(info->attrs[NBD_ATTR_BLOCK_SIZE_BYTES]); + + nbd_size_set(nbd, bsize, div64_u64(bytes, bsize)); +} + static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info) { struct nbd_device *nbd = NULL; @@ -1761,16 +1776,8 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info) refcount_set(&nbd->config_refs, 1); set_bit(NBD_BOUND, &config->runtime_flags); - if (info->attrs[NBD_ATTR_SIZE_BYTES]) { - u64 bytes = nla_get_u64(info->attrs[NBD_ATTR_SIZE_BYTES]); - nbd_size_set(nbd, config->blksize, - div64_u64(bytes, config->blksize)); - } - if (info->attrs[NBD_ATTR_BLOCK_SIZE_BYTES]) { - u64 bsize = - nla_get_u64(info->attrs[NBD_ATTR_BLOCK_SIZE_BYTES]); - nbd_size_set(nbd, bsize, div64_u64(config->bytesize, bsize)); - } + nbd_genl_set_size(info, nbd); + if (info->attrs[NBD_ATTR_TIMEOUT]) { u64 timeout = nla_get_u64(info->attrs[NBD_ATTR_TIMEOUT]); nbd->tag_set.timeout = timeout * HZ; @@ -1939,6 +1946,8 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info) goto out; } + nbd_genl_set_size(info, nbd); + if (info->attrs[NBD_ATTR_TIMEOUT]) { u64 timeout = nla_get_u64(info->attrs[NBD_ATTR_TIMEOUT]); nbd->tag_set.timeout = timeout * HZ;
If the device is setup with ioctl we can resize the device after the initial setup, but if the device is setup with netlink we cannot use the resize related ioctls and there is no netlink reconfigure size ATTR handling code. This patch adds netlink reconfigure resize support to match the ioctl interface. Signed-off-by: Mike Christie <mchristi@redhat.com> --- V2: - Merge reconfig and connect resize related code to helper and avoid multiple nbd_size_set calls. drivers/block/nbd.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-)