From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59684) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEUCO-0001LY-8p for qemu-devel@nongnu.org; Fri, 14 Feb 2014 20:37:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WEUCJ-0000uJ-8a for qemu-devel@nongnu.org; Fri, 14 Feb 2014 20:37:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60966) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEUCJ-0000uE-0E for qemu-devel@nongnu.org; Fri, 14 Feb 2014 20:37:39 -0500 Message-ID: <52FEC576.9040205@redhat.com> Date: Sat, 15 Feb 2014 02:40:06 +0100 From: Max Reitz MIME-Version: 1.0 References: <1392242799-16364-1-git-send-email-benoit.canet@irqsave.net> <1392242799-16364-6-git-send-email-benoit.canet@irqsave.net> In-Reply-To: <1392242799-16364-6-git-send-email-benoit.canet@irqsave.net> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH V17 05/12] quorum: Add quorum_aio_readv. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?QmVub8OudCBDYW5ldA==?= , qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com, =?UTF-8?B?QmVub8OudCBDYW5ldA==?= , stefanha@redhat.com On 12.02.2014 23:06, Beno=C3=AEt Canet wrote: > From: Beno=C3=AEt Canet > > Add code to do num_children reads in parallel and cleanup the structure= s > afterward. "afterwards" > Signed-off-by: Benoit Canet > Reviewed-by: Max Reitz > --- > block/quorum.c | 39 ++++++++++++++++++++++++++++++++++++++- > 1 file changed, 38 insertions(+), 1 deletion(-) > > diff --git a/block/quorum.c b/block/quorum.c > index 197cdca..c7a5d79 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, &acb->qcrs[i].qiov, nb_se= ctors, > + quorum_aio_cb, &acb->qcrs[i]); I know Kevin told you to, but using the child's own QIOV here means=20 quorum_aio_readv() won't work after this patch but only after patch 6.=20 Just pointing it out, I don't like it, but Kevin told you to, so: Reviewed-by: Max Reitz > + } > + > + 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