From nobody Sun Feb 8 18:29:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1570784956; cv=none; d=zoho.com; s=zohoarc; b=BbIYl9TfIjelzuGxJkc3QeiTFaOAO7xk3xf7Gfya7ZQXPvR5dhU9E3g7xcUHkk75udK8dTrkLDjO8DyoAa0HVROlsSny7BpGYJFXehiOvMNKYTTmllF3jfdQVA9hDqD9BowbzV7xFHHzMVYFBtb9Rs19WyePK8a1MBnzYnp4o5Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570784956; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1HW8EH6g467RFpdm1jaBR2K4VstUpXGT3lfncdfJVCQ=; b=ofm2CkiSqCyrGaLR8mQk0dsBZ0/w166DnCbKoEiyZvMAMGmBqQuso0+fa24r4+9Pzr/I3nFa5rw2pR9+y1Lt1kgFmgyc6yd52R5gix4itQByNGItLDl6h3ATsaWQqZ8RADLDGzCPX1j+yZeDZeLqERCeP1NBZkStzgLcySTrUns= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570784956370450.71485859488155; Fri, 11 Oct 2019 02:09:16 -0700 (PDT) Received: from localhost ([::1]:47588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIqv6-00086u-RU for importer@patchew.org; Fri, 11 Oct 2019 05:09:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49525) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIqtM-0005xb-J6 for qemu-devel@nongnu.org; Fri, 11 Oct 2019 05:07:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIqtL-0004Bi-Fi for qemu-devel@nongnu.org; Fri, 11 Oct 2019 05:07:20 -0400 Received: from relay.sw.ru ([185.231.240.75]:60324) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIqtH-000478-MV; Fri, 11 Oct 2019 05:07:15 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.2) (envelope-from ) id 1iIqtE-0000XM-4e; Fri, 11 Oct 2019 12:07:12 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 2/5] block/mirror: simplify do_sync_target_write Date: Fri, 11 Oct 2019 12:07:08 +0300 Message-Id: <20191011090711.19940-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191011090711.19940-1-vsementsov@virtuozzo.com> References: <20191011090711.19940-1-vsementsov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, kwolf@redhat.com, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, den@openvz.org, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" do_sync_target_write is called from bdrv_mirror_top_do_write after write/discard operation, all inside active_write/active_write_settle protecting us from mirror iteration. So the whole area is dirty for sure, no reason to examine dirty bitmap. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/mirror.c | 95 +++++++++++++++----------------------------------- 1 file changed, 28 insertions(+), 67 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index fe984efb90..1ae57a5131 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -1181,84 +1181,45 @@ do_sync_target_write(MirrorBlockJob *job, MirrorMet= hod method, uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags) { - QEMUIOVector target_qiov; - uint64_t dirty_offset =3D offset; - uint64_t dirty_bytes; - - if (qiov) { - qemu_iovec_init(&target_qiov, qiov->niov); - } - - while (true) { - bool valid_area; - int ret; - - bdrv_dirty_bitmap_lock(job->dirty_bitmap); - dirty_bytes =3D MIN(offset + bytes - dirty_offset, INT_MAX); - valid_area =3D bdrv_dirty_bitmap_next_dirty_area(job->dirty_bitmap, - &dirty_offset, - &dirty_bytes); - if (!valid_area) { - bdrv_dirty_bitmap_unlock(job->dirty_bitmap); - break; - } + int ret; =20 - bdrv_reset_dirty_bitmap_locked(job->dirty_bitmap, - dirty_offset, dirty_bytes); - bdrv_dirty_bitmap_unlock(job->dirty_bitmap); + bdrv_reset_dirty_bitmap(job->dirty_bitmap, offset, bytes); =20 - job_progress_increase_remaining(&job->common.job, dirty_bytes); + job_progress_increase_remaining(&job->common.job, bytes); =20 - assert(dirty_offset - offset <=3D SIZE_MAX); - if (qiov) { - qemu_iovec_reset(&target_qiov); - qemu_iovec_concat(&target_qiov, qiov, - dirty_offset - offset, dirty_bytes); - } - - switch (method) { - case MIRROR_METHOD_COPY: - ret =3D blk_co_pwritev(job->target, dirty_offset, dirty_bytes, - qiov ? &target_qiov : NULL, flags); - break; + switch (method) { + case MIRROR_METHOD_COPY: + ret =3D blk_co_pwritev(job->target, offset, bytes, qiov, flags); + break; =20 - case MIRROR_METHOD_ZERO: - assert(!qiov); - ret =3D blk_co_pwrite_zeroes(job->target, dirty_offset, dirty_= bytes, - flags); - break; + case MIRROR_METHOD_ZERO: + assert(!qiov); + ret =3D blk_co_pwrite_zeroes(job->target, offset, bytes, flags); + break; =20 - case MIRROR_METHOD_DISCARD: - assert(!qiov); - ret =3D blk_co_pdiscard(job->target, dirty_offset, dirty_bytes= ); - break; + case MIRROR_METHOD_DISCARD: + assert(!qiov); + ret =3D blk_co_pdiscard(job->target, offset, bytes); + break; =20 - default: - abort(); - } + default: + abort(); + } =20 - if (ret >=3D 0) { - job_progress_update(&job->common.job, dirty_bytes); - } else { - BlockErrorAction action; + if (ret >=3D 0) { + job_progress_update(&job->common.job, bytes); + } else { + BlockErrorAction action; =20 - bdrv_set_dirty_bitmap(job->dirty_bitmap, dirty_offset, dirty_b= ytes); - job->actively_synced =3D false; + bdrv_set_dirty_bitmap(job->dirty_bitmap, offset, bytes); + job->actively_synced =3D false; =20 - action =3D mirror_error_action(job, false, -ret); - if (action =3D=3D BLOCK_ERROR_ACTION_REPORT) { - if (!job->ret) { - job->ret =3D ret; - } - break; + action =3D mirror_error_action(job, false, -ret); + if (action =3D=3D BLOCK_ERROR_ACTION_REPORT) { + if (!job->ret) { + job->ret =3D ret; } } - - dirty_offset +=3D dirty_bytes; - } - - if (qiov) { - qemu_iovec_destroy(&target_qiov); } } =20 --=20 2.21.0