From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:59813)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1bFAS6-0003Cg-EN
	for qemu-devel@nongnu.org; Mon, 20 Jun 2016 21:26:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1bFAS0-00055y-FE
	for qemu-devel@nongnu.org; Mon, 20 Jun 2016 21:26:05 -0400
Received: from mx1.redhat.com ([209.132.183.28]:48844)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1bFAS0-00055t-9e
	for qemu-devel@nongnu.org; Mon, 20 Jun 2016 21:26:00 -0400
Received: from int-mx13.intmail.prod.int.phx2.redhat.com
	(int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 82DF37F6B0
	for <qemu-devel@nongnu.org>; Tue, 21 Jun 2016 01:25:59 +0000 (UTC)
Date: Tue, 21 Jun 2016 09:25:51 +0800
From: Fam Zheng <famz@redhat.com>
Message-ID: <20160621012551.GA22440@ad.usersys.redhat.com>
References: <1466451417-27988-1-git-send-email-stefanha@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1466451417-27988-1-git-send-email-stefanha@redhat.com>
Subject: Re: [Qemu-devel] [PATCH] dma-helpers: dma_blk_io() cancel support
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stefan Hajnoczi <stefanha@redhat.com>
Cc: qemu-devel@nongnu.org, Kevin Wolf <kwolf@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, John Snow <jsnow@redhat.com>

On Mon, 06/20 20:36, Stefan Hajnoczi wrote:
> Attempting to cancel a dma_blk_io() request causes an abort(3):
> 
>   void bdrv_aio_cancel(BlockAIOCB *acb)
>   {
>       ...
>       while (acb->refcnt > 1) {
>           if (acb->aiocb_info->get_aio_context) {
>               aio_poll(acb->aiocb_info->get_aio_context(acb), true);
>           } else if (acb->bs) {
>               aio_poll(bdrv_get_aio_context(acb->bs), true);
>           } else {
>               abort();
>           }
>       }
>       ...
>   }
> 
> This happens because DMAAIOCB->bs is NULL and
> dma_aiocb_info.get_aio_context() is also NULL.
> 
> This patch trivially implements dma_aiocb_info.get_aio_context() by
> fetching the DMAAIOCB->ctx field.
> 
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  dma-helpers.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/dma-helpers.c b/dma-helpers.c
> index b521d84..9defc10 100644
> --- a/dma-helpers.c
> +++ b/dma-helpers.c
> @@ -185,10 +185,17 @@ static void dma_aio_cancel(BlockAIOCB *acb)
>      }
>  }
>  
> +static AioContext *dma_get_aio_context(BlockAIOCB *acb)
> +{
> +    DMAAIOCB *dbs = container_of(acb, DMAAIOCB, common);
> +
> +    return dbs->ctx;
> +}
>  
>  static const AIOCBInfo dma_aiocb_info = {
>      .aiocb_size         = sizeof(DMAAIOCB),
>      .cancel_async       = dma_aio_cancel,
> +    .get_aio_context    = dma_get_aio_context,
>  };
>  
>  BlockAIOCB *dma_blk_io(AioContext *ctx,
> -- 
> 2.5.5
> 
> 

Reviewed-by: Fam Zheng <famz@redhat.com>