mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block-copy: let ratelimit handle a speed of 0

Browse Source 
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>
This commit is contained in:
Paolo Bonzini 2021-06-14 10:11:27 +02:00 committed by Vladimir Sementsov-Ogievskiy
parent 720507ed95
commit ca657c99e6
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
block/block-copy.c
View File

@ -114,7 +114,6 @@ typedef struct BlockCopyState {
SharedResource *mem; SharedResource *mem;
uint64_t speed;
RateLimit rate_limit; RateLimit rate_limit;
} BlockCopyState; } BlockCopyState;
@ -647,21 +646,19 @@ block_copy_dirty_clusters(BlockCopyCallState *call_state)
task->copy_range = false; task->copy_range = false;
} }
if (s->speed) { if (!call_state->ignore_ratelimit) {
if (!call_state->ignore_ratelimit) { uint64_t ns = ratelimit_calculate_delay(&s->rate_limit, 0);
uint64_t ns = ratelimit_calculate_delay(&s->rate_limit, 0); if (ns > 0) {
if (ns > 0) { block_copy_task_end(task, -EAGAIN);
block_copy_task_end(task, -EAGAIN); g_free(task);
g_free(task); qemu_co_sleep_ns_wakeable(&call_state->sleep,
qemu_co_sleep_ns_wakeable(&call_state->sleep, QEMU_CLOCK_REALTIME, ns);
QEMU_CLOCK_REALTIME, ns); continue;
continue;
}
} }
ratelimit_calculate_delay(&s->rate_limit, task->bytes);
} }
ratelimit_calculate_delay(&s->rate_limit, task->bytes);
trace_block_copy_process(s, task->offset); trace_block_copy_process(s, task->offset);
co_get_from_shres(s->mem, task->bytes); 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) void block_copy_set_speed(BlockCopyState *s, uint64_t speed)
{ {
s->speed = speed; ratelimit_set_speed(&s->rate_limit, speed, BLOCK_COPY_SLICE_TIME);
if (speed > 0) {
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 * Note: it's good to kick all call states from here, but it should be done