From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34490) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZNIB-0002XB-ET for qemu-devel@nongnu.org; Wed, 01 Oct 2014 13:02:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZNI5-0001cM-1y for qemu-devel@nongnu.org; Wed, 01 Oct 2014 13:02:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14840) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZNI4-0001by-RM for qemu-devel@nongnu.org; Wed, 01 Oct 2014 13:02:12 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s91H2CdF000915 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 1 Oct 2014 13:02:12 -0400 From: Stefan Hajnoczi Date: Wed, 1 Oct 2014 18:01:51 +0100 Message-Id: <1412182919-9550-4-git-send-email-stefanha@redhat.com> In-Reply-To: <1412182919-9550-1-git-send-email-stefanha@redhat.com> References: <1412182919-9550-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 03/11] blockdev: acquire AioContext in blockdev_mark_auto_del() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , Fam Zheng , Stefan Hajnoczi , Max Reitz When an emulated storage controller is unrealized it will call blockdev_mark_auto_del(). This will cancel any running block job (and that eventually releases its reference to the BDS so it can be freed). Since the block job may be executing in another AioContext we must acquire/release to ensure thread safety. Signed-off-by: Stefan Hajnoczi --- blockdev.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/blockdev.c b/blockdev.c index 270425d..5e38f34 100644 --- a/blockdev.c +++ b/blockdev.c @@ -89,14 +89,21 @@ static const int if_max_devs[IF_COUNT] = { void blockdev_mark_auto_del(BlockDriverState *bs) { DriveInfo *dinfo = drive_get_by_blockdev(bs); + AioContext *aio_context; if (dinfo && !dinfo->enable_auto_del) { return; } + aio_context = bdrv_get_aio_context(bs); + aio_context_acquire(aio_context); + if (bs->job) { block_job_cancel(bs->job); } + + aio_context_release(aio_context); + if (dinfo) { dinfo->auto_del = 1; } -- 1.9.3