From patchwork Tue Feb 16 17:56:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8330291 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 16B3B9F6E7 for ; Tue, 16 Feb 2016 18:01:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 79ED120266 for ; Tue, 16 Feb 2016 18:01:16 +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 C434E20295 for ; Tue, 16 Feb 2016 18:01:15 +0000 (UTC) Received: from localhost ([::1]:48972 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVjw3-0003US-7G for patchwork-qemu-devel@patchwork.kernel.org; Tue, 16 Feb 2016 13:01:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVjrq-0004P1-0L for qemu-devel@nongnu.org; Tue, 16 Feb 2016 12:56:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aVjro-0002to-Tl for qemu-devel@nongnu.org; Tue, 16 Feb 2016 12:56:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54862) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVjrn-0002t0-0P; Tue, 16 Feb 2016 12:56:51 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 91CBDC0AC92F; Tue, 16 Feb 2016 17:56:50 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-112-51.ams2.redhat.com [10.36.112.51]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1GHuSWY022072; Tue, 16 Feb 2016 12:56:49 -0500 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 16 Feb 2016 18:56:23 +0100 Message-Id: <1455645388-32401-12-git-send-email-pbonzini@redhat.com> In-Reply-To: <1455645388-32401-1-git-send-email-pbonzini@redhat.com> References: <1455645388-32401-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-block@nongnu.org, stefanha@redhat.com Subject: [Qemu-devel] [PATCH 11/16] sheepdog: disable dataplane 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 sheepdog has some calls to aio_poll that are hard to eliminate, for example in sd_sheepdog_goto's call to do_req. Since I don't have means to test sheepdog well, disable dataplane altogether for this driver. Signed-off-by: Paolo Bonzini --- block/sheepdog.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/block/sheepdog.c b/block/sheepdog.c index a0098c1..e2ab946 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -357,6 +357,7 @@ struct SheepdogAIOCB { typedef struct BDRVSheepdogState { BlockDriverState *bs; AioContext *aio_context; + Error *blocker; SheepdogInode inode; @@ -1416,6 +1417,21 @@ static int sd_open(BlockDriverState *bs, QDict *options, int flags, Error *local_err = NULL; const char *filename; + /* sd_snapshot_goto does blocking operations that call aio_poll + * (through do_req). This can cause races with iothread: + * + * main thread I/O thread + * ----------------- ------------------ + * while(srco.finished == false) + * aio_poll(..., true) + * srco.finished = true + * aio_poll(..., true) + * + * Now aio_poll potentially blocks forever. + */ + error_setg(&s->blocker, "sheepdog does not support iothreads"); + bdrv_op_block(bs, BLOCK_OP_TYPE_DATAPLANE, s->blocker); + s->bs = bs; s->aio_context = bdrv_get_aio_context(bs); @@ -1950,6 +1966,9 @@ static void sd_close(BlockDriverState *bs) false, NULL, NULL, NULL); closesocket(s->fd); g_free(s->host_spec); + + bdrv_op_unblock(bs, BLOCK_OP_TYPE_DATAPLANE, s->blocker); + error_free(s->blocker); } static int64_t sd_getlength(BlockDriverState *bs)