From nobody Sun Oct 5 19:22:55 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) 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 1507835022148825.3188029187129; Thu, 12 Oct 2017 12:03:42 -0700 (PDT) Received: from localhost ([::1]:46845 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e2ilS-0005P0-7S for importer@patchew.org; Thu, 12 Oct 2017 15:03:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e2ik0-0004bE-J5 for qemu-devel@nongnu.org; Thu, 12 Oct 2017 15:02:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e2ijy-0007jM-Uq for qemu-devel@nongnu.org; Thu, 12 Oct 2017 15:01:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41668) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e2ijq-0007eB-Qu; Thu, 12 Oct 2017 15:01:47 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C336F7EBD6; Thu, 12 Oct 2017 19:01:45 +0000 (UTC) Received: from red.redhat.com (ovpn-122-223.rdu2.redhat.com [10.10.122.223]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B1977836F; Thu, 12 Oct 2017 19:00:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C336F7EBD6 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=eblake@redhat.com From: Eric Blake To: qemu-devel@nongnu.org Date: Thu, 12 Oct 2017 13:59:00 -0500 Message-Id: <20171012185916.22776-5-eblake@redhat.com> In-Reply-To: <20171012185916.22776-1-eblake@redhat.com> References: <20171012185916.22776-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 12 Oct 2017 19:01:45 +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 v4 04/20] gluster: Switch to .bdrv_co_block_status() 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, famz@redhat.com, qemu-block@nongnu.org, Jeff Cody , Max Reitz , jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We are gradually moving away from sector-based interfaces, towards byte-based. Update the gluster driver accordingly. In want_zero mode, we continue to report fine-grained hole information (the caller wants as much mapping detail as possible); but when not in that mode, the caller prefers larger *pnum and merely cares about what offsets are allocated at this layer, rather than where the holes live. Since holes still read as zeroes at this layer (rather than deferring to a backing layer), we can take the shortcut of skipping find_allocation(), and merely state that all bytes are allocated. Signed-off-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy --- v4: tweak commit message [Fam], rebase to interface tweak v3: no change v2: tweak comments [Prasanna], add mapping, drop R-b --- block/gluster.c | 67 +++++++++++++++++++++++++++++++++--------------------= ---- 1 file changed, 39 insertions(+), 28 deletions(-) diff --git a/block/gluster.c b/block/gluster.c index 0f4265a3a4..518f1984de 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -1349,26 +1349,30 @@ exit: } /* - * Returns the allocation status of the specified sectors. + * Returns the allocation status of the specified offset. * - * If 'sector_num' is beyond the end of the disk image the return value is= 0 + * If 'offset' is beyond the end of the disk image the return value is 0 * 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 + * '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. * - * '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. * - * (Based on raw_co_get_block_status() from file-posix.c.) + * (Based on raw_co_block_status() from file-posix.c.) */ -static int64_t coroutine_fn qemu_gluster_co_get_block_status( - BlockDriverState *bs, int64_t sector_num, int nb_sectors, int *pnu= m, - BlockDriverState **file) +static int coroutine_fn qemu_gluster_co_block_status(BlockDriverState *bs, + bool want_zero, + int64_t offset, + int64_t bytes, + int64_t *pnum, + int64_t *map, + BlockDriverState **fi= le) { BDRVGlusterState *s =3D bs->opaque; - off_t start, data =3D 0, hole =3D 0; + off_t data =3D 0, hole =3D 0; int64_t total_size; int ret =3D -EINVAL; @@ -1376,41 +1380,48 @@ static int64_t coroutine_fn qemu_gluster_co_get_blo= ck_status( return ret; } - start =3D sector_num * BDRV_SECTOR_SIZE; total_size =3D bdrv_getlength(bs); if (total_size < 0) { return total_size; - } else if (start >=3D total_size) { + } else if (offset >=3D total_size) { *pnum =3D 0; return 0; - } else if (start + nb_sectors * BDRV_SECTOR_SIZE > total_size) { - nb_sectors =3D DIV_ROUND_UP(total_size - start, BDRV_SECTOR_SIZE); + } else if (offset + bytes > total_size) { + bytes =3D total_size - offset; } - ret =3D find_allocation(bs, start, &data, &hole); + if (!want_zero) { + *pnum =3D bytes; + *map =3D offset; + *file =3D bs; + return BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID; + } + + ret =3D find_allocation(bs, offset, &data, &hole); if (ret =3D=3D -ENXIO) { /* Trailing hole */ - *pnum =3D nb_sectors; + *pnum =3D bytes; ret =3D BDRV_BLOCK_ZERO; } else if (ret < 0) { /* No info available, so pretend there are no holes */ - *pnum =3D nb_sectors; + *pnum =3D bytes; ret =3D BDRV_BLOCK_DATA; - } else if (data =3D=3D start) { - /* On a data extent, compute sectors to the end of the extent, + } else if (data =3D=3D offset) { + /* On a data extent, compute bytes to the end of the extent, * possibly including a partial sector at EOF. */ - *pnum =3D MIN(nb_sectors, DIV_ROUND_UP(hole - start, BDRV_SECTOR_S= IZE)); + *pnum =3D MIN(bytes, hole - offset); ret =3D BDRV_BLOCK_DATA; } else { - /* On a hole, compute sectors to the beginning of the next extent.= */ - assert(hole =3D=3D start); - *pnum =3D MIN(nb_sectors, (data - start) / BDRV_SECTOR_SIZE); + /* On a hole, compute bytes to the beginning of the next extent. = */ + assert(hole =3D=3D offset); + *pnum =3D MIN(bytes, data - offset); ret =3D BDRV_BLOCK_ZERO; } + *map =3D offset; *file =3D bs; - return ret | BDRV_BLOCK_OFFSET_VALID | start; + return ret | BDRV_BLOCK_OFFSET_VALID; } @@ -1438,7 +1449,7 @@ static BlockDriver bdrv_gluster =3D { #ifdef CONFIG_GLUSTERFS_ZEROFILL .bdrv_co_pwrite_zeroes =3D qemu_gluster_co_pwrite_zeroes, #endif - .bdrv_co_get_block_status =3D qemu_gluster_co_get_block_status, + .bdrv_co_block_status =3D qemu_gluster_co_block_status, .create_opts =3D &qemu_gluster_create_opts, }; @@ -1466,7 +1477,7 @@ static BlockDriver bdrv_gluster_tcp =3D { #ifdef CONFIG_GLUSTERFS_ZEROFILL .bdrv_co_pwrite_zeroes =3D qemu_gluster_co_pwrite_zeroes, #endif - .bdrv_co_get_block_status =3D qemu_gluster_co_get_block_status, + .bdrv_co_block_status =3D qemu_gluster_co_block_status, .create_opts =3D &qemu_gluster_create_opts, }; @@ -1494,7 +1505,7 @@ static BlockDriver bdrv_gluster_unix =3D { #ifdef CONFIG_GLUSTERFS_ZEROFILL .bdrv_co_pwrite_zeroes =3D qemu_gluster_co_pwrite_zeroes, #endif - .bdrv_co_get_block_status =3D qemu_gluster_co_get_block_status, + .bdrv_co_block_status =3D qemu_gluster_co_block_status, .create_opts =3D &qemu_gluster_create_opts, }; @@ -1528,7 +1539,7 @@ static BlockDriver bdrv_gluster_rdma =3D { #ifdef CONFIG_GLUSTERFS_ZEROFILL .bdrv_co_pwrite_zeroes =3D qemu_gluster_co_pwrite_zeroes, #endif - .bdrv_co_get_block_status =3D qemu_gluster_co_get_block_status, + .bdrv_co_block_status =3D qemu_gluster_co_block_status, .create_opts =3D &qemu_gluster_create_opts, }; --=20 2.13.6