{"id":813858,"url":"http://patchwork.ozlabs.org/api/patches/813858/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170914144032.14945-5-eblake@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170914144032.14945-5-eblake@redhat.com>","list_archive_url":null,"date":"2017-09-14T14:40:16","name":"[v3,04/20] gluster: Switch to .bdrv_co_block_status()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"1e149f3a4ea188401922e40ef889e431b072c22b","submitter":{"id":6591,"url":"http://patchwork.ozlabs.org/api/people/6591/?format=json","name":"Eric Blake","email":"eblake@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170914144032.14945-5-eblake@redhat.com/mbox/","series":[{"id":3114,"url":"http://patchwork.ozlabs.org/api/series/3114/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3114","date":"2017-09-14T14:40:12","name":"add byte-based block_status driver callbacks","version":3,"mbox":"http://patchwork.ozlabs.org/series/3114/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813858/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813858/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=eblake@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xtM2H3fHqz9sRg\n\tfor ;\n\tFri, 15 Sep 2017 00:52:23 +1000 (AEST)","from localhost ([::1]:48229 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsVV7-00015h-D5\n\tfor incoming@patchwork.ozlabs.org; Thu, 14 Sep 2017 10:52:21 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:46304)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsVK6-0005bE-MJ\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 10:41:00 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsVK5-0002Rv-Gu\n\tfor qemu-devel@nongnu.org; Thu, 14 Sep 2017 10:40:58 -0400","from mx1.redhat.com ([209.132.183.28]:48656)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dsVJy-0002L3-7a; Thu, 14 Sep 2017 10:40:50 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 38B8A7CDE0;\n\tThu, 14 Sep 2017 14:40:49 +0000 (UTC)","from red.redhat.com (ovpn-123-70.rdu2.redhat.com [10.10.123.70])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 8CFB617AC7;\n\tThu, 14 Sep 2017 14:40:46 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 38B8A7CDE0","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Thu, 14 Sep 2017 09:40:16 -0500","Message-Id":"<20170914144032.14945-5-eblake@redhat.com>","In-Reply-To":"<20170914144032.14945-1-eblake@redhat.com>","References":"<20170914144032.14945-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\n\t(mx1.redhat.com [10.5.110.28]);\n\tThu, 14 Sep 2017 14:40:49 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v3 04/20] gluster: Switch to\n\t.bdrv_co_block_status()","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"kwolf@redhat.com, famz@redhat.com, qemu-block@nongnu.org,\n\tJeff Cody , Max Reitz ,\n\tjsnow@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"We are gradually moving away from sector-based interfaces, towards\nbyte-based. Update the gluster driver accordingly. In mapping\nmode, note that the entire file is reported as allocated, so we can\ntake a shortcut and skip find_allocation().\n\nSigned-off-by: Eric Blake \n\n---\nv2: tweak comments [Prasanna], add mapping, drop R-b\n---\n block/gluster.c | 62 +++++++++++++++++++++++++++++++--------------------------\n 1 file changed, 34 insertions(+), 28 deletions(-)","diff":"diff --git a/block/gluster.c b/block/gluster.c\nindex 0f4265a3a4..f128db3e1f 100644\n--- a/block/gluster.c\n+++ b/block/gluster.c\n@@ -1349,26 +1349,26 @@ exit:\n }\n\n /*\n- * Returns the allocation status of the specified sectors.\n+ * Returns the allocation status of the specified offset.\n *\n- * If 'sector_num' is beyond the end of the disk image the return value is 0\n+ * If 'offset' is beyond the end of the disk image the return value is 0\n * and 'pnum' is set to 0.\n *\n- * 'pnum' is set to the number of sectors (including and immediately following\n- * the specified sector) that are known to be in the same\n+ * 'pnum' is set to the number of bytes (including and immediately following\n+ * the specified offset) that are known to be in the same\n * allocated/unallocated state.\n *\n- * 'nb_sectors' is the max value 'pnum' should be set to. If nb_sectors goes\n+ * 'bytes' is the max value 'pnum' should be set to. If bytes goes\n * beyond the end of the disk image it will be clamped.\n *\n- * (Based on raw_co_get_block_status() from file-posix.c.)\n+ * (Based on raw_co_block_status() from file-posix.c.)\n */\n-static int64_t coroutine_fn qemu_gluster_co_get_block_status(\n- BlockDriverState *bs, int64_t sector_num, int nb_sectors, int *pnum,\n- BlockDriverState **file)\n+static int64_t coroutine_fn qemu_gluster_co_block_status(\n+ BlockDriverState *bs, bool mapping, int64_t offset, int64_t bytes,\n+ int64_t *pnum, BlockDriverState **file)\n {\n BDRVGlusterState *s = bs->opaque;\n- off_t start, data = 0, hole = 0;\n+ off_t data = 0, hole = 0;\n int64_t total_size;\n int ret = -EINVAL;\n\n@@ -1376,41 +1376,47 @@ static int64_t coroutine_fn qemu_gluster_co_get_block_status(\n return ret;\n }\n\n- start = sector_num * BDRV_SECTOR_SIZE;\n total_size = bdrv_getlength(bs);\n if (total_size < 0) {\n return total_size;\n- } else if (start >= total_size) {\n+ } else if (offset >= total_size) {\n *pnum = 0;\n return 0;\n- } else if (start + nb_sectors * BDRV_SECTOR_SIZE > total_size) {\n- nb_sectors = DIV_ROUND_UP(total_size - start, BDRV_SECTOR_SIZE);\n+ } else if (offset + bytes > total_size) {\n+ bytes = total_size - offset;\n }\n\n- ret = find_allocation(bs, start, &data, &hole);\n+ if (!mapping) {\n+ *pnum = bytes;\n+ *file = bs;\n+ return BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID |\n+ (offset & BDRV_BLOCK_OFFSET_MASK);\n+ }\n+\n+ ret = find_allocation(bs, offset, &data, &hole);\n if (ret == -ENXIO) {\n /* Trailing hole */\n- *pnum = nb_sectors;\n+ *pnum = bytes;\n ret = BDRV_BLOCK_ZERO;\n } else if (ret < 0) {\n /* No info available, so pretend there are no holes */\n- *pnum = nb_sectors;\n+ *pnum = bytes;\n ret = BDRV_BLOCK_DATA;\n- } else if (data == start) {\n- /* On a data extent, compute sectors to the end of the extent,\n+ } else if (data == offset) {\n+ /* On a data extent, compute bytes to the end of the extent,\n * possibly including a partial sector at EOF. */\n- *pnum = MIN(nb_sectors, DIV_ROUND_UP(hole - start, BDRV_SECTOR_SIZE));\n+ *pnum = MIN(bytes, hole - offset);\n ret = BDRV_BLOCK_DATA;\n } else {\n- /* On a hole, compute sectors to the beginning of the next extent. */\n- assert(hole == start);\n- *pnum = MIN(nb_sectors, (data - start) / BDRV_SECTOR_SIZE);\n+ /* On a hole, compute bytes to the beginning of the next extent. */\n+ assert(hole == offset);\n+ *pnum = MIN(bytes, data - offset);\n ret = BDRV_BLOCK_ZERO;\n }\n\n *file = bs;\n\n- return ret | BDRV_BLOCK_OFFSET_VALID | start;\n+ return ret | BDRV_BLOCK_OFFSET_VALID | (offset & BDRV_BLOCK_OFFSET_MASK);\n }\n\n\n@@ -1438,7 +1444,7 @@ static BlockDriver bdrv_gluster = {\n #ifdef CONFIG_GLUSTERFS_ZEROFILL\n .bdrv_co_pwrite_zeroes = qemu_gluster_co_pwrite_zeroes,\n #endif\n- .bdrv_co_get_block_status = qemu_gluster_co_get_block_status,\n+ .bdrv_co_block_status = qemu_gluster_co_block_status,\n .create_opts = &qemu_gluster_create_opts,\n };\n\n@@ -1466,7 +1472,7 @@ static BlockDriver bdrv_gluster_tcp = {\n #ifdef CONFIG_GLUSTERFS_ZEROFILL\n .bdrv_co_pwrite_zeroes = qemu_gluster_co_pwrite_zeroes,\n #endif\n- .bdrv_co_get_block_status = qemu_gluster_co_get_block_status,\n+ .bdrv_co_block_status = qemu_gluster_co_block_status,\n .create_opts = &qemu_gluster_create_opts,\n };\n\n@@ -1494,7 +1500,7 @@ static BlockDriver bdrv_gluster_unix = {\n #ifdef CONFIG_GLUSTERFS_ZEROFILL\n .bdrv_co_pwrite_zeroes = qemu_gluster_co_pwrite_zeroes,\n #endif\n- .bdrv_co_get_block_status = qemu_gluster_co_get_block_status,\n+ .bdrv_co_block_status = qemu_gluster_co_block_status,\n .create_opts = &qemu_gluster_create_opts,\n };\n\n@@ -1528,7 +1534,7 @@ static BlockDriver bdrv_gluster_rdma = {\n #ifdef CONFIG_GLUSTERFS_ZEROFILL\n .bdrv_co_pwrite_zeroes = qemu_gluster_co_pwrite_zeroes,\n #endif\n- .bdrv_co_get_block_status = qemu_gluster_co_get_block_status,\n+ .bdrv_co_block_status = qemu_gluster_co_block_status,\n .create_opts = &qemu_gluster_create_opts,\n };\n\n","prefixes":["v3","04/20"]}