diff options
| author | Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | 2019-10-22 14:18:04 +0300 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2019-10-28 11:22:31 +0100 |
| commit | 7f739d0e5375a934f0eade3cd38e6d33673beec0 (patch) | |
| tree | e581fcaff3ce8515785317109f11f7a69d83795b | |
| parent | f16ba00de946517e5cca4edeeec3e21f8f77132d (diff) | |
| download | qemu-7f739d0e5375a934f0eade3cd38e6d33673beec0.zip qemu-7f739d0e5375a934f0eade3cd38e6d33673beec0.tar.gz qemu-7f739d0e5375a934f0eade3cd38e6d33673beec0.tar.bz2 | |
block/block-copy: add memory limit
Currently total allocation for parallel requests to block-copy instance
is unlimited. Let's limit it to 128 MiB.
For now block-copy is used only in backup, so actually we limit total
allocation for backup job.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20191022111805.3432-6-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
| -rw-r--r-- | block/block-copy.c | 5 | ||||
| -rw-r--r-- | include/block/block-copy.h | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/block/block-copy.c b/block/block-copy.c index 845b242..7f0ebb5 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -21,6 +21,7 @@ #include "qemu/units.h" #define BLOCK_COPY_MAX_COPY_RANGE (16 * MiB) +#define BLOCK_COPY_MAX_MEM (128 * MiB) static void coroutine_fn block_copy_wait_inflight_reqs(BlockCopyState *s, int64_t start, @@ -64,6 +65,7 @@ void block_copy_state_free(BlockCopyState *s) } bdrv_release_dirty_bitmap(s->copy_bitmap); + shres_destroy(s->mem); g_free(s); } @@ -95,6 +97,7 @@ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target, .cluster_size = cluster_size, .len = bdrv_dirty_bitmap_size(copy_bitmap), .write_flags = write_flags, + .mem = shres_create(BLOCK_COPY_MAX_MEM), }; s->copy_range_size = QEMU_ALIGN_DOWN(max_transfer, cluster_size), @@ -313,7 +316,9 @@ int coroutine_fn block_copy(BlockCopyState *s, bdrv_reset_dirty_bitmap(s->copy_bitmap, start, chunk_end - start); + co_get_from_shres(s->mem, chunk_end - start); ret = block_copy_do_copy(s, start, chunk_end, error_is_read); + co_put_to_shres(s->mem, chunk_end - start); if (ret < 0) { bdrv_set_dirty_bitmap(s->copy_bitmap, start, chunk_end - start); break; diff --git a/include/block/block-copy.h b/include/block/block-copy.h index e2e135ff..edcdf00 100644 --- a/include/block/block-copy.h +++ b/include/block/block-copy.h @@ -16,6 +16,7 @@ #define BLOCK_COPY_H #include "block/block.h" +#include "qemu/co-shared-resource.h" typedef struct BlockCopyInFlightReq { int64_t start_byte; @@ -69,6 +70,8 @@ typedef struct BlockCopyState { */ ProgressResetCallbackFunc progress_reset_callback; void *progress_opaque; + + SharedResource *mem; } BlockCopyState; BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target, |