[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 07/12] file-posix: Avoid aio_worker() for QEMU_AIO_F
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PATCH 07/12] file-posix: Avoid aio_worker() for QEMU_AIO_FLUSH |
Date: |
Wed, 31 Oct 2018 22:56:17 +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 | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/block/file-posix.c b/block/file-posix.c
index 291ffaeded..074848ed1f 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -1143,8 +1143,9 @@ static ssize_t handle_aiocb_ioctl(RawPosixAIOData *aiocb)
return 0;
}
-static ssize_t handle_aiocb_flush(RawPosixAIOData *aiocb)
+static int handle_aiocb_flush(void *opaque)
{
+ RawPosixAIOData *aiocb = opaque;
BDRVRawState *s = aiocb->bs->opaque;
int ret;
@@ -1777,12 +1778,10 @@ static int aio_worker(void *arg)
ret = -EINVAL;
}
break;
- case QEMU_AIO_FLUSH:
- ret = handle_aiocb_flush(aiocb);
- break;
case QEMU_AIO_IOCTL:
ret = handle_aiocb_ioctl(aiocb);
break;
+ case QEMU_AIO_FLUSH:
case QEMU_AIO_DISCARD:
case QEMU_AIO_WRITE_ZEROES:
case QEMU_AIO_WRITE_ZEROES | QEMU_AIO_DISCARD:
@@ -1910,6 +1909,7 @@ static void raw_aio_unplug(BlockDriverState *bs)
static int raw_co_flush_to_disk(BlockDriverState *bs)
{
BDRVRawState *s = bs->opaque;
+ RawPosixAIOData acb;
int ret;
ret = fd_open(bs);
@@ -1917,7 +1917,13 @@ static int raw_co_flush_to_disk(BlockDriverState *bs)
return ret;
}
- return paio_submit_co(bs, s->fd, 0, NULL, 0, QEMU_AIO_FLUSH);
+ acb = (RawPosixAIOData) {
+ .bs = bs,
+ .aio_fildes = s->fd,
+ .aio_type = QEMU_AIO_FLUSH,
+ };
+
+ return raw_thread_pool_submit(bs, handle_aiocb_flush, &acb);
}
static void raw_aio_attach_aio_context(BlockDriverState *bs,
--
2.19.1
- [Qemu-block] [PATCH 00/12] file-posix: Simplify delegation to worker thread, Kevin Wolf, 2018/10/31
- [Qemu-block] [PATCH 04/12] file-posix: Avoid aio_worker() for QEMU_AIO_COPY_RANGE, Kevin Wolf, 2018/10/31
- [Qemu-block] [PATCH 06/12] file-posix: Avoid aio_worker() for QEMU_AIO_DISCARD, Kevin Wolf, 2018/10/31
- [Qemu-block] [PATCH 07/12] file-posix: Avoid aio_worker() for QEMU_AIO_FLUSH,
Kevin Wolf <=
- [Qemu-block] [PATCH 02/12] file-posix: Factor out raw_thread_pool_submit(), Kevin Wolf, 2018/10/31
- [Qemu-block] [PATCH 03/12] file-posix: Avoid aio_worker() for QEMU_AIO_TRUNCATE, Kevin Wolf, 2018/10/31
- [Qemu-block] [PATCH 05/12] file-posix: Avoid aio_worker() for QEMU_AIO_WRITE_ZEROES, Kevin Wolf, 2018/10/31
- [Qemu-block] [PATCH 01/12] file-posix: Reorganise RawPosixAIOData, Kevin Wolf, 2018/10/31
- [Qemu-block] [PATCH 10/12] file-posix: Remove paio_submit_co(), Kevin Wolf, 2018/10/31
- [Qemu-block] [PATCH 09/12] file-posix: Avoid aio_worker() for QEMU_AIO_READ/WRITE, Kevin Wolf, 2018/10/31
- [Qemu-block] [PATCH 11/12] file-posix: Switch to .bdrv_co_ioctl, Kevin Wolf, 2018/10/31
- [Qemu-block] [PATCH 08/12] file-posix: Move read/write operation logic out of aio_worker(), Kevin Wolf, 2018/10/31
- [Qemu-block] [PATCH 12/12] file-posix: Avoid aio_worker() for QEMU_AIO_IOCTL, Kevin Wolf, 2018/10/31