From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 14/41] file-posix: Reorganise RawPosixAIOData
Date: Wed, 12 Dec 2018 14:27:08 +0100 [thread overview]
Message-ID: <20181212132735.16080-15-kwolf@redhat.com> (raw)
In-Reply-To: <20181212132735.16080-1-kwolf@redhat.com>
RawPosixAIOData contains a lot of fields for several separate operations
that are to be processed in a worker thread and that need different
parameters. The struct is currently rather unorganised, with unions that
cover some, but not all operations, and even one #define for field names
instead of a union.
Clean this up to have some common fields and a single union. As a side
effect, on x86_64 the struct shrinks from 72 to 48 bytes.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/file-posix.c | 89 +++++++++++++++++++++++++---------------------
1 file changed, 49 insertions(+), 40 deletions(-)
diff --git a/block/file-posix.c b/block/file-posix.c
index 07bbdab953..d0102a7ec0 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -182,25 +182,29 @@ static int64_t raw_getlength(BlockDriverState *bs);
typedef struct RawPosixAIOData {
BlockDriverState *bs;
+ int aio_type;
int aio_fildes;
- union {
- struct iovec *aio_iov;
- void *aio_ioctl_buf;
- };
- int aio_niov;
- uint64_t aio_nbytes;
-#define aio_ioctl_cmd aio_nbytes /* for QEMU_AIO_IOCTL */
+
off_t aio_offset;
- int aio_type;
+ uint64_t aio_nbytes;
+
union {
+ struct {
+ struct iovec *iov;
+ int niov;
+ } io;
+ struct {
+ uint64_t cmd;
+ void *buf;
+ } ioctl;
struct {
int aio_fd2;
off_t aio_offset2;
- };
+ } copy_range;
struct {
PreallocMode prealloc;
Error **errp;
- };
+ } truncate;
};
} RawPosixAIOData;
@@ -1152,7 +1156,7 @@ static ssize_t handle_aiocb_ioctl(RawPosixAIOData *aiocb)
{
int ret;
- ret = ioctl(aiocb->aio_fildes, aiocb->aio_ioctl_cmd, aiocb->aio_ioctl_buf);
+ ret = ioctl(aiocb->aio_fildes, aiocb->ioctl.cmd, aiocb->ioctl.buf);
if (ret == -1) {
return -errno;
}
@@ -1233,13 +1237,13 @@ static ssize_t handle_aiocb_rw_vector(RawPosixAIOData *aiocb)
do {
if (aiocb->aio_type & QEMU_AIO_WRITE)
len = qemu_pwritev(aiocb->aio_fildes,
- aiocb->aio_iov,
- aiocb->aio_niov,
+ aiocb->io.iov,
+ aiocb->io.niov,
aiocb->aio_offset);
else
len = qemu_preadv(aiocb->aio_fildes,
- aiocb->aio_iov,
- aiocb->aio_niov,
+ aiocb->io.iov,
+ aiocb->io.niov,
aiocb->aio_offset);
} while (len == -1 && errno == EINTR);
@@ -1305,8 +1309,8 @@ static ssize_t handle_aiocb_rw(RawPosixAIOData *aiocb)
* If there is just a single buffer, and it is properly aligned
* we can just use plain pread/pwrite without any problems.
*/
- if (aiocb->aio_niov == 1) {
- return handle_aiocb_rw_linear(aiocb, aiocb->aio_iov->iov_base);
+ if (aiocb->io.niov == 1) {
+ return handle_aiocb_rw_linear(aiocb, aiocb->io.iov->iov_base);
}
/*
* We have more than one iovec, and all are properly aligned.
@@ -1343,9 +1347,9 @@ static ssize_t handle_aiocb_rw(RawPosixAIOData *aiocb)
char *p = buf;
int i;
- for (i = 0; i < aiocb->aio_niov; ++i) {
- memcpy(p, aiocb->aio_iov[i].iov_base, aiocb->aio_iov[i].iov_len);
- p += aiocb->aio_iov[i].iov_len;
+ for (i = 0; i < aiocb->io.niov; ++i) {
+ memcpy(p, aiocb->io.iov[i].iov_base, aiocb->io.iov[i].iov_len);
+ p += aiocb->io.iov[i].iov_len;
}
assert(p - buf == aiocb->aio_nbytes);
}
@@ -1356,12 +1360,12 @@ static ssize_t handle_aiocb_rw(RawPosixAIOData *aiocb)
size_t count = aiocb->aio_nbytes, copy;
int i;
- for (i = 0; i < aiocb->aio_niov && count; ++i) {
+ for (i = 0; i < aiocb->io.niov && count; ++i) {
copy = count;
- if (copy > aiocb->aio_iov[i].iov_len) {
- copy = aiocb->aio_iov[i].iov_len;
+ if (copy > aiocb->io.iov[i].iov_len) {
+ copy = aiocb->io.iov[i].iov_len;
}
- memcpy(aiocb->aio_iov[i].iov_base, p, copy);
+ memcpy(aiocb->io.iov[i].iov_base, p, copy);
assert(count >= copy);
p += copy;
count -= copy;
@@ -1572,14 +1576,15 @@ static ssize_t handle_aiocb_copy_range(RawPosixAIOData *aiocb)
{
uint64_t bytes = aiocb->aio_nbytes;
off_t in_off = aiocb->aio_offset;
- off_t out_off = aiocb->aio_offset2;
+ off_t out_off = aiocb->copy_range.aio_offset2;
while (bytes) {
ssize_t ret = copy_file_range(aiocb->aio_fildes, &in_off,
- aiocb->aio_fd2, &out_off,
+ aiocb->copy_range.aio_fd2, &out_off,
bytes, 0);
trace_file_copy_file_range(aiocb->bs, aiocb->aio_fildes, in_off,
- aiocb->aio_fd2, out_off, bytes, 0, ret);
+ aiocb->copy_range.aio_fd2, out_off, bytes,
+ 0, ret);
if (ret == 0) {
/* No progress (e.g. when beyond EOF), let the caller fall back to
* buffer I/O. */
@@ -1648,7 +1653,8 @@ static int handle_aiocb_truncate(RawPosixAIOData *aiocb)
struct stat st;
int fd = aiocb->aio_fildes;
int64_t offset = aiocb->aio_offset;
- Error **errp = aiocb->errp;
+ PreallocMode prealloc = aiocb->truncate.prealloc;
+ Error **errp = aiocb->truncate.errp;
if (fstat(fd, &st) < 0) {
result = -errno;
@@ -1657,12 +1663,12 @@ static int handle_aiocb_truncate(RawPosixAIOData *aiocb)
}
current_length = st.st_size;
- if (current_length > offset && aiocb->prealloc != PREALLOC_MODE_OFF) {
+ if (current_length > offset && prealloc != PREALLOC_MODE_OFF) {
error_setg(errp, "Cannot use preallocation for shrinking files");
return -ENOTSUP;
}
- switch (aiocb->prealloc) {
+ switch (prealloc) {
#ifdef CONFIG_POSIX_FALLOCATE
case PREALLOC_MODE_FALLOC:
/*
@@ -1743,7 +1749,7 @@ static int handle_aiocb_truncate(RawPosixAIOData *aiocb)
default:
result = -ENOTSUP;
error_setg(errp, "Unsupported preallocation mode: %s",
- PreallocMode_str(aiocb->prealloc));
+ PreallocMode_str(prealloc));
return result;
}
@@ -1768,7 +1774,7 @@ static int aio_worker(void *arg)
case QEMU_AIO_READ:
ret = handle_aiocb_rw(aiocb);
if (ret >= 0 && ret < aiocb->aio_nbytes) {
- iov_memset(aiocb->aio_iov, aiocb->aio_niov, ret,
+ iov_memset(aiocb->io.iov, aiocb->io.niov, ret,
0, aiocb->aio_nbytes - ret);
ret = aiocb->aio_nbytes;
@@ -1829,16 +1835,17 @@ static int paio_submit_co_full(BlockDriverState *bs, int fd,
acb->bs = bs;
acb->aio_type = type;
acb->aio_fildes = fd;
- acb->aio_fd2 = fd2;
- acb->aio_offset2 = offset2;
acb->aio_nbytes = bytes;
acb->aio_offset = offset;
if (qiov) {
- acb->aio_iov = qiov->iov;
- acb->aio_niov = qiov->niov;
+ acb->io.iov = qiov->iov;
+ acb->io.niov = qiov->niov;
assert(qiov->size == bytes);
+ } else {
+ acb->copy_range.aio_fd2 = fd2;
+ acb->copy_range.aio_offset2 = offset2;
}
trace_file_paio_submit_co(offset, bytes, type);
@@ -1976,8 +1983,10 @@ raw_regular_truncate(BlockDriverState *bs, int fd, int64_t offset,
.aio_fildes = fd,
.aio_type = QEMU_AIO_TRUNCATE,
.aio_offset = offset,
- .prealloc = prealloc,
- .errp = errp,
+ .truncate = {
+ .prealloc = prealloc,
+ .errp = errp,
+ },
};
/* @bs can be NULL, bdrv_get_aio_context() returns the main context then */
@@ -3089,8 +3098,8 @@ static BlockAIOCB *hdev_aio_ioctl(BlockDriverState *bs,
acb->aio_type = QEMU_AIO_IOCTL;
acb->aio_fildes = s->fd;
acb->aio_offset = 0;
- acb->aio_ioctl_buf = buf;
- acb->aio_ioctl_cmd = req;
+ acb->ioctl.buf = buf;
+ acb->ioctl.cmd = req;
pool = aio_get_thread_pool(bdrv_get_aio_context(bs));
return thread_pool_submit_aio(pool, aio_worker, acb, cb, opaque);
}
--
2.19.2
next prev parent reply other threads:[~2018-12-12 13:28 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-12 13:26 [Qemu-devel] [PULL 00/41] Block layer patches Kevin Wolf
2018-12-12 13:26 ` [Qemu-devel] [PULL 01/41] block: adding lzfse decompressing support as a module Kevin Wolf
2018-12-12 13:26 ` [Qemu-devel] [PULL 02/41] configure: adding support to lzfse library Kevin Wolf
2018-12-12 13:26 ` [Qemu-devel] [PULL 03/41] dmg: including dmg-lzfse module inside dmg block driver Kevin Wolf
2018-12-12 13:26 ` [Qemu-devel] [PULL 04/41] dmg: exchanging hardcoded dmg UDIF block types to enum Kevin Wolf
2018-12-12 13:26 ` [Qemu-devel] [PULL 05/41] block/replication: drop extra synchronization Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 06/41] block/backup: drop unused synchronization interface Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 07/41] qcow2: use Z_OK instead of 0 for deflateInit2 return code check Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 08/41] qcow2: make more generic interface for qcow2_compress Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 09/41] qcow2: move decompression from qcow2-cluster.c to qcow2.c Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 10/41] qcow2: refactor decompress_buffer Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 11/41] qcow2: use byte-based read in qcow2_decompress_cluster Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 12/41] qcow2: aio support for compressed cluster read Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 13/41] qcow2: do decompression in threads Kevin Wolf
2018-12-12 13:27 ` Kevin Wolf [this message]
2018-12-12 13:27 ` [Qemu-devel] [PULL 15/41] file-posix: Factor out raw_thread_pool_submit() Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 16/41] file-posix: Avoid aio_worker() for QEMU_AIO_TRUNCATE Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 17/41] file-posix: Avoid aio_worker() for QEMU_AIO_COPY_RANGE Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 18/41] file-posix: Avoid aio_worker() for QEMU_AIO_WRITE_ZEROES Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 19/41] file-posix: Avoid aio_worker() for QEMU_AIO_DISCARD Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 20/41] file-posix: Avoid aio_worker() for QEMU_AIO_FLUSH Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 21/41] file-posix: Move read/write operation logic out of aio_worker() Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 22/41] file-posix: Avoid aio_worker() for QEMU_AIO_READ/WRITE Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 23/41] file-posix: Remove paio_submit_co() Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 24/41] file-posix: Switch to .bdrv_co_ioctl Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 25/41] file-posix: Avoid aio_worker() for QEMU_AIO_IOCTL Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 26/41] block: Add bdrv_reopen_set_read_only() Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 27/41] block: Use bdrv_reopen_set_read_only() in bdrv_backing_update_filename() Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 28/41] block: Use bdrv_reopen_set_read_only() in commit_start/complete() Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 29/41] block: Use bdrv_reopen_set_read_only() in bdrv_commit() Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 30/41] block: Use bdrv_reopen_set_read_only() in stream_start/complete() Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 31/41] block: Use bdrv_reopen_set_read_only() in qmp_change_backing_file() Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 32/41] block: Use bdrv_reopen_set_read_only() in external_snapshot_commit() Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 33/41] block: Use bdrv_reopen_set_read_only() in the mirror driver Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 34/41] block: Drop bdrv_reopen() Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 35/41] qemu-io: Put flag changes in the options QDict in reopen_f() Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 36/41] block: Clean up reopen_backing_file() in block/replication.c Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 37/41] block: Remove flags parameter from bdrv_reopen_queue() Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 38/41] block: Stop passing flags to bdrv_reopen_queue_child() Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 39/41] block: Remove assertions from update_flags_from_options() Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 40/41] block: Assert that flags are up-to-date in bdrv_reopen_prepare() Kevin Wolf
2018-12-12 13:27 ` [Qemu-devel] [PULL 41/41] iotests: make 235 work on s390 (and others) Kevin Wolf
2018-12-14 10:19 ` [Qemu-devel] [PULL 00/41] Block layer patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181212132735.16080-15-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).