[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/12] file-posix: Avoid aio_worker() for QEMU_AIO_C
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 04/12] file-posix: Avoid aio_worker() for QEMU_AIO_COPY_RANGE |
Date: |
Wed, 31 Oct 2018 22:56:14 +0100 |
aio_worker() doesn't add anything interesting, it's only a useless
indirection. Call the handler function directly instead.
As we know that this handler function is only called from coroutine
context and the coroutine stays around until the worker thread finishes,
we can keep RawPosixAIOData on the stack.
Signed-off-by: Kevin Wolf <address@hidden>
---
block/file-posix.c | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/block/file-posix.c b/block/file-posix.c
index 69e1b761b4..fe5e95cc0a 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -1551,8 +1551,9 @@ static off_t copy_file_range(int in_fd, off_t *in_off,
int out_fd,
}
#endif
-static ssize_t handle_aiocb_copy_range(RawPosixAIOData *aiocb)
+static int handle_aiocb_copy_range(void *opaque)
{
+ RawPosixAIOData *aiocb = opaque;
uint64_t bytes = aiocb->aio_nbytes;
off_t in_off = aiocb->aio_offset;
off_t out_off = aiocb->copy_range.aio_offset2;
@@ -1789,8 +1790,6 @@ static int aio_worker(void *arg)
ret = handle_aiocb_write_zeroes_unmap(aiocb);
break;
case QEMU_AIO_COPY_RANGE:
- ret = handle_aiocb_copy_range(aiocb);
- break;
case QEMU_AIO_TRUNCATE:
g_assert_not_reached();
default:
@@ -2697,6 +2696,7 @@ static int coroutine_fn
raw_co_copy_range_to(BlockDriverState *bs,
BdrvRequestFlags read_flags,
BdrvRequestFlags write_flags)
{
+ RawPosixAIOData acb;
BDRVRawState *s = bs->opaque;
BDRVRawState *src_s;
@@ -2709,8 +2709,20 @@ static int coroutine_fn
raw_co_copy_range_to(BlockDriverState *bs,
if (fd_open(src->bs) < 0 || fd_open(dst->bs) < 0) {
return -EIO;
}
- return paio_submit_co_full(bs, src_s->fd, src_offset, s->fd, dst_offset,
- NULL, bytes, QEMU_AIO_COPY_RANGE);
+
+ acb = (RawPosixAIOData) {
+ .bs = bs,
+ .aio_type = QEMU_AIO_COPY_RANGE,
+ .aio_fildes = src_s->fd,
+ .aio_offset = src_offset,
+ .aio_nbytes = bytes,
+ .copy_range = {
+ .aio_fd2 = s->fd,
+ .aio_offset2 = dst_offset,
+ },
+ };
+
+ return raw_thread_pool_submit(bs, handle_aiocb_copy_range, &acb);
}
BlockDriver bdrv_file = {
--
2.19.1
- [Qemu-devel] [PATCH 00/12] file-posix: Simplify delegation to worker thread, Kevin Wolf, 2018/10/31
- [Qemu-devel] [PATCH 02/12] file-posix: Factor out raw_thread_pool_submit(), Kevin Wolf, 2018/10/31
- [Qemu-devel] [PATCH 03/12] file-posix: Avoid aio_worker() for QEMU_AIO_TRUNCATE, Kevin Wolf, 2018/10/31
- [Qemu-devel] [PATCH 06/12] file-posix: Avoid aio_worker() for QEMU_AIO_DISCARD, Kevin Wolf, 2018/10/31
- [Qemu-devel] [PATCH 04/12] file-posix: Avoid aio_worker() for QEMU_AIO_COPY_RANGE,
Kevin Wolf <=
- [Qemu-devel] [PATCH 07/12] file-posix: Avoid aio_worker() for QEMU_AIO_FLUSH, Kevin Wolf, 2018/10/31
- [Qemu-devel] [PATCH 05/12] file-posix: Avoid aio_worker() for QEMU_AIO_WRITE_ZEROES, Kevin Wolf, 2018/10/31
- [Qemu-devel] [PATCH 01/12] file-posix: Reorganise RawPosixAIOData, Kevin Wolf, 2018/10/31
- [Qemu-devel] [PATCH 09/12] file-posix: Avoid aio_worker() for QEMU_AIO_READ/WRITE, Kevin Wolf, 2018/10/31
- [Qemu-devel] [PATCH 10/12] file-posix: Remove paio_submit_co(), Kevin Wolf, 2018/10/31
- [Qemu-devel] [PATCH 12/12] file-posix: Avoid aio_worker() for QEMU_AIO_IOCTL, Kevin Wolf, 2018/10/31
- [Qemu-devel] [PATCH 08/12] file-posix: Move read/write operation logic out of aio_worker(), Kevin Wolf, 2018/10/31
- [Qemu-devel] [PATCH 11/12] file-posix: Switch to .bdrv_co_ioctl, Kevin Wolf, 2018/10/31