Received: from eggs.gnu.org ([2001:4830:134:3::10]:57418) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1celZ1-00063U-Js for qemu-devel@nongnu.org; Fri, 17 Feb 2017 11:39:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1celYy-0004Tr-GP for qemu-devel@nongnu.org; Fri, 17 Feb 2017 11:39:19 -0500 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:58550 helo=mx01.kamp.de) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1celYy-0004R8-6O for qemu-devel@nongnu.org; Fri, 17 Feb 2017 11:39:16 -0500 From: Peter Lieven Date: Fri, 17 Feb 2017 17:39:01 +0100 Message-Id: <1487349541-10201-3-git-send-email-pl@kamp.de> In-Reply-To: <1487349541-10201-1-git-send-email-pl@kamp.de> References: <1487349541-10201-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCH 2/2] block/nfs: try to avoid the bounce buffer in pwritev List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, kwolf@redhat.com, mreitz@redhat.com, jcody@redhat.com, Peter Lieven if the passed qiov contains exactly one iov we can pass the buffer directly. Signed-off-by: Peter Lieven --- block/nfs.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/block/nfs.c b/block/nfs.c index ab5dcc2..bb4b75f 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -295,20 +295,27 @@ static int coroutine_fn nfs_co_pwritev(BlockDriverState *bs, uint64_t offset, NFSClient *client = bs->opaque; NFSRPC task; char *buf = NULL; + bool my_buffer = false; nfs_co_init_task(bs, &task); - buf = g_try_malloc(bytes); - if (bytes && buf == NULL) { - return -ENOMEM; + if (iov->niov != 1) { + buf = g_try_malloc(bytes); + if (bytes && buf == NULL) { + return -ENOMEM; + } + qemu_iovec_to_buf(iov, 0, buf, bytes); + my_buffer = true; + } else { + buf = iov->iov[0].iov_base; } - qemu_iovec_to_buf(iov, 0, buf, bytes); - if (nfs_pwrite_async(client->context, client->fh, offset, bytes, buf, nfs_co_generic_cb, &task) != 0) { - g_free(buf); + if (my_buffer) { + g_free(buf); + } return -ENOMEM; } @@ -317,7 +324,9 @@ static int coroutine_fn nfs_co_pwritev(BlockDriverState *bs, uint64_t offset, qemu_coroutine_yield(); } - g_free(buf); + if (my_buffer) { + g_free(buf); + } if (task.ret != bytes) { return task.ret < 0 ? task.ret : -EIO; -- 1.9.1