From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52340) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGyM6-00034o-KU for qemu-devel@nongnu.org; Fri, 21 Feb 2014 17:14:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WGyM1-0000gs-8s for qemu-devel@nongnu.org; Fri, 21 Feb 2014 17:14:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:32602) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGyM1-0000gf-0V for qemu-devel@nongnu.org; Fri, 21 Feb 2014 17:13:57 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s1LMDucK032433 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 21 Feb 2014 17:13:56 -0500 From: Kevin Wolf Date: Fri, 21 Feb 2014 23:12:42 +0100 Message-Id: <1393020771-32712-46-git-send-email-kwolf@redhat.com> In-Reply-To: <1393020771-32712-1-git-send-email-kwolf@redhat.com> References: <1393020771-32712-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 45/54] quorum: Add quorum_aio_readv. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com From: Beno=C3=AEt Canet Add code to do num_children reads in parallel and cleanup the structures afterwards. Signed-off-by: Benoit Canet Reviewed-by: Max Reitz Signed-off-by: Kevin Wolf --- block/quorum.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/block/quorum.c b/block/quorum.c index 99e0e03..fd19662 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -91,10 +91,18 @@ static AIOCBInfo quorum_aiocb_info =3D { =20 static void quorum_aio_finalize(QuorumAIOCB *acb) { - int ret =3D 0; + BDRVQuorumState *s =3D acb->common.bs->opaque; + int i, ret =3D 0; =20 acb->common.cb(acb->common.opaque, ret); =20 + if (acb->is_read) { + for (i =3D 0; i < s->num_children; i++) { + qemu_vfree(acb->qcrs[i].buf); + qemu_iovec_destroy(&acb->qcrs[i].qiov); + } + } + g_free(acb->qcrs); qemu_aio_release(acb); } @@ -149,6 +157,34 @@ static void quorum_aio_cb(void *opaque, int ret) quorum_aio_finalize(acb); } =20 +static BlockDriverAIOCB *quorum_aio_readv(BlockDriverState *bs, + int64_t sector_num, + QEMUIOVector *qiov, + int nb_sectors, + BlockDriverCompletionFunc *cb, + void *opaque) +{ + BDRVQuorumState *s =3D bs->opaque; + QuorumAIOCB *acb =3D quorum_aio_get(s, bs, qiov, sector_num, + nb_sectors, cb, opaque); + int i; + + acb->is_read =3D true; + + for (i =3D 0; i < s->num_children; i++) { + acb->qcrs[i].buf =3D qemu_blockalign(s->bs[i], qiov->size); + qemu_iovec_init(&acb->qcrs[i].qiov, qiov->niov); + qemu_iovec_clone(&acb->qcrs[i].qiov, qiov, acb->qcrs[i].buf); + } + + for (i =3D 0; i < s->num_children; i++) { + bdrv_aio_readv(s->bs[i], sector_num, qiov, nb_sectors, + quorum_aio_cb, &acb->qcrs[i]); + } + + return &acb->common; +} + static BlockDriverAIOCB *quorum_aio_writev(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, @@ -176,6 +212,7 @@ static BlockDriver bdrv_quorum =3D { =20 .instance_size =3D sizeof(BDRVQuorumState), =20 + .bdrv_aio_readv =3D quorum_aio_readv, .bdrv_aio_writev =3D quorum_aio_writev, }; =20 --=20 1.8.1.4