block/file-posix.c: Use pwritev2() with RWF_DSYNC for FUA
PATCH v4 1/1 block/file-posix.c: Use pwritev2() with RWF_DSYNC for FUA
Full Unit Access (FUA) is an optimization where a disk write with the flag set will be persisted to disk immediately instead of potentially remaining in the disk's write cache. This commit address the todo task for using pwritev2() with RWF_DSYNC in the thread pool section of raw_co_prw(), if pwritev2 with RWF_DSYNC is available in the host, which is alway for Linux kernel >= 4.7. The intent for FUA is indicated with the BDRV_REQ_FUA flag. The old code paths are preserved in case BDRV_REQ_FUA is off or pwritev2() with RWF_DSYNC is not available.
During testing, I observed that the BDRV_REQ_FUA is always turned on when blk->enable_write_cache is not set in block/block-backend.c, so I commented this section off during testing:
https://gitlab.com/qemu-project/qemu/-/blob/master/block/block-backend.c?ref_type=heads#L1432-1434
Update 1:
The testing with "-t writeback" works for turning on enable_write_cache. I renamed the function to qemu_pwritev_fua() and fixed any typos.
I moved the handle_aiocb_flush() into the qemu_pwritev_fua() and removed from the previously todo seciont. Initially I thought of only passing aiocb, but then I was not sure whethe I could derive buf from aiocb, so I added arguments for iovec and iovcnt into qemu_pwritev_fua().
For handling buf in handle_aiocb_rw_linear(), I created iovec and passed its reference. I assumed that there will be only one buffer/iovec, so I passed 1 for iovcnt.
Update 2:
For non-Linux hosts, I am returning -ENOSYS in the same way for pwritev.
I changed the signature to add fd, iov, nr_iov, offset separately, with the aiocb pointer at the end. I thought of reconstructing aiocb inside the function but the handle_aiocb_flush() uses (BDRVRawState)aiocb->bs->opaque which I was not sure whether it was used to pass return values upstream.
So I decided on passing aiocb pointer as an input argument.
I was not sure about how git rebase worked with patches, I hope it worked, finger-crossed 😅
--- block/file-posix.c | 59 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 12 deletions(-)
block/file-posix.c +47 -12
@@ -229,6 +229,7 @@ typedef struct RawPosixAIOData {unsigned long op; } zone_mgmt; }; +BdrvRequestFlags flags; } RawPosixAIOData;#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
@@ -1674,6 +1675,20 @@ qemu_pwritev(int fd, const struct iovec *iov, int nr_iov, off_t offset) return pwritev(fd, iov, nr_iov, offset); } +static ssize_t +qemu_pwritev_fua (int fd,struct iovec *iov,int nr_iov,off_t offset,const RawPosixAIOData *aiocb) +{ +#ifdef RWF_DSYNC +return pwritev2 (fd, iov, nr_iov, offset,RWF_DSYNC ); +#else +ssize_t len =pwritev2 (fd, iov, nr_iov, offset,0 ); +if (len ==0 ) { + len =handle_aiocb_flush (aiocb); + } +return len; +#endif +} +#else static bool preadv_present = false;
@@ -1690,6 +1705,11 @@ qemu_pwritev(int fd, const struct iovec *iov, int nr_iov, off_t offset) return -ENOSYS; } +static ssize_t +qemu_pwritev_fua (int fd,struct iovec *iov,int nr_iov,off_t offset,const RawPosixAIOData *aiocb) +{ +return -ENOSYS ; +}#endif static ssize_t handle_aiocb_rw_vector (RawPosixAIOData *aiocb)
@@ -1698,10 +1718,16 @@ static ssize_t handle_aiocb_rw_vector(RawPosixAIOData *aiocb) len =RETRY_ON_EINTR ( (aiocb->aio_type & (QEMU_AIO_WRITE |QEMU_AIO_ZONE_APPEND )) ? -qemu_pwritev (aiocb->aio_fildes, - aiocb->io.iov, - aiocb->io.niov, - aiocb->aio_offset) : + (aiocb->flags &BDRV_REQ_FUA ) ? +qemu_pwritev_fua (aiocb->aio_fildes, + aiocb->io.iov, + aiocb->io.niov, + aiocb->aio_offset, + aiocb) : +qemu_pwritev (aiocb->aio_fildes, + aiocb->io.iov, + aiocb->io.niov, + aiocb->aio_offset) : qemu_preadv(aiocb->aio_fildes, aiocb->io.iov, aiocb->io.niov,
@@ -1727,10 +1753,22 @@ static ssize_t handle_aiocb_rw_linear(RawPosixAIOData *aiocb, char *buf)while (offset < aiocb->aio_nbytes) {if (aiocb->aio_type & (QEMU_AIO_WRITE |QEMU_AIO_ZONE_APPEND )) { - len =pwrite (aiocb->aio_fildes, - (const char *)buf + offset, - aiocb->aio_nbytes - offset, - aiocb->aio_offset + offset); +if (aiocb->flags &BDRV_REQ_FUA ) { +struct iovec iov = { + .iov_base = buf, + .iov_len = aiocb->aio_nbytes - offset, + }; + len =qemu_pwritev_fua (aiocb->aio_fildes, + &iov, +1 , + aiocb->aio_offset + offset, + aiocb); + }else { + len =pwrite (aiocb->aio_fildes, + (const char *)buf + offset, + aiocb->aio_nbytes - offset, + aiocb->aio_offset + offset); + } }else { len = pread(aiocb->aio_fildes, buf + offset,
@@ -2539,14 +2577,11 @@ static int coroutine_fn raw_co_prw(BlockDriverState *bs, int64_t *offset_ptr, .iov = qiov->iov, .niov = qiov->niov, }, + .flags = flags, };assert (qiov->size == bytes); ret =raw_thread_pool_submit (handle_aiocb_rw, &acb); -if (ret ==0 && (flags &BDRV_REQ_FUA )) { -/* TODO Use pwritev2() instead if it's available */ - ret =raw_co_flush_to_disk (bs); - } goto out;/* Avoid the compiler err of unused label */ out:
Signature · 1 line
2.43.0
Quoted 45 lines · Pinku Deb Nath
Full Unit Access (FUA) is an optimization where a disk write with the flag set will be persisted to disk immediately instead of potentially remaining in the disk's write cache. This commit address the todo task for using
pwritev2()withRWF_DSYNCin the thread pool section ofraw_co_prw(), if pwritev2 withRWF_DSYNCis available in the host, which is alway for Linux kernel >= 4.7. The intent for FUA is indicated with theBDRV_REQ_FUAflag. The old code paths are preserved in caseBDRV_REQ_FUAis off orpwritev2()withRWF_DSYNCis not available.During testing, I observed that the
BDRV_REQ_FUAis always turned on whenblk->enable_write_cacheis not set inblock/block-backend.c, so I commented this section off during testing:
https://gitlab.com/qemu-project/qemu/-/blob/master/block/block-backend.c?ref_type=heads#L1432-1434Signed-off-by Pinku Deb Nath <[email protected]>Update 1:
The testing with "-t writeback" works for turning on
enable_write_cache. I renamed the function toqemu_pwritev_fua()and fixed any typos.I moved the
handle_aiocb_flush()into theqemu_pwritev_fua()and removed from the previously todo seciont. Initially I thought of only passing aiocb, but then I was not sure whethe I could derive buf from aiocb, so I added arguments for iovec and iovcnt intoqemu_pwritev_fua().For handling buf in
handle_aiocb_rw_linear(), I created iovec and passed its reference. I assumed that there will be only one buffer/iovec, so I passed 1 for iovcnt.Signed-off-by Pinku Deb Nath <[email protected]>Update 2:
For non-Linux hosts, I am returning
-ENOSYSin the same way for pwritev.I changed the signature to add fd, iov,
nr_iov, offset separately, with the aiocb pointer at the end. I thought of reconstructing aiocb inside the function but thehandle_aiocb_flush()uses (BDRVRawState)aiocb->bs->opaque which I was not sure whether it was used to pass return values upstream.
So I decided on passing aiocb pointer as an input argument.
Quoted 7 lines
I was not sure about how git rebase worked with patches, I hope it worked, finger-crossed 😅
Signed-off-by Pinku Deb Nath <[email protected]>--- block/file-posix.c | 59 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 12 deletions(-)
The commit description becomes part of the git log when the commit is merged. For the same reasons why changes to patches should be squashed, the commit description should also be updated to reflect the latest state instead of appending incremental descriptions.
In order to indicate what changed since the previous version, you can add a changelog below the '---' line. Anything below the '---' line is discarded when git-am(1) applies a commit email. For example:
---
v3:
- Changed signature to add fd, iov, nr_iov, ...
v2:
- Moved handle_aiocb_flush() into qemu_pwritev_fua().
By doing these things you make it easy for reviewers to see what has changed while keeping the git log clean.
Quoted 68 lines
block/file-posix.c +30
-4@@ -229,6 +229,7 @@ typedef struct RawPosixAIOData {unsigned long op; } zone_mgmt; }; +BdrvRequestFlags flags; } RawPosixAIOData;#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)@@ -1674,6 +1675,20 @@ qemu_pwritev(int fd, const struct iovec *iov, int nr_iov, off_t offset) return pwritev(fd, iov, nr_iov, offset); } +static ssize_t +qemu_pwritev_fua (int fd,struct iovec *iov,int nr_iov,off_t offset,const RawPosixAIOData *aiocb) +{ +#ifdef RWF_DSYNC +return pwritev2 (fd, iov, nr_iov, offset,RWF_DSYNC ); +#else +ssize_t len =pwritev2 (fd, iov, nr_iov, offset,0 ); +if (len ==0 ) { + len =handle_aiocb_flush (aiocb); + } +return len; +#endif +} +#else static bool preadv_present = false;@@ -1690,6 +1705,11 @@ qemu_pwritev(int fd, const struct iovec *iov, int nr_iov, off_t offset) return -ENOSYS; } +static ssize_t +qemu_pwritev_fua (int fd,struct iovec *iov,int nr_iov,off_t offset,const RawPosixAIOData *aiocb) +{ +return -ENOSYS ; +}#endif static ssize_t handle_aiocb_rw_vector (RawPosixAIOData *aiocb)@@ -1698,10 +1718,16 @@ static ssize_t handle_aiocb_rw_vector(RawPosixAIOData *aiocb) len =RETRY_ON_EINTR ( (aiocb->aio_type & (QEMU_AIO_WRITE |QEMU_AIO_ZONE_APPEND )) ? -qemu_pwritev (aiocb->aio_fildes, - aiocb->io.iov, - aiocb->io.niov, - aiocb->aio_offset) : + (aiocb->flags &BDRV_REQ_FUA ) ? +qemu_pwritev_fua (aiocb->aio_fildes, + aiocb->io.iov, + aiocb->io.niov, + aiocb->aio_offset, + aiocb) : +qemu_pwritev (aiocb->aio_fildes, + aiocb->io.iov, + aiocb->io.niov, + aiocb->aio_offset) : qemu_preadv(aiocb->aio_fildes, aiocb->io.iov, aiocb->io.niov,
block/file-posix.c static ssize_t handle_aiocb_rw_linear(RawPosixAIOData *aiocb, char *buf) · line 1758
Quoted 10 lines
block/file-posix.c +3
-4@@ -1727,10 +1753,22 @@ static ssize_t handle_aiocb_rw_linear(RawPosixAIOData *aiocb, char *buf)while (offset < aiocb->aio_nbytes) {if (aiocb->aio_type & (QEMU_AIO_WRITE |QEMU_AIO_ZONE_APPEND )) { - len =pwrite (aiocb->aio_fildes, - (const char *)buf + offset, - aiocb->aio_nbytes - offset, - aiocb->aio_offset + offset); +if (aiocb->flags &BDRV_REQ_FUA ) { +struct iovec iov = { + .iov_base = buf,
This should be buf + offset (the same as below)?
block/file-posix.c static ssize_t handle_aiocb_rw_linear(RawPosixAIOData *aiocb, char *buf) · line 1765
Quoted 7 lines
block/file-posix.c +7
-0+ .iov_len = aiocb->aio_nbytes - offset, + }; + len =qemu_pwritev_fua (aiocb->aio_fildes, + &iov, +1 , + aiocb->aio_offset + offset, + aiocb);
When !CONFIG_PREADV then linear FUA writes will fail because there is no -ENOSYS fallback here. Please add a fallback to pwrite() + handle_aiocb_flush().
Quoted 28 lines
block/file-posix.c +7
-4+ }else { + len =pwrite (aiocb->aio_fildes, + (const char *)buf + offset, + aiocb->aio_nbytes - offset, + aiocb->aio_offset + offset); + } }else { len = pread(aiocb->aio_fildes, buf + offset,@@ -2539,14 +2577,11 @@ static int coroutine_fn raw_co_prw(BlockDriverState *bs, int64_t *offset_ptr, .iov = qiov->iov, .niov = qiov->niov, }, + .flags = flags, };assert (qiov->size == bytes); ret =raw_thread_pool_submit (handle_aiocb_rw, &acb); -if (ret ==0 && (flags &BDRV_REQ_FUA )) { -/* TODO Use pwritev2() instead if it's available */ - ret =raw_co_flush_to_disk (bs); - } goto out;/* Avoid the compiler err of unused label */ out:Signature · 1 line
2.43.0