From patchwork Thu Mar 1 16:36:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 10251941 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 87B3560365 for ; Thu, 1 Mar 2018 16:38:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 77D7B28573 for ; Thu, 1 Mar 2018 16:38:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6C9C3285B6; Thu, 1 Mar 2018 16:38:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 581002859E for ; Thu, 1 Mar 2018 16:38:22 +0000 (UTC) Received: from localhost ([::1]:57991 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erRDp-00081o-H5 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 01 Mar 2018 11:38:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45962) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erRCI-0006ig-M7 for qemu-devel@nongnu.org; Thu, 01 Mar 2018 11:36:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erRCG-0002vB-Lz for qemu-devel@nongnu.org; Thu, 01 Mar 2018 11:36:46 -0500 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:42637) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1erRCG-0002uE-2H; Thu, 01 Mar 2018 11:36:44 -0500 Received: by mail-wr0-x241.google.com with SMTP id k9so7212540wre.9; Thu, 01 Mar 2018 08:36:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=3RfQlj/dzTi8O+iknT/js0OrjwXiC3gbbtwbMp7sTs8=; b=QwkqIGFhLlLa8UW+hUy1SHFnIY7awKzr4x7CqHjBKnDeZyzMCa0EJRG5VTuQxl9QoY QjHN6NxWGMX8fTriR0QlmLzxmSnWpTJeyNxCcZGo/ROo1/tS2tceFP8JkvRIRLL3oIQc h2yoHlPKetTsFIRXFKGYqTfVp/xSxN768CS2QBAEsqxcBpt8qVLocgZR0KfJ/Ym3gu5O YZIrqQbAEkQT3uNaXOqnsvAPNmrke610S+yoOHgKkxPFEB9lDLzOzQOEfG2PZ0sfBErX k3t/PgVngn7+s0/8D5gAoE1T1DRmeBFMNmzw/vh4Y2+u9mzMZBQaM8W5RP1w3FDWUIGL 5zRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=3RfQlj/dzTi8O+iknT/js0OrjwXiC3gbbtwbMp7sTs8=; b=frw37FoFzqYOd8xX6QwnoUzXh7oVaAxQ9p0KyVKnkcu8TWeVFvzFw39MbPKj0gRCKg v0TnPEq08Hur2PDW/OaNl7eiBIJkheEGb9mbeOc1SBfNXlQY8MkLp+LsdKkOfqTE0H2w BbrKDYVn+U67amaJXDarocOWrsSmB+eU6cfrn+Qdn2cS8wNLBFyYxLLkOteR7O02NizC FFJRGjC/sHvsd+Obsrx7c99I0AfwA3eZ52Rryv0PywvlTB7s9peJKz0oMbguA0BqZoJd QOI7YxIahzGasNWUHCkuL0m1dvKVVOpp5zj1sx+I+ErF2nfMORkjQpCaGMq5EeOn5bs9 fYMQ== X-Gm-Message-State: APf1xPBrbsRkMjT8kmZbW0BEJkVlBj0+tc0MCL5GBBeUTT9KcRvSmOzz L4YOJ9v+OaKakUJfl7e0EjEgNjhY X-Google-Smtp-Source: AG47ELsvTtV3IYE5h4QlbhOKF0NRzAj4NhmdoecN+glRB9QCDTXCvcy2PwAbBF1gE5WU4zTzbN4zqg== X-Received: by 10.223.168.111 with SMTP id l102mr2530807wrc.84.1519922202562; Thu, 01 Mar 2018 08:36:42 -0800 (PST) Received: from donizetti.lan (94-36-191-219.adsl-ull.clienti.tiscali.it. [94.36.191.219]) by smtp.gmail.com with ESMTPSA id a14sm4187152wrf.22.2018.03.01.08.36.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Mar 2018 08:36:41 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 1 Mar 2018 17:36:16 +0100 Message-Id: <20180301163619.21072-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180301163619.21072-1-pbonzini@redhat.com> References: <20180301163619.21072-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PATCH 5/8] qcow2: make qcow2_do_open a coroutine_fn X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP It is called from qcow2_invalidate_cache in coroutine context (incoming migration runs in a coroutine), so it's cleaner if metadata is always loaded from a coroutine. Signed-off-by: Paolo Bonzini Message-Id: <1516279431-30424-4-git-send-email-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- block/qcow2.c | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 4c216ecd63..b5410c5b00 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1097,8 +1097,9 @@ static int qcow2_update_options(BlockDriverState *bs, QDict *options, return ret; } -static int qcow2_do_open(BlockDriverState *bs, QDict *options, int flags, - Error **errp) +/* Called with s->lock held. */ +static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options, + int flags, Error **errp) { BDRVQcow2State *s = bs->opaque; unsigned int len, i; @@ -1477,8 +1478,6 @@ static int qcow2_do_open(BlockDriverState *bs, QDict *options, int flags, } } - /* Initialise locks */ - qemu_co_mutex_init(&s->lock); bs->supported_zero_flags = header.version >= 3 ? BDRV_REQ_MAY_UNMAP : 0; /* Repair image if dirty */ @@ -1524,16 +1523,53 @@ static int qcow2_do_open(BlockDriverState *bs, QDict *options, int flags, return ret; } +typedef struct QCow2OpenCo { + BlockDriverState *bs; + QDict *options; + int flags; + Error **errp; + int ret; +} QCow2OpenCo; + +static void coroutine_fn qcow2_open_entry(void *opaque) +{ + QCow2OpenCo *qoc = opaque; + BDRVQcow2State *s = qoc->bs->opaque; + + qemu_co_mutex_lock(&s->lock); + qoc->ret = qcow2_do_open(qoc->bs, qoc->options, qoc->flags, qoc->errp); + qemu_co_mutex_unlock(&s->lock); +} + static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) { + BDRVQcow2State *s = bs->opaque; + QCow2OpenCo qoc = { + .bs = bs, + .options = options, + .flags = flags, + .errp = errp, + .ret = -EINPROGRESS + }; + bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file, false, errp); if (!bs->file) { return -EINVAL; } - return qcow2_do_open(bs, options, flags, errp); + /* Initialise locks */ + qemu_co_mutex_init(&s->lock); + + if (qemu_in_coroutine()) { + /* From bdrv_co_create. */ + qcow2_open_entry(&qoc); + } else { + qemu_coroutine_enter(qemu_coroutine_create(qcow2_open_entry, &qoc)); + BDRV_POLL_WHILE(bs, qoc.ret == -EINPROGRESS); + } + return qoc.ret; } static void qcow2_refresh_limits(BlockDriverState *bs, Error **errp)