From nobody Wed Dec 17 05:40:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520017267078580.4467418831646; Fri, 2 Mar 2018 11:01:07 -0800 (PST) Received: from localhost ([::1]:36891 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erpvW-0005nA-8p for importer@patchew.org; Fri, 02 Mar 2018 14:01:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erppy-00011D-UO for qemu-devel@nongnu.org; Fri, 02 Mar 2018 13:55:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erppx-0002d2-1P for qemu-devel@nongnu.org; Fri, 02 Mar 2018 13:55:22 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:60090 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1erppt-0002YG-Da; Fri, 02 Mar 2018 13:55:17 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DDBCB402291E; Fri, 2 Mar 2018 18:55:16 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-66.ams2.redhat.com [10.36.117.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id C0037AB583; Fri, 2 Mar 2018 18:55:15 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 2 Mar 2018 19:54:17 +0100 Message-Id: <20180302185448.6314-7-kwolf@redhat.com> In-Reply-To: <20180302185448.6314-1-kwolf@redhat.com> References: <20180302185448.6314-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Fri, 02 Mar 2018 18:55:16 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Fri, 02 Mar 2018 18:55:16 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kwolf@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 06/37] iscsi: Switch cluster_sectors to byte-based X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Eric Blake We are gradually converting to byte-based interfaces, as they are easier to reason about than sector-based. Convert all uses of the cluster size in sectors, along with adding assertions that we are not dividing by zero. Improve some comment grammar while in the area. Signed-off-by: Eric Blake Acked-by: Paolo Bonzini Reviewed-by: Fam Zheng Signed-off-by: Kevin Wolf --- block/iscsi.c | 56 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 21 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index 421983dd6f..3414c21c7f 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -86,7 +86,7 @@ typedef struct IscsiLun { unsigned long *allocmap; unsigned long *allocmap_valid; long allocmap_size; - int cluster_sectors; + int cluster_size; bool use_16_for_rw; bool write_protected; bool lbpme; @@ -430,9 +430,10 @@ static int iscsi_allocmap_init(IscsiLun *iscsilun, int= open_flags) { iscsi_allocmap_free(iscsilun); =20 + assert(iscsilun->cluster_size); iscsilun->allocmap_size =3D - DIV_ROUND_UP(sector_lun2qemu(iscsilun->num_blocks, iscsilun), - iscsilun->cluster_sectors); + DIV_ROUND_UP(iscsilun->num_blocks * iscsilun->block_size, + iscsilun->cluster_size); =20 iscsilun->allocmap =3D bitmap_try_new(iscsilun->allocmap_size); if (!iscsilun->allocmap) { @@ -440,7 +441,7 @@ static int iscsi_allocmap_init(IscsiLun *iscsilun, int = open_flags) } =20 if (open_flags & BDRV_O_NOCACHE) { - /* in case that cache.direct =3D on all allocmap entries are + /* when cache.direct =3D on all allocmap entries are * treated as invalid to force a relookup of the block * status on every read request */ return 0; @@ -461,17 +462,19 @@ iscsi_allocmap_update(IscsiLun *iscsilun, int64_t sec= tor_num, int nb_sectors, bool allocated, bool valid) { int64_t cl_num_expanded, nb_cls_expanded, cl_num_shrunk, nb_cls_shrunk; + int cluster_sectors =3D iscsilun->cluster_size >> BDRV_SECTOR_BITS; =20 if (iscsilun->allocmap =3D=3D NULL) { return; } /* expand to entirely contain all affected clusters */ - cl_num_expanded =3D sector_num / iscsilun->cluster_sectors; + assert(cluster_sectors); + cl_num_expanded =3D sector_num / cluster_sectors; nb_cls_expanded =3D DIV_ROUND_UP(sector_num + nb_sectors, - iscsilun->cluster_sectors) - cl_num_exp= anded; + cluster_sectors) - cl_num_expanded; /* shrink to touch only completely contained clusters */ - cl_num_shrunk =3D DIV_ROUND_UP(sector_num, iscsilun->cluster_sectors); - nb_cls_shrunk =3D (sector_num + nb_sectors) / iscsilun->cluster_sectors + cl_num_shrunk =3D DIV_ROUND_UP(sector_num, cluster_sectors); + nb_cls_shrunk =3D (sector_num + nb_sectors) / cluster_sectors - cl_num_shrunk; if (allocated) { bitmap_set(iscsilun->allocmap, cl_num_expanded, nb_cls_expanded); @@ -535,9 +538,12 @@ iscsi_allocmap_is_allocated(IscsiLun *iscsilun, int64_= t sector_num, if (iscsilun->allocmap =3D=3D NULL) { return true; } - size =3D DIV_ROUND_UP(sector_num + nb_sectors, iscsilun->cluster_secto= rs); + assert(iscsilun->cluster_size); + size =3D DIV_ROUND_UP(sector_num + nb_sectors, + iscsilun->cluster_size >> BDRV_SECTOR_BITS); return !(find_next_bit(iscsilun->allocmap, size, - sector_num / iscsilun->cluster_sectors) =3D=3D = size); + sector_num * BDRV_SECTOR_SIZE / + iscsilun->cluster_size) =3D=3D size); } =20 static inline bool iscsi_allocmap_is_valid(IscsiLun *iscsilun, @@ -547,9 +553,12 @@ static inline bool iscsi_allocmap_is_valid(IscsiLun *i= scsilun, if (iscsilun->allocmap_valid =3D=3D NULL) { return false; } - size =3D DIV_ROUND_UP(sector_num + nb_sectors, iscsilun->cluster_secto= rs); + assert(iscsilun->cluster_size); + size =3D DIV_ROUND_UP(sector_num + nb_sectors, + iscsilun->cluster_size >> BDRV_SECTOR_BITS); return (find_next_zero_bit(iscsilun->allocmap_valid, size, - sector_num / iscsilun->cluster_sectors) =3D= =3D size); + sector_num * BDRV_SECTOR_SIZE / + iscsilun->cluster_size) =3D=3D size); } =20 static int coroutine_fn @@ -793,16 +802,21 @@ static int coroutine_fn iscsi_co_readv(BlockDriverSta= te *bs, BlockDriverState *file; /* check the block status from the beginning of the cluster * containing the start sector */ - int64_t ret =3D iscsi_co_get_block_status(bs, - sector_num - sector_num % iscsilun->cluster_sect= ors, - BDRV_REQUEST_MAX_SECTORS, &pnum, &file); + int cluster_sectors =3D iscsilun->cluster_size >> BDRV_SECTOR_BITS; + int head; + int64_t ret; + + assert(cluster_sectors); + head =3D sector_num % cluster_sectors; + ret =3D iscsi_co_get_block_status(bs, sector_num - head, + BDRV_REQUEST_MAX_SECTORS, &pnum, + &file); if (ret < 0) { return ret; } /* if the whole request falls into an unallocated area we can avoid - * to read and directly return zeroes instead */ - if (ret & BDRV_BLOCK_ZERO && - pnum >=3D nb_sectors + sector_num % iscsilun->cluster_sectors)= { + * reading and directly return zeroes instead */ + if (ret & BDRV_BLOCK_ZERO && pnum >=3D nb_sectors + head) { qemu_iovec_memset(iov, 0, 0x00, iov->size); return 0; } @@ -1953,8 +1967,8 @@ static int iscsi_open(BlockDriverState *bs, QDict *op= tions, int flags, * reasonable size */ if (iscsilun->bl.opt_unmap_gran * iscsilun->block_size >=3D 4 * 1024 && iscsilun->bl.opt_unmap_gran * iscsilun->block_size <=3D 16 * 1024 = * 1024) { - iscsilun->cluster_sectors =3D (iscsilun->bl.opt_unmap_gran * - iscsilun->block_size) >> BDRV_SECTOR_= BITS; + iscsilun->cluster_size =3D iscsilun->bl.opt_unmap_gran * + iscsilun->block_size; if (iscsilun->lbprz) { ret =3D iscsi_allocmap_init(iscsilun, bs->open_flags); } @@ -2163,7 +2177,7 @@ static int iscsi_get_info(BlockDriverState *bs, Block= DriverInfo *bdi) { IscsiLun *iscsilun =3D bs->opaque; bdi->unallocated_blocks_are_zero =3D iscsilun->lbprz; - bdi->cluster_size =3D iscsilun->cluster_sectors * BDRV_SECTOR_SIZE; + bdi->cluster_size =3D iscsilun->cluster_size; return 0; } =20 --=20 2.13.6