From nobody Wed Nov 12 05:00:02 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=1565365025; cv=none; d=zoho.com; s=zohoarc; b=nCwxWdfiKV8735mBfGvl4qNm5bt01ETfp9epJS1HEqBL8EvY7yqZXea+zyx22TX9IImv4z3Wix9cQ6Hke+zclx/VlaidMDn+A06KBPv1v7qq3vDDwvY77VDLRnRDP+z3aLQskIfkeWZfC/heJ4B3xmu8wV9L9v2F+mLvJL6Wj9M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565365025; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=+9OzqmcxQgWiSHFLQQ56qkNcnO3gIX3rHqy0alXK95U=; b=DLpFZ1od40x/6WvnxyCwO8VALcZ8NwR7PbGfw7vVGkUSF31YBp/+0BoZUhXHhFUeFrBL07qSviovIm1FQ8qE9qpXSiHFI9qTmRMbzFJMEuiMuuBM/qjkXAJtn5A3gbbEUfwjZcmJUDOdxI7Xvlvdo9VIyxkqhSrwqHjHu08p0tw= 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 1565365025648323.4936936903583; Fri, 9 Aug 2019 08:37:05 -0700 (PDT) Received: from localhost ([::1]:60194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hw6wv-0003S4-MP for importer@patchew.org; Fri, 09 Aug 2019 11:37:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49127) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hw6sR-000431-Am for qemu-devel@nongnu.org; Fri, 09 Aug 2019 11:32:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hw6sN-0002qz-Gn for qemu-devel@nongnu.org; Fri, 09 Aug 2019 11:32:21 -0400 Received: from relay.sw.ru ([185.231.240.75]:57614) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hw6sI-0002ii-1a; Fri, 09 Aug 2019 11:32:14 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92) (envelope-from ) id 1hw6sD-0004Cp-To; Fri, 09 Aug 2019 18:32:10 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Date: Fri, 9 Aug 2019 18:32:07 +0300 Message-Id: <20190809153207.49288-8-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190809153207.49288-1-vsementsov@virtuozzo.com> References: <20190809153207.49288-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v2 7/7] block/backup: merge duplicated logic into backup_do_cow 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, armbru@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, den@openvz.org, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" backup_cow_with_offload and backup_cow_with_bounce_buffer contains a lot of duplicated logic. Move it into backup_do_cow. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/backup.c | 84 +++++++++++++++++++------------------------------- 1 file changed, 31 insertions(+), 53 deletions(-) diff --git a/block/backup.c b/block/backup.c index 155e21d0a3..ae780e1260 100644 --- a/block/backup.c +++ b/block/backup.c @@ -100,85 +100,60 @@ static void cow_request_end(CowRequest *req) =20 /* Copy range to target with a bounce buffer and return the bytes copied. = If * error occurred, return a negative error number */ -static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job, - int64_t start, - int64_t end, - bool is_write_notifi= er, - bool *error_is_read) +static int coroutine_fn backup_cow_with_bounce_buffer( + BackupBlockJob *job, int64_t offset, int64_t bytes, + BdrvRequestFlags read_flags, bool *error_is_read) { - int ret; + int ret =3D 0; BlockBackend *blk =3D job->common.blk; - int nbytes; - int read_flags =3D is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0; - void *bounce_buffer; - - assert(QEMU_IS_ALIGNED(start, job->cluster_size)); + void *bounce_buffer =3D blk_try_blockalign(blk, bytes); =20 - nbytes =3D MIN(end - start, job->len - start); - bounce_buffer =3D blk_try_blockalign(blk, nbytes); if (!bounce_buffer) { return -ENOMEM; } =20 - bdrv_reset_dirty_bitmap(job->copy_bitmap, start, end - start); - - ret =3D blk_co_pread(blk, start, nbytes, bounce_buffer, read_flags); + ret =3D blk_co_pread(blk, offset, bytes, bounce_buffer, read_flags); if (ret < 0) { - trace_backup_do_cow_read_fail(job, start, ret); + trace_backup_do_cow_read_fail(job, offset, ret); if (error_is_read) { *error_is_read =3D true; } - goto fail; + goto out; } =20 - ret =3D blk_co_pwrite(job->target, start, nbytes, bounce_buffer, + ret =3D blk_co_pwrite(job->target, offset, bytes, bounce_buffer, job->write_flags); if (ret < 0) { - trace_backup_do_cow_write_fail(job, start, ret); + trace_backup_do_cow_write_fail(job, offset, ret); if (error_is_read) { *error_is_read =3D false; } - goto fail; + goto out; } =20 +out: qemu_vfree(bounce_buffer); - return nbytes; =20 -fail: - bdrv_set_dirty_bitmap(job->copy_bitmap, start, job->cluster_size); - qemu_vfree(bounce_buffer); return ret; - } =20 /* Copy range to target and return the bytes copied. If error occurred, re= turn a * negative error number. */ static int coroutine_fn backup_cow_with_offload(BackupBlockJob *job, - int64_t start, - int64_t end, - bool is_write_notifier) + int64_t offset, + int64_t bytes, + BdrvRequestFlags read_flag= s) { int ret; - int nr_clusters; BlockBackend *blk =3D job->common.blk; - int nbytes =3D MIN(end - start, job->len - start); - int read_flags =3D is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0; - - assert(end - start < INT_MAX); - assert(QEMU_IS_ALIGNED(start, job->cluster_size)); - nr_clusters =3D DIV_ROUND_UP(nbytes, job->cluster_size); - bdrv_reset_dirty_bitmap(job->copy_bitmap, start, - job->cluster_size * nr_clusters); - ret =3D blk_co_copy_range(blk, start, job->target, start, nbytes, + + ret =3D blk_co_copy_range(blk, offset, job->target, offset, bytes, read_flags, job->write_flags); if (ret < 0) { - trace_backup_do_cow_copy_range_fail(job, start, ret); - bdrv_set_dirty_bitmap(job->copy_bitmap, start, - job->cluster_size * nr_clusters); - return ret; + trace_backup_do_cow_copy_range_fail(job, offset, ret); } =20 - return nbytes; + return ret; } =20 /* @@ -261,6 +236,8 @@ static int coroutine_fn backup_do_cow(BackupBlockJob *j= ob, int ret =3D 0; int64_t start, end; /* bytes */ int64_t skip_bytes; + BdrvRequestFlags read_flags =3D + is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0; =20 qemu_co_rwlock_rdlock(&job->flush_rwlock); =20 @@ -274,6 +251,7 @@ static int coroutine_fn backup_do_cow(BackupBlockJob *j= ob, =20 while (start < end) { int64_t dirty_end; + int64_t cur_bytes; =20 if (!bdrv_dirty_bitmap_get(job->copy_bitmap, start)) { trace_backup_do_cow_skip(job, start); @@ -297,30 +275,30 @@ static int coroutine_fn backup_do_cow(BackupBlockJob = *job, } =20 trace_backup_do_cow_process(job, start); + cur_bytes =3D MIN(dirty_end - start, job->len - start); + bdrv_reset_dirty_bitmap(job->copy_bitmap, start, dirty_end - start= ); =20 if (job->use_copy_range) { - ret =3D backup_cow_with_offload(job, start, dirty_end, - is_write_notifier); + ret =3D backup_cow_with_offload(job, start, cur_bytes, read_fl= ags); if (ret < 0) { job->use_copy_range =3D false; } } if (!job->use_copy_range) { - ret =3D backup_cow_with_bounce_buffer(job, start, dirty_end, - is_write_notifier, - error_is_read); + ret =3D backup_cow_with_bounce_buffer(job, start, cur_bytes, + read_flags, error_is_read); } if (ret < 0) { + bdrv_set_dirty_bitmap(job->copy_bitmap, start, dirty_end - sta= rt); break; } =20 /* Publish progress, guest I/O counts as progress too. Note that = the * offset field is an opaque progress value, it is not a disk offs= et. */ - start +=3D ret; - job->bytes_read +=3D ret; - job_progress_update(&job->common.job, ret); - ret =3D 0; + start +=3D cur_bytes; + job->bytes_read +=3D cur_bytes; + job_progress_update(&job->common.job, cur_bytes); } =20 cow_request_end(&cow_request); --=20 2.18.0