nbd: add netlink reconfigure resize support
Subsystems (2)
PATCH 1/1 nbd: add netlink reconfigure resize support
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.
---
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(-)
drivers/block/nbd.c +19 -10
@@ -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 ;
Signature · 1 line
2.21.0
Quoted 31 lines · Mike Christie
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 <[email protected]>---
V2:
- Merge reconfig and connect resize related code to helper and avoid multiplenbd_size_setcalls.drivers/block/nbd.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-)drivers/block/nbd.c +5
-0@@ -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;
drivers/block/nbd.c nbd_device_policy[NBD_DEVICE_ATTR_MAX + 1] = { · line 1691
Quoted 10 lines
drivers/block/nbd.c +10
-0+ +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.