From patchwork Wed Jan 17 11:25:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 862222 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="eQ/Rz4ek"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zM4Xz1yZjz9rxj for ; Wed, 17 Jan 2018 22:26:27 +1100 (AEDT) Received: from localhost ([::1]:56672 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eblrN-0000Zg-8f for incoming@patchwork.ozlabs.org; Wed, 17 Jan 2018 06:26:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48521) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eblqW-0000Vw-Ap for qemu-devel@nongnu.org; Wed, 17 Jan 2018 06:25:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eblqS-0003un-5i for qemu-devel@nongnu.org; Wed, 17 Jan 2018 06:25:32 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:41400) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eblqR-0003ta-Um; Wed, 17 Jan 2018 06:25:28 -0500 Received: by mail-wm0-x242.google.com with SMTP id f71so14473771wmf.0; Wed, 17 Jan 2018 03:25:27 -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=Snjw5yFk4LpodPvJ+6351EJ2NOr6+utSqeinpdpt5X8=; b=eQ/Rz4ekyHngdDiwY7HtJtFtLOAj7b2R90PtEKivz1939HYF2hVxZLTdM8e8vmjXdS 6W+eDLgCXnCEu/08aIaMuy2sx+wrtOuo2ESOqKJaoGanMCuXhiiZsYayD1JF4+wor50Z JiUPvRgi1ZcCd2w21oajSbSJwdWfXRKHFmD17aFg4ajIohWaZKkx+6l5Uq5qBsgeozf3 f6b84nqpSID2BjkIZBEf+i4cA0/aSyFjZLdgnmSDk53s/LQ44DKkPlqVgWMFicxmF4Lf 7uhcBBq9KR5SSetP9W2ZWSLJfOqS1c5vzp6iPeHfF101WV5I8OBWguzCTVeF2VBwsESG DvhA== 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=Snjw5yFk4LpodPvJ+6351EJ2NOr6+utSqeinpdpt5X8=; b=Vpba427Xx46+7UjxTZBYeKPBhcSGS+cx9auJlVOaehhi0IHxH/KOlsaWNRc47mGpRo 7MrIQuvSDBxLkg+TVnGodZ0x8+qP2nMZpOnAMO7qjCwpJ93TPjP4ivpF/KwT8XZTx9LX 6Ky/qA0NBIgm2cSRpltsrrXRKPE45JxhZGxs/9yU+auYAyqgn2R1Um80kvMMVIkxflbP cNtBBZisU0V86nn2j7PdWPk43WjUYfwunoL32FI+li9lABui5EcFSe+3qyam0e7SbLxM qNoMLO9ZSXQwmvCwZnVu3pFWCB6piDQ0eEc9BCGXR5JouLgO8CyZQhDwivATwO/620dv XixQ== X-Gm-Message-State: AKwxytdivFgo/EoQ3Vo4OryHWJbKJcyY90rOX1PjwxHNdwo/Xu94SMds eIVG+HgcwI1A3eAY8MLspCGJdUTq X-Google-Smtp-Source: ACJfBotRQe7YYnpwKwGDv08JywLPAZlecMtfPI9+d4h3NVdZ7UVaF7kVkPUrYKKlCBbApqIINBPgpQ== X-Received: by 10.28.127.132 with SMTP id a126mr1797012wmd.37.1516188326589; Wed, 17 Jan 2018 03:25:26 -0800 (PST) Received: from 640k.lan (dynamic-adsl-78-12-229-84.clienti.tiscali.it. [78.12.229.84]) by smtp.gmail.com with ESMTPSA id w11sm2548965wrg.42.2018.01.17.03.25.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jan 2018 03:25:25 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 17 Jan 2018 12:25:08 +0100 Message-Id: <1516188312-29612-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1516188312-29612-1-git-send-email-pbonzini@redhat.com> References: <1516188312-29612-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PATCH 3/7] 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, mreitz@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 --- block/qcow2.c | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index fec065b..7c11516 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1087,8 +1087,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; @@ -1467,8 +1468,6 @@ static int qcow2_do_open(BlockDriverState *bs, QDict *options, int flags, } } - /* Initialise locks */ - qemu_co_mutex_init(&s->lock); bs->supported_zero_flags = BDRV_REQ_MAY_UNMAP; /* Repair image if dirty */ @@ -1514,16 +1513,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)