From nobody Wed Nov 12 05:24:27 2025 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=1568301381; cv=none; d=zoho.com; s=zohoarc; b=muOYH1kEdm8CG0elWuHO5ONfvcMsFoIdRr84B1ZIZkaA76mgQVNjogFELANB9HZPNCxRVqmGMQaGPORckMPZiYMJfbhFQ+UPhSZ5nOL4X5P89l9+L19UcCBdkbaBzlqWEszUcMiI2PrSejLChEyPY2jqX2W5nPZTqzifwxHI4zU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568301381; 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:ARC-Authentication-Results; bh=NMWd1Li7Qi0BCDysj5W4ekNtpuV1fq5DAzJ8Q0C2s50=; b=U4WLnSQX3pAjzMLoP3EhRjL7fUjwd2+NXTUl0eaIj9sA3eFS70eRB5WzbGxYESH9sMUUS9Sr+SRtIcnbxi+N/ViH3mG7RLiYXBjAI6padsXtxoqEpWLIe7S7w8oy19XtRIH1SqoFRZAWROWpmf4S6XlDhcs6OUGXi4/4gwhtr9E= 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568301380919854.8783594097368; Thu, 12 Sep 2019 08:16:20 -0700 (PDT) Received: from localhost ([::1]:35754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8QpN-0003dN-QM for importer@patchew.org; Thu, 12 Sep 2019 11:16:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38368) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8Qn5-000251-86 for qemu-devel@nongnu.org; Thu, 12 Sep 2019 11:13:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i8Qn3-00036I-7v for qemu-devel@nongnu.org; Thu, 12 Sep 2019 11:13:47 -0400 Received: from relay.sw.ru ([185.231.240.75]:57854) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i8Qmz-000348-Sa; Thu, 12 Sep 2019 11:13:42 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92) (envelope-from ) id 1i8Qmw-0000kk-Ow; Thu, 12 Sep 2019 18:13:38 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Date: Thu, 12 Sep 2019 18:13:35 +0300 Message-Id: <20190912151338.21225-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190912151338.21225-1-vsementsov@virtuozzo.com> References: <20190912151338.21225-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 X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH 1/4] block/mirror: simplify do_sync_target_write 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: 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 853e2c7510..d176bf5920 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -1203,84 +1203,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