From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M4ZH3-0006Uo-Ip for qemu-devel@nongnu.org; Thu, 14 May 2009 07:38:53 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M4ZGy-0006Te-J1 for qemu-devel@nongnu.org; Thu, 14 May 2009 07:38:52 -0400 Received: from [199.232.76.173] (port=37089 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M4ZGy-0006TY-5u for qemu-devel@nongnu.org; Thu, 14 May 2009 07:38:48 -0400 Received: from mx2.redhat.com ([66.187.237.31]:47141) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M4ZGx-00076f-NX for qemu-devel@nongnu.org; Thu, 14 May 2009 07:38:48 -0400 Subject: Re: [Qemu-devel] [STABLE][PATCH 1/4] Use vectored aiocb storage to store vector translation state From: Mark McLoughlin In-Reply-To: <1242298581-30587-2-git-send-email-markmc@redhat.com> References: <1240265600-9469-1-git-send-email-ryanh@us.ibm.com> <1242298581-30587-1-git-send-email-markmc@redhat.com> <1242298581-30587-2-git-send-email-markmc@redhat.com> Content-Type: text/plain Date: Thu, 14 May 2009 12:38:42 +0100 Message-Id: <1242301122.17366.22.camel@blaa> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Reply-To: Mark McLoughlin List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org, Avi Kivity On Thu, 2009-05-14 at 11:56 +0100, Mark McLoughlin wrote: > From: Avi Kivity > > Now that we have a dedicated acb pool for vector translation acbs, we can > store the vector translation state in the acbs instead of in an external > structure. > > Signed-off-by: Avi Kivity Signed-off-by: Mark McLoughlin > --- > block.c | 29 ++++++++++++++--------------- > 1 files changed, 14 insertions(+), 15 deletions(-) > > diff --git a/block.c b/block.c > index b12318f..689ea37 100644 > --- a/block.c > +++ b/block.c > @@ -1332,31 +1332,32 @@ char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn) > /**************************************************************/ > /* async I/Os */ > > -typedef struct VectorTranslationState { > +typedef struct VectorTranslationAIOCB { > + BlockDriverAIOCB common; > QEMUIOVector *iov; > uint8_t *bounce; > int is_write; > BlockDriverAIOCB *aiocb; > - BlockDriverAIOCB *this_aiocb; > -} VectorTranslationState; > +} VectorTranslationAIOCB; > > -static void bdrv_aio_cancel_vector(BlockDriverAIOCB *acb) > +static void bdrv_aio_cancel_vector(BlockDriverAIOCB *_acb) > { > - VectorTranslationState *s = acb->opaque; > + VectorTranslationAIOCB *acb > + = container_of(_acb, VectorTranslationAIOCB, common); > > - bdrv_aio_cancel(s->aiocb); > + bdrv_aio_cancel(acb->aiocb); > } > > static void bdrv_aio_rw_vector_cb(void *opaque, int ret) > { > - VectorTranslationState *s = opaque; > + VectorTranslationAIOCB *s = (VectorTranslationAIOCB *)opaque; > > if (!s->is_write) { > qemu_iovec_from_buffer(s->iov, s->bounce, s->iov->size); > } > qemu_vfree(s->bounce); > - s->this_aiocb->cb(s->this_aiocb->opaque, ret); > - qemu_aio_release(s->this_aiocb); > + s->common.cb(s->common.opaque, ret); > + qemu_aio_release(s); > } > > static BlockDriverAIOCB *bdrv_aio_rw_vector(BlockDriverState *bs, > @@ -1368,11 +1369,9 @@ static BlockDriverAIOCB *bdrv_aio_rw_vector(BlockDriverState *bs, > int is_write) > > { > - VectorTranslationState *s = qemu_mallocz(sizeof(*s)); > - BlockDriverAIOCB *aiocb = qemu_aio_get_pool(&vectored_aio_pool, bs, > - cb, opaque); > + VectorTranslationAIOCB *s = qemu_aio_get_pool(&vectored_aio_pool, bs, > + cb, opaque); > > - s->this_aiocb = aiocb; > s->iov = iov; > s->bounce = qemu_memalign(512, nb_sectors * 512); > s->is_write = is_write; > @@ -1384,7 +1383,7 @@ static BlockDriverAIOCB *bdrv_aio_rw_vector(BlockDriverState *bs, > s->aiocb = bdrv_aio_read(bs, sector_num, s->bounce, nb_sectors, > bdrv_aio_rw_vector_cb, s); > } > - return aiocb; > + return &s->common; > } > > BlockDriverAIOCB *bdrv_aio_readv(BlockDriverState *bs, int64_t sector_num, > @@ -1560,7 +1559,7 @@ static int bdrv_write_em(BlockDriverState *bs, int64_t sector_num, > > void bdrv_init(void) > { > - aio_pool_init(&vectored_aio_pool, sizeof(BlockDriverAIOCB), > + aio_pool_init(&vectored_aio_pool, sizeof(VectorTranslationAIOCB), > bdrv_aio_cancel_vector); > > bdrv_register(&bdrv_raw);