From nobody Mon Feb 9 05:40:51 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=1565465695; cv=none; d=zoho.com; s=zohoarc; b=Dv9V9BRN2zHWbtKW8Sp27OxbpuDISo3ihkPlQkf2xB5TsATQHUZj5vM/42U7Vi2sKRzbQDZrEgOSFh8v8OO+Ak1//Um8NCVuP1lxlTHnphVE8j19xk5R+tVmn8d3rp6dZJ6kmLf7bVY6Z6zBNStBOqyCaT7TyuUV+/rXdluBM8E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565465695; 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=81gpE2uM/FP2XvGJDL3I7iYlmgeZAAQM1wBzSlZzwPI=; b=L3pWNVd7Baz39KSHoyZU7nFIRgB6Q1X7pF+qvPa3wCia3VVNgjFeXXqTD39IceAd7bWrDW+im1sTzyutt3Lc07XYrZBaUlWl+rOWqOBB1NCx+ZppbtqyuPAr7tAC6c3VT2ZTUUlPgmtaFpEkhA1pLQYtCIzhK0rvFhIEAHBfhL0= 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 1565465695005405.97006402230556; Sat, 10 Aug 2019 12:34:55 -0700 (PDT) Received: from localhost ([::1]:37884 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hwX8g-0005ns-0d for importer@patchew.org; Sat, 10 Aug 2019 15:34:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44040) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hwX5z-0000Jw-Bh for qemu-devel@nongnu.org; Sat, 10 Aug 2019 15:32:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hwX5x-0007CM-TX for qemu-devel@nongnu.org; Sat, 10 Aug 2019 15:32:07 -0400 Received: from relay.sw.ru ([185.231.240.75]:48766) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hwX5s-000770-FH; Sat, 10 Aug 2019 15:32:01 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92) (envelope-from ) id 1hwX5p-0000nK-RP; Sat, 10 Aug 2019 22:31:57 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Date: Sat, 10 Aug 2019 22:31:55 +0300 Message-Id: <20190810193155.58637-8-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190810193155.58637-1-vsementsov@virtuozzo.com> References: <20190810193155.58637-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 v3 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 | 97 ++++++++++++++++++++------------------------------ 1 file changed, 38 insertions(+), 59 deletions(-) diff --git a/block/backup.c b/block/backup.c index 65f7212c85..0ac31c2760 100644 --- a/block/backup.c +++ b/block/backup.c @@ -104,87 +104,61 @@ static void cow_request_end(CowRequest *req) * error occurred, return a negative error number * * @bounce_buffer is assumed to enough to store - * MIN(BACKUP_MAX_BOUNCE_BUFFER, @end - @start) bytes + * MIN(BACKUP_MAX_BOUNCE_BUFFER, @bytes) bytes */ -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, - void *bounce_buffer) +static int coroutine_fn backup_cow_with_bounce_buffer( + BackupBlockJob *job, int64_t offset, int64_t bytes, + BdrvRequestFlags read_flags, bool *error_is_read, void *bounce_buf= fer) { - int ret; BlockBackend *blk =3D job->common.blk; - int nbytes, remaining_bytes; - int read_flags =3D is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0; - - assert(QEMU_IS_ALIGNED(start, job->cluster_size)); - bdrv_reset_dirty_bitmap(job->copy_bitmap, start, end - start); - nbytes =3D MIN(end - start, job->len - start); - =20 - remaining_bytes =3D nbytes; - while (remaining_bytes) { - int chunk =3D MIN(BACKUP_MAX_BOUNCE_BUFFER, remaining_bytes); + while (bytes) { + int ret; + int chunk =3D MIN(BACKUP_MAX_BOUNCE_BUFFER, bytes); =20 - ret =3D blk_co_pread(blk, start, chunk, bounce_buffer, read_flags); + ret =3D blk_co_pread(blk, offset, chunk, 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; + return ret; } =20 - ret =3D blk_co_pwrite(job->target, start, chunk, bounce_buffer, + ret =3D blk_co_pwrite(job->target, offset, chunk, 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; + return ret; } =20 - start +=3D chunk; - remaining_bytes -=3D chunk; + offset +=3D chunk; + bytes -=3D chunk; } =20 - return nbytes; -fail: - bdrv_set_dirty_bitmap(job->copy_bitmap, start, job->cluster_size); - return ret; - + return 0; } =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 /* @@ -268,6 +242,8 @@ static int coroutine_fn backup_do_cow(BackupBlockJob *j= ob, int64_t start, end; /* bytes */ void *bounce_buffer =3D NULL; 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 @@ -281,6 +257,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); @@ -304,10 +281,11 @@ 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; } @@ -315,24 +293,25 @@ static int coroutine_fn backup_do_cow(BackupBlockJob = *job, if (!job->use_copy_range) { if (!bounce_buffer) { size_t len =3D MIN(BACKUP_MAX_BOUNCE_BUFFER, - MAX(dirty_end - start, end - dirty_end)); + MAX(cur_bytes, + end - start - cur_bytes)); bounce_buffer =3D blk_try_blockalign(job->common.blk, len); } - ret =3D backup_cow_with_bounce_buffer(job, start, dirty_end, - is_write_notifier, - error_is_read, bounce_buff= er); + ret =3D backup_cow_with_bounce_buffer(job, start, cur_bytes, + read_flags, error_is_read, + bounce_buffer); } 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 if (bounce_buffer) { --=20 2.18.0