From nobody Sun Apr 28 16:29:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487349808557231.80905282411845; Fri, 17 Feb 2017 08:43:28 -0800 (PST) Received: from localhost ([::1]:54656 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1celcz-00012i-Ic for importer@patchew.org; Fri, 17 Feb 2017 11:43:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1celZ1-00063P-JC 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-0004U5-GL for qemu-devel@nongnu.org; Fri, 17 Feb 2017 11:39:19 -0500 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:42307 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-0004R9-6O for qemu-devel@nongnu.org; Fri, 17 Feb 2017 11:39:16 -0500 Received: (qmail 27270 invoked by uid 89); 17 Feb 2017 16:39:11 -0000 Received: from [195.62.97.28] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.99.2/23079. avast: 1.2.2/17010300. spamassassin: 3.4.1. Clear:RC:1(195.62.97.28):. Processed in 0.415816 secs); 17 Feb 2017 16:39:11 -0000 Received: from smtp.kamp.de (HELO submission.kamp.de) ([195.62.97.28]) by mx01.kamp.de with ESMTPS (DHE-RSA-AES256-GCM-SHA384 encrypted); 17 Feb 2017 16:39:08 -0000 Received: (qmail 2986 invoked from network); 17 Feb 2017 16:39:07 -0000 Received: from lieven-pc.kamp-intra.net (HELO lieven-pc) (relay@kamp.de@::ffff:172.21.12.60) by submission.kamp.de with ESMTPS (DHE-RSA-AES256-GCM-SHA384 encrypted) ESMTPA; 17 Feb 2017 16:39:07 -0000 Received: by lieven-pc (Postfix, from userid 1000) id 318C220E78; Fri, 17 Feb 2017 17:39:07 +0100 (CET) X-GL_Whitelist: yes From: Peter Lieven To: qemu-devel@nongnu.org Date: Fri, 17 Feb 2017 17:39:00 +0100 Message-Id: <1487349541-10201-2-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1487349541-10201-1-git-send-email-pl@kamp.de> References: <1487349541-10201-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a02:248:0:51::16 Subject: [Qemu-devel] [PATCH 1/2] block/nfs: convert to preadv / pwritev X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, jcody@redhat.com, Peter Lieven , qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Lieven Reviewed-by: Jeff Cody --- 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, voi= d *data, nfs_co_generic_bh_cb, task); } =20 -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 offse= t, + uint64_t bytes, QEMUIOVector *iov, + int flags) { NFSClient *client =3D bs->opaque; NFSRPC task; @@ -267,9 +267,7 @@ static int coroutine_fn nfs_co_readv(BlockDriverState *= bs, task.iov =3D iov; =20 if (nfs_pread_async(client->context, client->fh, - sector_num * BDRV_SECTOR_SIZE, - nb_sectors * BDRV_SECTOR_SIZE, - nfs_co_generic_cb, &task) !=3D 0) { + offset, bytes, nfs_co_generic_cb, &task) !=3D 0) { return -ENOMEM; } =20 @@ -290,9 +288,9 @@ static int coroutine_fn nfs_co_readv(BlockDriverState *= bs, return 0; } =20 -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 offs= et, + uint64_t bytes, QEMUIOVector *iov, + int flags) { NFSClient *client =3D bs->opaque; NFSRPC task; @@ -300,17 +298,16 @@ static int coroutine_fn nfs_co_writev(BlockDriverStat= e *bs, =20 nfs_co_init_task(bs, &task); =20 - buf =3D g_try_malloc(nb_sectors * BDRV_SECTOR_SIZE); - if (nb_sectors && buf =3D=3D NULL) { + buf =3D g_try_malloc(bytes); + if (bytes && buf =3D=3D NULL) { return -ENOMEM; } =20 - qemu_iovec_to_buf(iov, 0, buf, nb_sectors * BDRV_SECTOR_SIZE); + qemu_iovec_to_buf(iov, 0, buf, bytes); =20 if (nfs_pwrite_async(client->context, client->fh, - sector_num * BDRV_SECTOR_SIZE, - nb_sectors * BDRV_SECTOR_SIZE, - buf, nfs_co_generic_cb, &task) !=3D 0) { + offset, bytes, buf, + nfs_co_generic_cb, &task) !=3D 0) { g_free(buf); return -ENOMEM; } @@ -322,7 +319,7 @@ static int coroutine_fn nfs_co_writev(BlockDriverState = *bs, =20 g_free(buf); =20 - if (task.ret !=3D nb_sectors * BDRV_SECTOR_SIZE) { + if (task.ret !=3D bytes) { return task.ret < 0 ? task.ret : -EIO; } =20 @@ -856,8 +853,8 @@ static BlockDriver bdrv_nfs =3D { .bdrv_create =3D nfs_file_create, .bdrv_reopen_prepare =3D nfs_reopen_prepare, =20 - .bdrv_co_readv =3D nfs_co_readv, - .bdrv_co_writev =3D nfs_co_writev, + .bdrv_co_preadv =3D nfs_co_preadv, + .bdrv_co_pwritev =3D nfs_co_pwritev, .bdrv_co_flush_to_disk =3D nfs_co_flush, =20 .bdrv_detach_aio_context =3D nfs_detach_aio_context, --=20 1.9.1 From nobody Sun Apr 28 16:29:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487349640500100.8303782182087; Fri, 17 Feb 2017 08:40:40 -0800 (PST) Received: from localhost ([::1]:54642 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1celaG-0006y7-Sd for importer@patchew.org; Fri, 17 Feb 2017 11:40:36 -0500 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 Received: (qmail 27250 invoked by uid 89); 17 Feb 2017 16:39:10 -0000 Received: from [195.62.97.28] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.99.2/23079. avast: 1.2.2/17010300. spamassassin: 3.4.1. Clear:RC:1(195.62.97.28):. Processed in 0.239449 secs); 17 Feb 2017 16:39:10 -0000 Received: from smtp.kamp.de (HELO submission.kamp.de) ([195.62.97.28]) by mx01.kamp.de with ESMTPS (DHE-RSA-AES256-GCM-SHA384 encrypted); 17 Feb 2017 16:39:08 -0000 Received: (qmail 2995 invoked from network); 17 Feb 2017 16:39:07 -0000 Received: from lieven-pc.kamp-intra.net (HELO lieven-pc) (relay@kamp.de@::ffff:172.21.12.60) by submission.kamp.de with ESMTPS (DHE-RSA-AES256-GCM-SHA384 encrypted) ESMTPA; 17 Feb 2017 16:39:07 -0000 Received: by lieven-pc (Postfix, from userid 1000) id 3519720EA7; Fri, 17 Feb 2017 17:39:07 +0100 (CET) X-GL_Whitelist: yes From: Peter Lieven To: qemu-devel@nongnu.org Date: Fri, 17 Feb 2017 17:39:01 +0100 Message-Id: <1487349541-10201-3-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1487349541-10201-1-git-send-email-pl@kamp.de> References: <1487349541-10201-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a02:248:0:51::16 Subject: [Qemu-devel] [PATCH 2/2] block/nfs: try to avoid the bounce buffer in pwritev X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, jcody@redhat.com, Peter Lieven , qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" if the passed qiov contains exactly one iov we can pass the buffer directly. Signed-off-by: Peter Lieven Reviewed-by: Jeff Cody --- 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(BlockDriverSta= te *bs, uint64_t offset, NFSClient *client =3D bs->opaque; NFSRPC task; char *buf =3D NULL; + bool my_buffer =3D false; =20 nfs_co_init_task(bs, &task); =20 - buf =3D g_try_malloc(bytes); - if (bytes && buf =3D=3D NULL) { - return -ENOMEM; + if (iov->niov !=3D 1) { + buf =3D g_try_malloc(bytes); + if (bytes && buf =3D=3D NULL) { + return -ENOMEM; + } + qemu_iovec_to_buf(iov, 0, buf, bytes); + my_buffer =3D true; + } else { + buf =3D iov->iov[0].iov_base; } =20 - qemu_iovec_to_buf(iov, 0, buf, bytes); - if (nfs_pwrite_async(client->context, client->fh, offset, bytes, buf, nfs_co_generic_cb, &task) !=3D 0) { - g_free(buf); + if (my_buffer) { + g_free(buf); + } return -ENOMEM; } =20 @@ -317,7 +324,9 @@ static int coroutine_fn nfs_co_pwritev(BlockDriverState= *bs, uint64_t offset, qemu_coroutine_yield(); } =20 - g_free(buf); + if (my_buffer) { + g_free(buf); + } =20 if (task.ret !=3D bytes) { return task.ret < 0 ? task.ret : -EIO; --=20 1.9.1