From nobody Mon Feb 9 13:38:23 2026 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1499120914778306.2042750495584; Mon, 3 Jul 2017 15:28:34 -0700 (PDT) Received: from localhost ([::1]:37546 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dS9pZ-0001uy-6w for importer@patchew.org; Mon, 03 Jul 2017 18:28:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55953) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dS9cy-0007gb-VM for qemu-devel@nongnu.org; Mon, 03 Jul 2017 18:15:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dS9cx-0004eF-IS for qemu-devel@nongnu.org; Mon, 03 Jul 2017 18:15:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57892) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dS9cu-0004Yo-AA; Mon, 03 Jul 2017 18:15:28 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 52557A0218; Mon, 3 Jul 2017 22:15:27 +0000 (UTC) Received: from red.redhat.com (ovpn-120-36.rdu2.redhat.com [10.10.120.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 087C16973B; Mon, 3 Jul 2017 22:15:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 52557A0218 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=eblake@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 52557A0218 From: Eric Blake To: qemu-devel@nongnu.org Date: Mon, 3 Jul 2017 17:14:50 -0500 Message-Id: <20170703221456.30817-10-eblake@redhat.com> In-Reply-To: <20170703221456.30817-1-eblake@redhat.com> References: <20170703221456.30817-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 03 Jul 2017 22:15:27 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 09/15] block: Switch bdrv_co_get_block_status() 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, Fam Zheng , qemu-block@nongnu.org, el13635@mail.ntua.gr, Max Reitz , Stefan Hajnoczi , jsnow@redhat.com 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" We are gradually converting to byte-based interfaces, as they are easier to reason about than sector-based. Convert another internal function (no semantic change), and as with its public counterpart, rename to bdrv_co_block_status() to make the compiler enforce that we catch all uses. For now, we assert that callers still pass aligned data, but ultimately, this will be the function where we hand off to a byte-based driver callback, and will eventually need to add logic to ensure we round calls according to the driver's request_alignment then touch up the result handed back to the caller, to start permitting a caller to pass unaligned offsets. Signed-off-by: Eric Blake Reviewed-by: Fam Zheng --- v2: rebase to earlier changes --- block/io.c | 90 ++++++++++++++++++++++++++++++++++++----------------------= ---- 1 file changed, 53 insertions(+), 37 deletions(-) diff --git a/block/io.c b/block/io.c index 2662f37..2d324af 100644 --- a/block/io.c +++ b/block/io.c @@ -1721,42 +1721,43 @@ int64_t coroutine_fn bdrv_co_get_block_status_from_= backing(BlockDriverState *bs, * status; this is a hint that a larger 'pnum' result is more * important than including BDRV_BLOCK_OFFSET_VALID in the return. * - * If 'sector_num' is beyond the end of the disk image the return value is + * If 'offset' is beyond the end of the disk image the return value is * BDRV_BLOCK_EOF and 'pnum' is set to 0. * - * 'pnum' is set to the number of sectors (including and immediately follo= wing - * the specified sector) that are known to be in the same - * allocated/unallocated state. + * 'pnum' is set to the number of bytes (including and immediately followi= ng + * the specified offset) that are known to be in the same + * allocated/unallocated state. It may be NULL. * - * 'nb_sectors' is the max value 'pnum' should be set to. If nb_sectors g= oes + * 'bytes' is the max value 'pnum' should be set to. If bytes goes * beyond the end of the disk image it will be clamped; if 'pnum' is set to * the end of the image, then the returned value will include BDRV_BLOCK_E= OF. * * If returned value is positive, BDRV_BLOCK_OFFSET_VALID bit is set, and - * 'file' is non-NULL, then '*file' points to the BDS which the sector ran= ge - * is allocated in. + * 'file' is non-NULL, then '*file' points to the BDS which owns the + * allocated sector that contains offset. */ -static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs, - bool allocation, - int64_t sector_num, - int nb_sectors, int *= pnum, - BlockDriverState **fi= le) +static int64_t coroutine_fn bdrv_co_block_status(BlockDriverState *bs, + bool allocation, + int64_t offset, int64_t b= ytes, + int64_t *pnum, + BlockDriverState **file) { - int64_t total_sectors; - int64_t n; + int64_t total_size; + int64_t n; /* bytes */ int64_t ret, ret2; BlockDriverState *local_file =3D NULL; + int count; /* sectors */ assert(pnum); - total_sectors =3D bdrv_nb_sectors(bs); - if (total_sectors < 0) { + total_size =3D bdrv_getlength(bs); + if (total_size < 0) { if (file) { *file =3D NULL; } - return total_sectors; + return total_size; } - if (sector_num >=3D total_sectors) { + if (offset >=3D total_size) { *pnum =3D 0; if (file) { *file =3D NULL; @@ -1764,19 +1765,19 @@ static int64_t coroutine_fn bdrv_co_get_block_statu= s(BlockDriverState *bs, return BDRV_BLOCK_EOF; } - n =3D total_sectors - sector_num; - if (n < nb_sectors) { - nb_sectors =3D n; + n =3D total_size - offset; + if (n < bytes) { + bytes =3D n; } if (!bs->drv->bdrv_co_get_block_status) { - *pnum =3D nb_sectors; + *pnum =3D bytes; ret =3D BDRV_BLOCK_DATA | BDRV_BLOCK_ALLOCATED; - if (sector_num + nb_sectors =3D=3D total_sectors) { + if (offset + bytes =3D=3D total_size) { ret |=3D BDRV_BLOCK_EOF; } if (bs->drv->protocol_name) { - ret |=3D BDRV_BLOCK_OFFSET_VALID | (sector_num * BDRV_SECTOR_S= IZE); + ret |=3D BDRV_BLOCK_OFFSET_VALID | (offset & BDRV_BLOCK_OFFSET= _MASK); if (file) { *file =3D bs; } @@ -1787,18 +1788,27 @@ static int64_t coroutine_fn bdrv_co_get_block_statu= s(BlockDriverState *bs, } bdrv_inc_in_flight(bs); - ret =3D bs->drv->bdrv_co_get_block_status(bs, sector_num, nb_sectors, = pnum, + /* + * TODO: Rather than require aligned offsets, we could instead + * round to the driver's request_alignment here, then touch up + * count afterwards back to the caller's expectations. + */ + assert(QEMU_IS_ALIGNED(offset | bytes, BDRV_SECTOR_SIZE)); + ret =3D bs->drv->bdrv_co_get_block_status(bs, offset >> BDRV_SECTOR_BI= TS, + bytes >> BDRV_SECTOR_BITS, &co= unt, &local_file); if (ret < 0) { *pnum =3D 0; goto out; } + *pnum =3D count * BDRV_SECTOR_SIZE; if (ret & BDRV_BLOCK_RAW) { assert(ret & BDRV_BLOCK_OFFSET_VALID && local_file); - ret =3D bdrv_co_get_block_status(local_file, allocation, - ret >> BDRV_SECTOR_BITS, - *pnum, pnum, &local_file); + ret =3D bdrv_co_block_status(local_file, allocation, + ret & BDRV_BLOCK_OFFSET_MASK, + *pnum, pnum, &local_file); + assert(QEMU_IS_ALIGNED(*pnum, BDRV_SECTOR_SIZE)); goto out; } @@ -1809,8 +1819,8 @@ static int64_t coroutine_fn bdrv_co_get_block_status(= BlockDriverState *bs, ret |=3D BDRV_BLOCK_ZERO; } else if (bs->backing) { BlockDriverState *bs2 =3D bs->backing->bs; - int64_t nb_sectors2 =3D bdrv_nb_sectors(bs2); - if (nb_sectors2 >=3D 0 && sector_num >=3D nb_sectors2) { + int64_t size2 =3D bdrv_getlength(bs2); + if (size2 >=3D 0 && offset >=3D size2) { ret |=3D BDRV_BLOCK_ZERO; } } @@ -1819,11 +1829,11 @@ static int64_t coroutine_fn bdrv_co_get_block_statu= s(BlockDriverState *bs, if (!allocation && local_file && local_file !=3D bs && (ret & BDRV_BLOCK_DATA) && !(ret & BDRV_BLOCK_ZERO) && (ret & BDRV_BLOCK_OFFSET_VALID)) { - int file_pnum; + int64_t file_pnum; - ret2 =3D bdrv_co_get_block_status(local_file, true, - ret >> BDRV_SECTOR_BITS, - *pnum, &file_pnum, NULL); + ret2 =3D bdrv_co_block_status(local_file, true, + ret & BDRV_BLOCK_OFFSET_MASK, + *pnum, &file_pnum, NULL); if (ret2 >=3D 0) { /* Ignore errors. This is just providing extra information, it * is useful but not necessary. @@ -1849,7 +1859,7 @@ out: *file =3D local_file; } bdrv_dec_in_flight(bs); - if (ret >=3D 0 && sector_num + *pnum =3D=3D total_sectors) { + if (ret >=3D 0 && offset + *pnum =3D=3D total_size) { ret |=3D BDRV_BLOCK_EOF; } return ret; @@ -1869,11 +1879,17 @@ static int64_t coroutine_fn bdrv_co_get_block_statu= s_above(BlockDriverState *bs, assert(bs !=3D base); for (p =3D bs; p !=3D base; p =3D backing_bs(p)) { - ret =3D bdrv_co_get_block_status(p, allocation, sector_num, nb_sec= tors, - pnum, file); + int64_t count; + + ret =3D bdrv_co_block_status(p, allocation, + sector_num * BDRV_SECTOR_SIZE, + nb_sectors * BDRV_SECTOR_SIZE, &count, + file); if (ret < 0) { break; } + assert(QEMU_IS_ALIGNED(count, BDRV_SECTOR_SIZE)); + *pnum =3D count >> BDRV_SECTOR_BITS; if (ret & BDRV_BLOCK_ZERO && ret & BDRV_BLOCK_EOF && !first) { /* * Reading beyond the end of the file continues to read --=20 2.9.4