[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/10] block-copy: let ratelimit handle a speed of 0
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PULL 02/10] block-copy: let ratelimit handle a speed of 0 |
Date: |
Fri, 25 Jun 2021 15:59:58 +0300 |
From: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Message-Id: <20210614081130.22134-3-eesposit@redhat.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/block-copy.c | 28 +++++++++++-----------------
1 file changed, 11 insertions(+), 17 deletions(-)
diff --git a/block/block-copy.c b/block/block-copy.c
index 5808cfe657..020f9846d8 100644
--- a/block/block-copy.c
+++ b/block/block-copy.c
@@ -114,7 +114,6 @@ typedef struct BlockCopyState {
SharedResource *mem;
- uint64_t speed;
RateLimit rate_limit;
} BlockCopyState;
@@ -647,21 +646,19 @@ block_copy_dirty_clusters(BlockCopyCallState *call_state)
task->copy_range = false;
}
- 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);
+ continue;
}
-
- ratelimit_calculate_delay(&s->rate_limit, task->bytes);
}
+ ratelimit_calculate_delay(&s->rate_limit, task->bytes);
+
trace_block_copy_process(s, task->offset);
co_get_from_shres(s->mem, task->bytes);
@@ -853,10 +850,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
--
2.29.2
- [PULL 00/10] Block Jobs patches, Vladimir Sementsov-Ogievskiy, 2021/06/25
- [PULL 01/10] ratelimit: treat zero speed as unlimited, Vladimir Sementsov-Ogievskiy, 2021/06/25
- [PULL 04/10] progressmeter: protect with a mutex, Vladimir Sementsov-Ogievskiy, 2021/06/25
- [PULL 08/10] block-copy: move progress_set_remaining in block_copy_task_end, Vladimir Sementsov-Ogievskiy, 2021/06/25
- [PULL 03/10] blockjob: let ratelimit handle a speed of 0, Vladimir Sementsov-Ogievskiy, 2021/06/25
- [PULL 05/10] co-shared-resource: protect with a mutex, Vladimir Sementsov-Ogievskiy, 2021/06/25
- [PULL 07/10] block-copy: streamline choice of copy_range vs. read/write, Vladimir Sementsov-Ogievskiy, 2021/06/25
- [PULL 09/10] block-copy: add CoMutex lock, Vladimir Sementsov-Ogievskiy, 2021/06/25
- [PULL 02/10] block-copy: let ratelimit handle a speed of 0,
Vladimir Sementsov-Ogievskiy <=
- [PULL 06/10] block-copy: small refactor in block_copy_task_entry and block_copy_common, Vladimir Sementsov-Ogievskiy, 2021/06/25
- [PULL 10/10] block-copy: atomic .cancelled and .finished fields in BlockCopyCallState, Vladimir Sementsov-Ogievskiy, 2021/06/25
- Re: [PULL 00/10] Block Jobs patches, Peter Maydell, 2021/06/28
- Re: [PULL 00/10] Block Jobs patches, Peter Maydell, 2021/06/28