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

qcow2: bdrv_co_pwritev: move encryption code out of the lock

Browse Source 
Encryption will be done in threads, to take benefit of it, we should
move it out of the lock first.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190506142741.41731-8-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2019-05-06 17:27:40 +03:00 committed by Max Reitz
parent f24196d388
commit 5447c3a03f
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
block/qcow2.c
View File

@ -2168,11 +2168,20 @@ static coroutine_fn int qcow2_co_pwritev(BlockDriverState *bs, uint64_t offset,
ret = qcow2_alloc_cluster_offset(bs, offset, &cur_bytes, ret = qcow2_alloc_cluster_offset(bs, offset, &cur_bytes,
&cluster_offset, &l2meta); &cluster_offset, &l2meta);
if (ret < 0) { if (ret < 0) {
goto fail; goto out_locked;
} }
assert((cluster_offset & 511) == 0); assert((cluster_offset & 511) == 0);
ret = qcow2_pre_write_overlap_check(bs, 0,
cluster_offset + offset_in_cluster,
cur_bytes, true);
if (ret < 0) {
goto out_locked;
}
qemu_co_mutex_unlock(&s->lock);
qemu_iovec_reset(&hd_qiov); qemu_iovec_reset(&hd_qiov);
qemu_iovec_concat(&hd_qiov, qiov, bytes_done, cur_bytes); qemu_iovec_concat(&hd_qiov, qiov, bytes_done, cur_bytes);
@ -2184,7 +2193,7 @@ static coroutine_fn int qcow2_co_pwritev(BlockDriverState *bs, uint64_t offset,
* s->cluster_size); * s->cluster_size);
if (cluster_data == NULL) { if (cluster_data == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
goto fail; goto out_unlocked;
} }
} }
@ -2199,40 +2208,34 @@ static coroutine_fn int qcow2_co_pwritev(BlockDriverState *bs, uint64_t offset,
cluster_data, cluster_data,
cur_bytes, NULL) < 0) { cur_bytes, NULL) < 0) {
ret = -EIO; ret = -EIO;
goto fail; goto out_unlocked;
} }
qemu_iovec_reset(&hd_qiov); qemu_iovec_reset(&hd_qiov);
qemu_iovec_add(&hd_qiov, cluster_data, cur_bytes); qemu_iovec_add(&hd_qiov, cluster_data, cur_bytes);
} }
ret = qcow2_pre_write_overlap_check(bs, 0,
cluster_offset + offset_in_cluster, cur_bytes, true);
if (ret < 0) {
goto fail;
}
/* If we need to do COW, check if it's possible to merge the /* If we need to do COW, check if it's possible to merge the
* writing of the guest data together with that of the COW regions. * writing of the guest data together with that of the COW regions.
* If it's not possible (or not necessary) then write the * If it's not possible (or not necessary) then write the
* guest data now. */ * guest data now. */
if (!merge_cow(offset, cur_bytes, &hd_qiov, l2meta)) { if (!merge_cow(offset, cur_bytes, &hd_qiov, l2meta)) {
qemu_co_mutex_unlock(&s->lock);
BLKDBG_EVENT(bs->file, BLKDBG_WRITE_AIO); BLKDBG_EVENT(bs->file, BLKDBG_WRITE_AIO);
trace_qcow2_writev_data(qemu_coroutine_self(), trace_qcow2_writev_data(qemu_coroutine_self(),
cluster_offset + offset_in_cluster); cluster_offset + offset_in_cluster);
ret = bdrv_co_pwritev(s->data_file, ret = bdrv_co_pwritev(s->data_file,
cluster_offset + offset_in_cluster, cluster_offset + offset_in_cluster,
cur_bytes, &hd_qiov, 0); cur_bytes, &hd_qiov, 0);
qemu_co_mutex_lock(&s->lock);
if (ret < 0) { if (ret < 0) {
goto fail; goto out_unlocked;
} }
} }
qemu_co_mutex_lock(&s->lock);
ret = qcow2_handle_l2meta(bs, &l2meta, true); ret = qcow2_handle_l2meta(bs, &l2meta, true);
if (ret) { if (ret) {
goto fail; goto out_locked;
} }
bytes -= cur_bytes; bytes -= cur_bytes;
@ -2241,8 +2244,12 @@ static coroutine_fn int qcow2_co_pwritev(BlockDriverState *bs, uint64_t offset,
trace_qcow2_writev_done_part(qemu_coroutine_self(), cur_bytes); trace_qcow2_writev_done_part(qemu_coroutine_self(), cur_bytes);
} }
ret = 0; ret = 0;
goto out_locked;
fail: out_unlocked:
qemu_co_mutex_lock(&s->lock);
out_locked:
qcow2_handle_l2meta(bs, &l2meta, false); qcow2_handle_l2meta(bs, &l2meta, false);
qemu_co_mutex_unlock(&s->lock); qemu_co_mutex_unlock(&s->lock);