From patchwork Wed Oct 4 02:00:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 821111 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y6K0d28Wqz9sRm for ; Wed, 4 Oct 2017 13:02:23 +1100 (AEDT) Received: from localhost ([::1]:32782 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzZ0u-0000s2-LE for incoming@patchwork.ozlabs.org; Tue, 03 Oct 2017 22:02:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34158) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzZ08-0000nn-1Y for qemu-devel@nongnu.org; Tue, 03 Oct 2017 22:01:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dzZ06-00060A-Fm for qemu-devel@nongnu.org; Tue, 03 Oct 2017 22:01:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49382) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dzYzz-0005tf-MW; Tue, 03 Oct 2017 22:01:23 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 474388763A; Wed, 4 Oct 2017 02:01:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 474388763A 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=fail smtp.mailfrom=eblake@redhat.com Received: from red.redhat.com (ovpn-120-2.rdu2.redhat.com [10.10.120.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0E1F861F2F; Wed, 4 Oct 2017 02:01:16 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Tue, 3 Oct 2017 21:00:25 -0500 Message-Id: <20171004020048.26379-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 04 Oct 2017 02:01:22 +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 v5 00/23] make bdrv_get_block_status 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, famz@redhat.com, jsnow@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" There are patches floating around to add NBD_CMD_BLOCK_STATUS, but NBD wants to report status on byte granularity (even if the reporting will probably be naturally aligned to sectors or even much higher levels). I've therefore started the task of converting our block status code to report at a byte granularity rather than sectors. Now that 2.11 is open, I'm rebasing/reposting the remaining patches. The overall conversion currently looks like: part 1: bdrv_is_allocated (merged, commit 51b0a488) part 2: dirty-bitmap (v10 is queued [1]) part 3: bdrv_get_block_status (this series, v4 at [2]) part 4: .bdrv_co_block_status (v3 is posted [4], mostly reviewed) Available as a tag at: git fetch git://repo.or.cz/qemu/ericb.git nbd-byte-status-v4 Based-on: <20170925145526.32690-1-eblake@redhat.com> ([PATCH v10 00/20] make dirty-bitmap byte-based) Based-on: <20171004014347.25099-1-eblake@redhat.com> ([PATCH v2 0/5] block: Avoid copy-on-read assertions) [1] https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg06848.html [2] https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg03543.html [3] https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg03812.html [4] https://lists.gnu.org/archive/html/qemu-devel/2017-10/msg00524.html Since v4: - rebase to fixes for copy-on-read - tweak bdrv_co_block_status goto/label usage for easier reading [John] - more added comments and improved commit messages - fix a couple of bugs, such as wrong trace-events usage - add R-b where things didn't change drastically 001/23:[0042] [FC] 'block: Allow NULL file for bdrv_get_block_status()' 002/23:[0006] [FC] 'block: Add flag to avoid wasted work in bdrv_is_allocated()' 003/23:[0003] [FC] 'block: Make bdrv_round_to_clusters() signature more useful' 004/23:[----] [--] 'qcow2: Switch is_zero_sectors() to byte-based' 005/23:[----] [--] 'block: Switch bdrv_make_zero() to byte-based' 006/23:[----] [--] 'qemu-img: Switch get_block_status() to byte-based' 007/23:[0010] [FC] 'block: Convert bdrv_get_block_status() to bytes' 008/23:[0042] [FC] 'block: Switch bdrv_co_get_block_status() to byte-based' 009/23:[----] [--] 'block: Switch BdrvCoGetBlockStatusData to byte-based' 010/23:[----] [--] 'block: Switch bdrv_common_block_status_above() to byte-based' 011/23:[----] [-C] 'block: Switch bdrv_co_get_block_status_above() to byte-based' 012/23:[0019] [FC] 'block: Convert bdrv_get_block_status_above() to bytes' 013/23:[0008] [FC] 'qemu-img: Simplify logic in img_compare()' 014/23:[----] [--] 'qemu-img: Speed up compare on pre-allocated larger file' 015/23:[----] [--] 'qemu-img: Add find_nonzero()' 016/23:[----] [--] 'qemu-img: Drop redundant error message in compare' 017/23:[----] [--] 'qemu-img: Change check_empty_sectors() to byte-based' 018/23:[----] [--] 'qemu-img: Change compare_sectors() to be byte-based' 019/23:[----] [--] 'qemu-img: Change img_rebase() to be byte-based' 020/23:[0005] [FC] 'qemu-img: Change img_compare() to be byte-based' 021/23:[0061] [FC] 'block: Align block status requests' 022/23:[----] [--] 'block: Relax bdrv_aligned_preadv() assertion' 023/23:[----] [--] 'qemu-io: Relax 'alloc' now that block-status doesn't assert' Eric Blake (23): block: Allow NULL file for bdrv_get_block_status() block: Add flag to avoid wasted work in bdrv_is_allocated() block: Make bdrv_round_to_clusters() signature more useful qcow2: Switch is_zero_sectors() to byte-based block: Switch bdrv_make_zero() to byte-based qemu-img: Switch get_block_status() to byte-based block: Convert bdrv_get_block_status() to bytes block: Switch bdrv_co_get_block_status() to byte-based block: Switch BdrvCoGetBlockStatusData to byte-based block: Switch bdrv_common_block_status_above() to byte-based block: Switch bdrv_co_get_block_status_above() to byte-based block: Convert bdrv_get_block_status_above() to bytes qemu-img: Simplify logic in img_compare() qemu-img: Speed up compare on pre-allocated larger file qemu-img: Add find_nonzero() qemu-img: Drop redundant error message in compare qemu-img: Change check_empty_sectors() to byte-based qemu-img: Change compare_sectors() to be byte-based qemu-img: Change img_rebase() to be byte-based qemu-img: Change img_compare() to be byte-based block: Align block status requests block: Relax bdrv_aligned_preadv() assertion qemu-io: Relax 'alloc' now that block-status doesn't assert include/block/block.h | 26 ++-- include/block/block_int.h | 11 +- block/io.c | 303 +++++++++++++++++++++---------------- block/blkdebug.c | 13 +- block/mirror.c | 24 +-- block/qcow2-cluster.c | 2 +- block/qcow2.c | 53 +++---- qemu-img.c | 365 ++++++++++++++++++++------------------------- qemu-io-cmds.c | 13 -- block/trace-events | 2 +- tests/qemu-iotests/074.out | 2 - tests/qemu-iotests/177 | 12 +- tests/qemu-iotests/177.out | 19 ++- 13 files changed, 431 insertions(+), 414 deletions(-)