From nobody Tue Apr 15 09:52:04 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 Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1509024554771192.1234519827342; Thu, 26 Oct 2017 06:29:14 -0700 (PDT) Received: from localhost ([::1]:52914 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7iDc-0000fL-VM for importer@patchew.org; Thu, 26 Oct 2017 09:29:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58694) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7i38-0000Pb-VE for qemu-devel@nongnu.org; Thu, 26 Oct 2017 09:18:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e7i32-0001pz-Q0 for qemu-devel@nongnu.org; Thu, 26 Oct 2017 09:18:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47992) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e7i2s-0001gD-4s; Thu, 26 Oct 2017 09:18:02 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3A49562EB8; Thu, 26 Oct 2017 13:18:01 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.118.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 90D537F7E7; Thu, 26 Oct 2017 13:17:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 3A49562EB8 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=kwolf@redhat.com From: Kevin Wolf To: qemu-block@nongnu.org Date: Thu, 26 Oct 2017 15:17:12 +0200 Message-Id: <20171026131741.5059-7-kwolf@redhat.com> In-Reply-To: <20171026131741.5059-1-kwolf@redhat.com> References: <20171026131741.5059-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 26 Oct 2017 13:18:01 +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] [PULL 06/35] qcow2: Switch is_zero_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 another internal function (no semantic change), and rename it to is_zero() in the process. Signed-off-by: Eric Blake Reviewed-by: Fam Zheng Reviewed-by: John Snow Signed-off-by: Kevin Wolf --- block/qcow2.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 0e4c91cabc..795be673e7 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2972,21 +2972,29 @@ finish: } =20 =20 -static bool is_zero_sectors(BlockDriverState *bs, int64_t start, - uint32_t count) +static bool is_zero(BlockDriverState *bs, int64_t offset, int64_t bytes) { int nr; int64_t res; + int64_t start; =20 - if (start + count > bs->total_sectors) { - count =3D bs->total_sectors - start; + /* TODO: Widening to sector boundaries should only be needed as + * long as we can't query finer granularity. */ + start =3D QEMU_ALIGN_DOWN(offset, BDRV_SECTOR_SIZE); + bytes =3D QEMU_ALIGN_UP(offset + bytes, BDRV_SECTOR_SIZE) - start; + + /* Clamp to image length, before checking status of underlying sectors= */ + if (start + bytes > bs->total_sectors * BDRV_SECTOR_SIZE) { + bytes =3D bs->total_sectors * BDRV_SECTOR_SIZE - start; } =20 - if (!count) { + if (!bytes) { return true; } - res =3D bdrv_get_block_status_above(bs, NULL, start, count, &nr, NULL); - return res >=3D 0 && (res & BDRV_BLOCK_ZERO) && nr =3D=3D count; + res =3D bdrv_get_block_status_above(bs, NULL, start >> BDRV_SECTOR_BIT= S, + bytes >> BDRV_SECTOR_BITS, &nr, NULL= ); + return res >=3D 0 && (res & BDRV_BLOCK_ZERO) && + nr * BDRV_SECTOR_SIZE =3D=3D bytes; } =20 static coroutine_fn int qcow2_co_pwrite_zeroes(BlockDriverState *bs, @@ -3004,24 +3012,21 @@ static coroutine_fn int qcow2_co_pwrite_zeroes(Bloc= kDriverState *bs, } =20 if (head || tail) { - int64_t cl_start =3D (offset - head) >> BDRV_SECTOR_BITS; uint64_t off; unsigned int nr; =20 assert(head + bytes <=3D s->cluster_size); =20 /* check whether remainder of cluster already reads as zero */ - if (!(is_zero_sectors(bs, cl_start, - DIV_ROUND_UP(head, BDRV_SECTOR_SIZE)) && - is_zero_sectors(bs, (offset + bytes) >> BDRV_SECTOR_BITS, - DIV_ROUND_UP(-tail & (s->cluster_size - 1), - BDRV_SECTOR_SIZE)))) { + if (!(is_zero(bs, offset - head, head) && + is_zero(bs, offset + bytes, + tail ? s->cluster_size - tail : 0))) { return -ENOTSUP; } =20 qemu_co_mutex_lock(&s->lock); /* We can have new write after previous check */ - offset =3D cl_start << BDRV_SECTOR_BITS; + offset =3D QEMU_ALIGN_DOWN(offset, s->cluster_size); bytes =3D s->cluster_size; nr =3D s->cluster_size; ret =3D qcow2_get_cluster_offset(bs, offset, &nr, &off); --=20 2.13.6