From: Jeff Cody <jcody@redhat.com>
To: Peter Lieven <pl@kamp.de>
Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, kwolf@redhat.com,
mreitz@redhat.com
Subject: Re: [Qemu-devel] [PATCH 1/2] block/nfs: convert to preadv / pwritev
Date: Fri, 17 Feb 2017 16:33:25 -0500 [thread overview]
Message-ID: <20170217213325.GI19045@localhost.localdomain> (raw)
In-Reply-To: <1487349541-10201-2-git-send-email-pl@kamp.de>
On Fri, Feb 17, 2017 at 05:39:00PM +0100, Peter Lieven wrote:
> Signed-off-by: Peter Lieven <pl@kamp.de>
> ---
> block/nfs.c | 33 +++++++++++++++------------------
> 1 file changed, 15 insertions(+), 18 deletions(-)
>
> diff --git a/block/nfs.c b/block/nfs.c
> index 689eaa7..ab5dcc2 100644
> --- a/block/nfs.c
> +++ b/block/nfs.c
> @@ -256,9 +256,9 @@ nfs_co_generic_cb(int ret, struct nfs_context *nfs, void *data,
> nfs_co_generic_bh_cb, task);
> }
>
> -static int coroutine_fn nfs_co_readv(BlockDriverState *bs,
> - int64_t sector_num, int nb_sectors,
> - QEMUIOVector *iov)
> +static int coroutine_fn nfs_co_preadv(BlockDriverState *bs, uint64_t offset,
> + uint64_t bytes, QEMUIOVector *iov,
> + int flags)
> {
> NFSClient *client = bs->opaque;
> NFSRPC task;
> @@ -267,9 +267,7 @@ static int coroutine_fn nfs_co_readv(BlockDriverState *bs,
> task.iov = iov;
>
> if (nfs_pread_async(client->context, client->fh,
> - sector_num * BDRV_SECTOR_SIZE,
> - nb_sectors * BDRV_SECTOR_SIZE,
> - nfs_co_generic_cb, &task) != 0) {
> + offset, bytes, nfs_co_generic_cb, &task) != 0) {
> return -ENOMEM;
> }
>
> @@ -290,9 +288,9 @@ static int coroutine_fn nfs_co_readv(BlockDriverState *bs,
> return 0;
> }
>
> -static int coroutine_fn nfs_co_writev(BlockDriverState *bs,
> - int64_t sector_num, int nb_sectors,
> - QEMUIOVector *iov)
> +static int coroutine_fn nfs_co_pwritev(BlockDriverState *bs, uint64_t offset,
> + uint64_t bytes, QEMUIOVector *iov,
> + int flags)
> {
> NFSClient *client = bs->opaque;
> NFSRPC task;
> @@ -300,17 +298,16 @@ static int coroutine_fn nfs_co_writev(BlockDriverState *bs,
>
> nfs_co_init_task(bs, &task);
>
> - buf = g_try_malloc(nb_sectors * BDRV_SECTOR_SIZE);
> - if (nb_sectors && buf == NULL) {
> + buf = g_try_malloc(bytes);
> + if (bytes && buf == NULL) {
> return -ENOMEM;
> }
>
> - qemu_iovec_to_buf(iov, 0, buf, nb_sectors * BDRV_SECTOR_SIZE);
> + qemu_iovec_to_buf(iov, 0, buf, bytes);
>
> if (nfs_pwrite_async(client->context, client->fh,
> - sector_num * BDRV_SECTOR_SIZE,
> - nb_sectors * BDRV_SECTOR_SIZE,
> - buf, nfs_co_generic_cb, &task) != 0) {
> + offset, bytes, buf,
> + nfs_co_generic_cb, &task) != 0) {
> g_free(buf);
> return -ENOMEM;
> }
> @@ -322,7 +319,7 @@ static int coroutine_fn nfs_co_writev(BlockDriverState *bs,
>
> g_free(buf);
>
> - if (task.ret != nb_sectors * BDRV_SECTOR_SIZE) {
> + if (task.ret != bytes) {
> return task.ret < 0 ? task.ret : -EIO;
> }
>
> @@ -856,8 +853,8 @@ static BlockDriver bdrv_nfs = {
> .bdrv_create = nfs_file_create,
> .bdrv_reopen_prepare = nfs_reopen_prepare,
>
> - .bdrv_co_readv = nfs_co_readv,
> - .bdrv_co_writev = nfs_co_writev,
> + .bdrv_co_preadv = nfs_co_preadv,
> + .bdrv_co_pwritev = nfs_co_pwritev,
> .bdrv_co_flush_to_disk = nfs_co_flush,
>
> .bdrv_detach_aio_context = nfs_detach_aio_context,
> --
> 1.9.1
>
Reviewed-by: Jeff Cody <jcody@redhat.com>
next prev parent reply other threads:[~2017-02-17 21:33 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-17 16:38 [Qemu-devel] [PATCH 0/2] block/nfs optimizations Peter Lieven
2017-02-17 16:39 ` [Qemu-devel] [PATCH 1/2] block/nfs: convert to preadv / pwritev Peter Lieven
2017-02-17 21:33 ` Jeff Cody [this message]
2017-02-17 16:39 ` [Qemu-devel] [PATCH 2/2] block/nfs: try to avoid the bounce buffer in pwritev Peter Lieven
2017-02-17 21:37 ` Jeff Cody
2017-02-17 21:42 ` Eric Blake
2017-02-17 21:51 ` Jeff Cody
2017-02-22 12:47 ` Kevin Wolf
2017-02-22 12:48 ` Jeff Cody
2017-02-24 3:50 ` [Qemu-devel] [PATCH 0/2] block/nfs optimizations Jeff Cody
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=20170217213325.GI19045@localhost.localdomain \
--to=jcody@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pl@kamp.de \
--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).