From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: Emanuele Giuseppe Esposito <eesposit@redhat.com>, qemu-block@nongnu.org
Cc: John Snow <jsnow@redhat.com>, Kevin Wolf <kwolf@redhat.com>,
Max Reitz <mreitz@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
qemu-devel@nongnu.org
Subject: Re: [PATCH v2 3/7] block-copy: move progress_set_remaining in block_copy_task_end
Date: Thu, 20 May 2021 18:03:26 +0300 [thread overview]
Message-ID: <231533a3-bc70-6f02-4df4-e4432ee135c3@virtuozzo.com> (raw)
In-Reply-To: <20210518100757.31243-4-eesposit@redhat.com>
18.05.2021 13:07, Emanuele Giuseppe Esposito wrote:
> Moving this function in task_end ensures to update the progress
> anyways, even if there is an error.
>
> It also helps in next patch, allowing task_end to have only
> one critical section.
>
> Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
> block/block-copy.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/block/block-copy.c b/block/block-copy.c
> index d2d3839dec..2e610b4142 100644
> --- a/block/block-copy.c
> +++ b/block/block-copy.c
> @@ -264,6 +264,9 @@ static void coroutine_fn block_copy_task_end(BlockCopyTask *task, int ret)
> bdrv_set_dirty_bitmap(task->s->copy_bitmap, task->offset, task->bytes);
> }
> QLIST_REMOVE(task, list);
> + progress_set_remaining(task->s->progress,
> + bdrv_get_dirty_count(task->s->copy_bitmap) +
> + task->s->in_flight_bytes);
> qemu_co_queue_restart_all(&task->wait_queue);
> }
>
> @@ -645,9 +648,6 @@ block_copy_dirty_clusters(BlockCopyCallState *call_state)
> }
> if (s->skip_unallocated && !(ret & BDRV_BLOCK_ALLOCATED)) {
> block_copy_task_end(task, 0);
> - progress_set_remaining(s->progress,
> - bdrv_get_dirty_count(s->copy_bitmap) +
> - s->in_flight_bytes);
> trace_block_copy_skip_range(s, task->offset, task->bytes);
> offset = task_end(task);
> bytes = end - offset;
>
--
Best regards,
Vladimir
next prev parent reply other threads:[~2021-05-20 15:07 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-18 10:07 [PATCH v2 0/7] block-copy: protect block-copy internal structures Emanuele Giuseppe Esposito
2021-05-18 10:07 ` [PATCH v2 1/7] block-copy: streamline choice of copy_range vs. read/write Emanuele Giuseppe Esposito
2021-05-20 14:42 ` Vladimir Sementsov-Ogievskiy
2021-05-20 15:06 ` Emanuele Giuseppe Esposito
2021-05-20 15:24 ` Vladimir Sementsov-Ogievskiy
2021-05-21 15:10 ` Paolo Bonzini
2021-05-21 15:48 ` Vladimir Sementsov-Ogievskiy
2021-05-21 16:43 ` Paolo Bonzini
2021-05-21 17:51 ` Vladimir Sementsov-Ogievskiy
2021-05-27 8:20 ` Stefan Hajnoczi
2021-05-27 19:04 ` Paolo Bonzini
2021-05-18 10:07 ` [PATCH v2 2/7] block-copy: improve documentation of BlockCopyTask and BlockCopyState types and functions Emanuele Giuseppe Esposito
2021-05-20 15:00 ` Vladimir Sementsov-Ogievskiy
2021-05-20 15:15 ` Emanuele Giuseppe Esposito
2021-05-18 10:07 ` [PATCH v2 3/7] block-copy: move progress_set_remaining in block_copy_task_end Emanuele Giuseppe Esposito
2021-05-20 15:03 ` Vladimir Sementsov-Ogievskiy [this message]
2021-05-18 10:07 ` [PATCH v2 4/7] block-copy: add a CoMutex to the BlockCopyTask list Emanuele Giuseppe Esposito
2021-05-20 15:19 ` Vladimir Sementsov-Ogievskiy
2021-05-25 10:07 ` Emanuele Giuseppe Esposito
2021-05-25 10:25 ` Vladimir Sementsov-Ogievskiy
2021-05-26 14:58 ` Paolo Bonzini
2021-05-26 16:13 ` Vladimir Sementsov-Ogievskiy
2021-05-27 9:07 ` Stefan Hajnoczi
2021-05-18 10:07 ` [PATCH v2 5/7] block-copy: add QemuMutex lock for BlockCopyCallState list Emanuele Giuseppe Esposito
2021-05-20 15:30 ` Vladimir Sementsov-Ogievskiy
2021-05-21 15:01 ` Paolo Bonzini
2021-05-25 10:58 ` Emanuele Giuseppe Esposito
2021-05-26 14:49 ` Paolo Bonzini
2021-05-28 10:53 ` Paolo Bonzini
2021-05-18 10:07 ` [PATCH v2 6/7] block-copy: atomic .cancelled and .finished fields in BlockCopyCallState Emanuele Giuseppe Esposito
2021-05-20 15:34 ` Vladimir Sementsov-Ogievskiy
2021-05-21 15:02 ` Paolo Bonzini
2021-05-21 15:53 ` Vladimir Sementsov-Ogievskiy
2021-05-21 15:56 ` Vladimir Sementsov-Ogievskiy
2021-05-21 16:47 ` Paolo Bonzini
2021-05-18 10:07 ` [PATCH v2 7/7] block-copy: protect BlockCopyState .method fields Emanuele Giuseppe Esposito
2021-05-21 17:10 ` Vladimir Sementsov-Ogievskiy
2021-05-25 10:18 ` Emanuele Giuseppe Esposito
2021-05-25 11:00 ` Vladimir Sementsov-Ogievskiy
2021-05-26 14:48 ` Paolo Bonzini
2021-05-26 17:18 ` Vladimir Sementsov-Ogievskiy
2021-05-28 10:24 ` Paolo Bonzini
2021-05-28 11:01 ` Paolo Bonzini
2021-05-28 11:52 ` Vladimir Sementsov-Ogievskiy
2021-05-28 12:44 ` Vladimir Sementsov-Ogievskiy
2021-05-20 13:47 ` [PATCH v2 0/7] block-copy: protect block-copy internal structures Vladimir Sementsov-Ogievskiy
2021-05-20 14:33 ` Emanuele Giuseppe Esposito
2021-05-27 10:31 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=231533a3-bc70-6f02-4df4-e4432ee135c3@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=eesposit@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).