From patchwork Wed Mar 16 14:16:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8601041 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 28C2CC0553 for ; Wed, 16 Mar 2016 14:21:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 61E2E202F2 for ; Wed, 16 Mar 2016 14:21:25 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B305B202AE for ; Wed, 16 Mar 2016 14:21:24 +0000 (UTC) Received: from localhost ([::1]:56632 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agCKC-0001x0-1B for patchwork-qemu-devel@patchwork.kernel.org; Wed, 16 Mar 2016 10:21:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42032) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agCG8-0002tu-Mc for qemu-devel@nongnu.org; Wed, 16 Mar 2016 10:17:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1agCG5-0005wK-I6 for qemu-devel@nongnu.org; Wed, 16 Mar 2016 10:17:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37441) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agCG5-0005w4-Ck for qemu-devel@nongnu.org; Wed, 16 Mar 2016 10:17:09 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 1FA7646266 for ; Wed, 16 Mar 2016 14:17:09 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-112-54.ams2.redhat.com [10.36.112.54]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2GEGwbw001673; Wed, 16 Mar 2016 10:17:07 -0400 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 16 Mar 2016 15:16:46 +0100 Message-Id: <1458137817-15383-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1458137817-15383-1-git-send-email-pbonzini@redhat.com> References: <1458137817-15383-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: famz@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v2 05/16] mirror: use bottom half to re-enter coroutine X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Paolo Bonzini Reviewed-by: Fam Zheng --- v1->v2: use aio_bh_new() [Fam] block/mirror.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index 9635fa8..2c7874d 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -72,6 +72,7 @@ typedef struct MirrorOp { QEMUIOVector qiov; int64_t sector_num; int nb_sectors; + QEMUBH *co_enter_bh; } MirrorOp; static BlockErrorAction mirror_error_action(MirrorBlockJob *s, bool read, @@ -87,6 +88,18 @@ static BlockErrorAction mirror_error_action(MirrorBlockJob *s, bool read, } } +static void mirror_bh_cb(void *opaque) +{ + MirrorOp *op = opaque; + MirrorBlockJob *s = op->s; + + qemu_bh_delete(op->co_enter_bh); + g_free(op); + if (s->waiting_for_io) { + qemu_coroutine_enter(s->common.co, NULL); + } +} + static void mirror_iteration_done(MirrorOp *op, int ret) { MirrorBlockJob *s = op->s; @@ -117,11 +130,14 @@ static void mirror_iteration_done(MirrorOp *op, int ret) } qemu_iovec_destroy(&op->qiov); - g_free(op); - if (s->waiting_for_io) { - qemu_coroutine_enter(s->common.co, NULL); - } + /* The I/O operation is not finished until the callback returns. + * If we call qemu_coroutine_enter here, there is the possibility + * of a deadlock when the coroutine calls bdrv_drained_begin. + */ + op->co_enter_bh = aio_bh_new(bdrv_get_aio_context(s->target), + mirror_bh_cb, op); + qemu_bh_schedule(op->co_enter_bh); } static void mirror_write_complete(void *opaque, int ret)