Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18E2FC31E45 for ; Thu, 13 Jun 2019 17:35:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EC45C2190D for ; Thu, 13 Jun 2019 17:35:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725884AbfFMRf2 (ORCPT ); Thu, 13 Jun 2019 13:35:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58914 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725616AbfFMRf2 (ORCPT ); Thu, 13 Jun 2019 13:35:28 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0AED9C04BE09; Thu, 13 Jun 2019 17:35:28 +0000 (UTC) Received: from [10.10.122.154] (ovpn-122-154.rdu2.redhat.com [10.10.122.154]) by smtp.corp.redhat.com (Postfix) with ESMTP id A4AFA19C67; Thu, 13 Jun 2019 17:35:27 +0000 (UTC) Subject: Re: [PATCH 2/2] nbd: add netlink reconfigure resize support v3 To: Josef Bacik References: <20190529201606.14903-1-mchristi@redhat.com> <20190529201606.14903-3-mchristi@redhat.com> <20190613170103.pludlfrz2jtkzwij@MacBook-Pro-91.local> Cc: linux-block@vger.kernel.org From: Mike Christie Message-ID: <5D02895F.5000205@redhat.com> Date: Thu, 13 Jun 2019 12:35:27 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <20190613170103.pludlfrz2jtkzwij@MacBook-Pro-91.local> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 13 Jun 2019 17:35:28 +0000 (UTC) Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org On 06/13/2019 12:01 PM, Josef Bacik wrote: > On Wed, May 29, 2019 at 03:16:06PM -0500, 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 > > Sorry I missed this too, but I think there's a problem with this actually. > >> --- >> >> V3; >> - If the device size or block size has not changed do not call >> nbd_size_set. >> >> V2: >> - Merge reconfig and connect resize related code to helper and avoid >> multiple nbd_size_set calls. >> >> drivers/block/nbd.c | 48 ++++++++++++++++++++++++++++++--------------- >> 1 file changed, 32 insertions(+), 16 deletions(-) >> >> diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c >> index 236253fbf455..9486555e6391 100644 >> --- a/drivers/block/nbd.c >> +++ b/drivers/block/nbd.c >> @@ -1685,6 +1685,30 @@ nbd_device_policy[NBD_DEVICE_ATTR_MAX + 1] = { >> [NBD_DEVICE_CONNECTED] = { .type = NLA_U8 }, >> }; >> >> +static int nbd_genl_size_set(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]); >> + if (!bsize) >> + bsize = NBD_DEF_BLKSIZE; >> + if (!nbd_is_valid_blksize(bsize)) { >> + printk(KERN_ERR "Invalid block size %llu\n", bsize); >> + return -EINVAL; >> + } >> + } >> + >> + if (bytes != config->bytesize || bsize != config->blksize) >> + nbd_size_set(nbd, bsize, div64_u64(bytes, bsize)); > > This part won't actually update the bdev if there already is one because > nbd->task_recv is NULL for netlink related devices. Probably need to fix that I'm not sure I understand this part of the comment. For netlink we do: nbd_genl_connect -> nbd_start_device: nbd_start_device() { ..... nbd->task_recv = current; > to update the bdev unconditionally, and then just see if bdget_disk() returns > NULL in nbd_size_update. Also I hate myself for how many size update functions > there are. Thanks, > > Josef >