From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: Emanuele Giuseppe Esposito <eesposit@redhat.com>, qemu-block@nongnu.org
Cc: John Snow <jsnow@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Kevin Wolf <kwolf@redhat.com>, Max Reitz <mreitz@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
qemu-devel@nongnu.org
Subject: Re: [PATCH 2/6] block-copy: let ratelimit handle a speed of 0
Date: Mon, 10 May 2021 14:06:12 +0300 [thread overview]
Message-ID: <cde97e00-0d57-b1f3-6172-be3e283c13ca@virtuozzo.com> (raw)
In-Reply-To: <20210510085941.22769-3-eesposit@redhat.com>
10.05.2021 11:59, Emanuele Giuseppe Esposito wrote:
> From: Paolo Bonzini <pbonzini@redhat.com>
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
> ---
> block/block-copy.c | 28 ++++++++++------------------
> 1 file changed, 10 insertions(+), 18 deletions(-)
>
> diff --git a/block/block-copy.c b/block/block-copy.c
> index c2e5090412..7e9467d48a 100644
> --- a/block/block-copy.c
> +++ b/block/block-copy.c
> @@ -113,7 +113,6 @@ typedef struct BlockCopyState {
>
> SharedResource *mem;
>
> - uint64_t speed;
> RateLimit rate_limit;
> } BlockCopyState;
>
> @@ -619,23 +618,19 @@ block_copy_dirty_clusters(BlockCopyCallState *call_state)
> }
> task->zeroes = ret & BDRV_BLOCK_ZERO;
>
> - if (s->speed) {
> - if (!call_state->ignore_ratelimit) {
> - uint64_t ns = ratelimit_calculate_delay(&s->rate_limit, 0);
> - if (ns > 0) {
> - block_copy_task_end(task, -EAGAIN);
> - g_free(task);
> - qemu_co_sleep_ns_wakeable(&call_state->sleep,
> - QEMU_CLOCK_REALTIME, ns);
> - continue;
> - }
> + if (!call_state->ignore_ratelimit) {
> + uint64_t ns = ratelimit_calculate_delay(&s->rate_limit, 0);
> + if (ns > 0) {
> + block_copy_task_end(task, -EAGAIN);
> + g_free(task);
> + qemu_co_sleep_ns_wakeable(&call_state->sleep,
> + QEMU_CLOCK_REALTIME, ns);
indentation broken
> + continue;
> }
> -
> - ratelimit_calculate_delay(&s->rate_limit, task->bytes);
> }
>
> + ratelimit_calculate_delay(&s->rate_limit, task->bytes);
> trace_block_copy_process(s, task->offset);
> -
I'd keep both newlines around trace_, as all three calls has no relation to each other..
> co_get_from_shres(s->mem, task->bytes);
>
> offset = task_end(task);
> @@ -825,10 +820,7 @@ void block_copy_set_skip_unallocated(BlockCopyState *s, bool skip)
>
> void block_copy_set_speed(BlockCopyState *s, uint64_t speed)
> {
> - s->speed = speed;
> - if (speed > 0) {
> - ratelimit_set_speed(&s->rate_limit, speed, BLOCK_COPY_SLICE_TIME);
> - }
> + ratelimit_set_speed(&s->rate_limit, speed, BLOCK_COPY_SLICE_TIME);
>
> /*
> * Note: it's good to kick all call states from here, but it should be done
>
With indentation fixed:
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
--
Best regards,
Vladimir
next prev parent reply other threads:[~2021-05-10 11:07 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-10 8:59 [PATCH 0/6] block-copy: make helper APIs thread safe Emanuele Giuseppe Esposito
2021-05-10 8:59 ` [PATCH 1/6] ratelimit: treat zero speed as unlimited Emanuele Giuseppe Esposito
2021-05-10 11:00 ` Vladimir Sementsov-Ogievskiy
2021-05-10 8:59 ` [PATCH 2/6] block-copy: let ratelimit handle a speed of 0 Emanuele Giuseppe Esposito
2021-05-10 11:06 ` Vladimir Sementsov-Ogievskiy [this message]
2021-05-10 8:59 ` [PATCH 3/6] blockjob: " Emanuele Giuseppe Esposito
2021-05-10 11:17 ` Vladimir Sementsov-Ogievskiy
2021-05-10 8:59 ` [PATCH 4/6] progressmeter: protect with a mutex Emanuele Giuseppe Esposito
2021-05-10 11:28 ` Vladimir Sementsov-Ogievskiy
2021-05-10 16:52 ` Emanuele Giuseppe Esposito
2021-05-10 17:17 ` Vladimir Sementsov-Ogievskiy
2021-05-10 17:57 ` Emanuele Giuseppe Esposito
2021-05-11 12:28 ` Paolo Bonzini
2021-05-12 7:09 ` Vladimir Sementsov-Ogievskiy
2021-05-12 15:53 ` Stefan Hajnoczi
2021-05-10 8:59 ` [PATCH 5/6] co-shared-resource: " Emanuele Giuseppe Esposito
2021-05-10 11:40 ` Vladimir Sementsov-Ogievskiy
2021-05-11 8:34 ` Paolo Bonzini
2021-05-12 15:44 ` Stefan Hajnoczi
2021-05-12 18:30 ` Paolo Bonzini
2021-05-14 14:10 ` Emanuele Giuseppe Esposito
2021-05-14 14:26 ` Vladimir Sementsov-Ogievskiy via
2021-05-14 14:32 ` Emanuele Giuseppe Esposito
2021-05-14 15:30 ` Vladimir Sementsov-Ogievskiy via
2021-05-14 17:28 ` Emanuele Giuseppe Esposito
2021-05-14 21:15 ` Vladimir Sementsov-Ogievskiy via
2021-05-14 21:53 ` Emanuele Giuseppe Esposito
2021-05-15 7:11 ` Vladimir Sementsov-Ogievskiy via
2021-05-14 17:55 ` Paolo Bonzini
2021-05-10 8:59 ` [PATCH 6/6] aiopool: " Emanuele Giuseppe Esposito
2021-05-10 11:56 ` Vladimir Sementsov-Ogievskiy
2021-05-11 8:34 ` Paolo Bonzini
2021-05-12 15:19 ` Stefan Hajnoczi
2021-05-10 10:55 ` [PATCH 0/6] block-copy: make helper APIs thread safe Vladimir Sementsov-Ogievskiy
2021-05-12 14:24 ` 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=cde97e00-0d57-b1f3-6172-be3e283c13ca@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.