From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59163) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wifye-0001bk-CZ for qemu-devel@nongnu.org; Fri, 09 May 2014 04:16:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WifyZ-0000m6-CG for qemu-devel@nongnu.org; Fri, 09 May 2014 04:16:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23575) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WifyZ-0000m0-4D for qemu-devel@nongnu.org; Fri, 09 May 2014 04:16:15 -0400 Message-ID: <536C8EC7.4090004@redhat.com> Date: Fri, 09 May 2014 10:16:07 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1399559698-31900-1-git-send-email-stefanha@redhat.com> <1399559698-31900-19-git-send-email-stefanha@redhat.com> <536C1B80.6090202@inktank.com> In-Reply-To: <536C1B80.6090202@inktank.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 18/25] rbd: use BlockDriverState's AioContext List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Josh Durgin , Stefan Hajnoczi , qemu-devel@nongnu.org Cc: Kevin Wolf , Christian Borntraeger Il 09/05/2014 02:04, Josh Durgin ha scritto: > On 05/08/2014 07:34 AM, Stefan Hajnoczi wrote: >> Drop the assumption that we're using the main AioContext. Convert >> qemu_bh_new() to aio_bh_new() and qemu_aio_wait() to aio_poll(). >> >> The .bdrv_detach_aio_context() and .bdrv_attach_aio_context() interfaces >> are not needed since no fd handlers, timers, or BHs stay registered when >> requests have been drained. >> >> Cc: Josh Durgin >> Signed-off-by: Stefan Hajnoczi >> --- >> block/rbd.c | 5 +++-- >> 1 file changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/block/rbd.c b/block/rbd.c >> index dbc79f4..41f7bdc 100644 >> --- a/block/rbd.c >> +++ b/block/rbd.c >> @@ -548,7 +548,7 @@ static void qemu_rbd_aio_cancel(BlockDriverAIOCB >> *blockacb) >> acb->cancelled = 1; >> >> while (acb->status == -EINPROGRESS) { >> - qemu_aio_wait(); >> + aio_poll(bdrv_get_aio_context(acb->common.bs), true); >> } >> >> qemu_aio_release(acb); >> @@ -581,7 +581,8 @@ static void rbd_finish_aiocb(rbd_completion_t c, >> RADOSCB *rcb) >> rcb->ret = rbd_aio_get_return_value(c); >> rbd_aio_release(c); >> >> - acb->bh = qemu_bh_new(rbd_finish_bh, rcb); >> + acb->bh = aio_bh_new(bdrv_get_aio_context(acb->common.bs), >> + rbd_finish_bh, rcb); >> qemu_bh_schedule(acb->bh); >> } > > Assuming bdrv_get_aio_context() continues to be safe to call from a > non-qemu thread: > > Reviewed-by: Josh Durgin bdrv_get_aio_context()/bdrv_set_aio_context() are safe if called from the AioContext's own iothread. This is the case here, in fact aio_bh_new has the same requirement (qemu_bh_schedule instead does not). Paolo