From nobody Wed Apr 16 08:01:16 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1499448620900852.0303044384934; Fri, 7 Jul 2017 10:30:20 -0700 (PDT) Received: from localhost ([::1]:57805 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTX58-0006ct-BK for importer@patchew.org; Fri, 07 Jul 2017 13:30:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTWlG-00055v-I5 for qemu-devel@nongnu.org; Fri, 07 Jul 2017 13:09:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dTWlB-0007ti-LH for qemu-devel@nongnu.org; Fri, 07 Jul 2017 13:09:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56526) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dTWl9-0007rP-43; Fri, 07 Jul 2017 13:09:39 -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 35214A4FB7; Fri, 7 Jul 2017 17:09:38 +0000 (UTC) Received: from noname.redhat.com (ovpn-117-34.ams2.redhat.com [10.36.117.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4DAB961F23; Fri, 7 Jul 2017 17:09:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 35214A4FB7 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=kwolf@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 35214A4FB7 From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 7 Jul 2017 19:07:39 +0200 Message-Id: <1499447335-6125-25-git-send-email-kwolf@redhat.com> In-Reply-To: <1499447335-6125-1-git-send-email-kwolf@redhat.com> References: <1499447335-6125-1-git-send-email-kwolf@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]); Fri, 07 Jul 2017 17:09:38 +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 024/100] stream: Switch stream_run() 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. Change the internal loop iteration of streaming to track by bytes instead of sectors (although we are still guaranteed that we iterate by steps that are sector-aligned). Signed-off-by: Eric Blake Reviewed-by: John Snow Reviewed-by: Jeff Cody Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- block/stream.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/block/stream.c b/block/stream.c index 12f1659..e3dd2ac 100644 --- a/block/stream.c +++ b/block/stream.c @@ -107,12 +107,11 @@ static void coroutine_fn stream_run(void *opaque) BlockBackend *blk =3D s->common.blk; BlockDriverState *bs =3D blk_bs(blk); BlockDriverState *base =3D s->base; - int64_t sector_num =3D 0; - int64_t end =3D -1; + int64_t offset =3D 0; uint64_t delay_ns =3D 0; int error =3D 0; int ret =3D 0; - int n =3D 0; + int n =3D 0; /* sectors */ void *buf; =20 if (!bs->backing) { @@ -125,7 +124,6 @@ static void coroutine_fn stream_run(void *opaque) goto out; } =20 - end =3D s->common.len >> BDRV_SECTOR_BITS; buf =3D qemu_blockalign(bs, STREAM_BUFFER_SIZE); =20 /* Turn on copy-on-read for the whole block device so that guest read @@ -137,7 +135,7 @@ static void coroutine_fn stream_run(void *opaque) bdrv_enable_copy_on_read(bs); } =20 - for (sector_num =3D 0; sector_num < end; sector_num +=3D n) { + for ( ; offset < s->common.len; offset +=3D n * BDRV_SECTOR_SIZE) { bool copy; =20 /* Note that even when no rate limit is applied we need to yield @@ -150,28 +148,26 @@ static void coroutine_fn stream_run(void *opaque) =20 copy =3D false; =20 - ret =3D bdrv_is_allocated(bs, sector_num, + ret =3D bdrv_is_allocated(bs, offset / BDRV_SECTOR_SIZE, STREAM_BUFFER_SIZE / BDRV_SECTOR_SIZE, &n); if (ret =3D=3D 1) { /* Allocated in the top, no need to copy. */ } else if (ret >=3D 0) { /* Copy if allocated in the intermediate images. Limit to the - * known-unallocated area [sector_num, sector_num+n). */ + * known-unallocated area [offset, offset+n*BDRV_SECTOR_SIZE).= */ ret =3D bdrv_is_allocated_above(backing_bs(bs), base, - sector_num, n, &n); + offset / BDRV_SECTOR_SIZE, n, &n= ); =20 /* Finish early if end of backing file has been reached */ if (ret =3D=3D 0 && n =3D=3D 0) { - n =3D end - sector_num; + n =3D (s->common.len - offset) / BDRV_SECTOR_SIZE; } =20 copy =3D (ret =3D=3D 1); } - trace_stream_one_iteration(s, sector_num * BDRV_SECTOR_SIZE, - n * BDRV_SECTOR_SIZE, ret); + trace_stream_one_iteration(s, offset, n * BDRV_SECTOR_SIZE, ret); if (copy) { - ret =3D stream_populate(blk, sector_num * BDRV_SECTOR_SIZE, - n * BDRV_SECTOR_SIZE, buf); + ret =3D stream_populate(blk, offset, n * BDRV_SECTOR_SIZE, buf= ); } if (ret < 0) { BlockErrorAction action =3D --=20 1.8.3.1