From nobody Tue Feb 10 04:15:42 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598972061; cv=none; d=zohomail.com; s=zohoarc; b=nAnCmDIfgfUeEdFRizjDBcjlrcM7h01O3SpX+E4FOttu1Fl5Yr2aKVGwIAAgYyOL5rl5StdlVygUrh6kViOk6NTYzmv4wlosUtNp+58WaGnvkLGGAUxHJsm/P3x59X7F5jG3cKyTecKXrq3swjETejQ9q5iMeE94lN9aVf2N8Hs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598972061; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8FkKw+2u0pVIhoGiV+5RN7L0YEQ2P4sgGJ0cjzoBelg=; b=W1c+nNYIeIH1hRowjHrWMopRuDe8kSAGkSA7U1sUYZR0Bm12CusUk5rVlu7hPsX8Eg1gKeZ0s73CtxBbF5El94f3LNjQ82vF925RXF+ZitJWckUmT1FT8ETxsfsl2NfXiTk9x5pk5w0q739sKsftXALs1BivbpyInwKGGv8Lppk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598972061726754.9391288653554; Tue, 1 Sep 2020 07:54:21 -0700 (PDT) Received: from localhost ([::1]:48052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD7fw-0003xv-8x for importer@patchew.org; Tue, 01 Sep 2020 10:54:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD7NR-00009d-9d for qemu-devel@nongnu.org; Tue, 01 Sep 2020 10:35:13 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:51061 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD7NO-00079U-Db for qemu-devel@nongnu.org; Tue, 01 Sep 2020 10:35:12 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-33-6gx6tWFcOxS7gzTdyX-6pg-1; Tue, 01 Sep 2020 10:35:05 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 76A3A64082; Tue, 1 Sep 2020 14:35:04 +0000 (UTC) Received: from localhost (ovpn-113-83.ams2.redhat.com [10.36.113.83]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 138207EB94; Tue, 1 Sep 2020 14:35:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598970909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8FkKw+2u0pVIhoGiV+5RN7L0YEQ2P4sgGJ0cjzoBelg=; b=Y6fI4j1IbaOtKZCXmoCKADrJTXVmt1s5IQAzXIP7zYbhVTbcxDuq6ISRI66FKnxLGegwLC qqDsCLyGbAL5reVTZWpgTEKj0PjuiQfIG6FlUiIbMkSsZzHLldfoCqykBsZxjJX5QgAYAg HrQaJXNhqjt6+gxOtDyps9af3f/ptVg= X-MC-Unique: 6gx6tWFcOxS7gzTdyX-6pg-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH v8 16/43] block: Flush all children in generic code Date: Tue, 1 Sep 2020 16:33:57 +0200 Message-Id: <20200901143424.884735-17-mreitz@redhat.com> In-Reply-To: <20200901143424.884735-1-mreitz@redhat.com> References: <20200901143424.884735-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=mreitz@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/01 00:57:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Andrey Shinkevich , Vladimir Sementsov-Ogievskiy , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" If the driver does not support .bdrv_co_flush() so bdrv_co_flush() itself has to flush the children of the given node, it should not flush just bs->file->bs, but in fact all children that might have been written to (judging from the permissions taken on them). This is a bug fix for qcow2 images with an external data file, as they so far did not flush that data_file node. In any case, the BLKDBG_EVENT() should be emitted on the primary child, because that is where a blkdebug node would be if there is any. Suggested-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Max Reitz Reviewed-by: Andrey Shinkevich Reviewed-by: Kevin Wolf --- block/io.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/block/io.c b/block/io.c index 6f9402117e..8d777cd0ec 100644 --- a/block/io.c +++ b/block/io.c @@ -2771,6 +2771,8 @@ static int coroutine_fn bdrv_flush_co_entry(void *opa= que) =20 int coroutine_fn bdrv_co_flush(BlockDriverState *bs) { + BdrvChild *primary_child =3D bdrv_primary_child(bs); + BdrvChild *child; int current_gen; int ret =3D 0; =20 @@ -2800,7 +2802,7 @@ int coroutine_fn bdrv_co_flush(BlockDriverState *bs) } =20 /* Write back cached data to the OS even with cache=3Dunsafe */ - BLKDBG_EVENT(bs->file, BLKDBG_FLUSH_TO_OS); + BLKDBG_EVENT(primary_child, BLKDBG_FLUSH_TO_OS); if (bs->drv->bdrv_co_flush_to_os) { ret =3D bs->drv->bdrv_co_flush_to_os(bs); if (ret < 0) { @@ -2810,15 +2812,15 @@ int coroutine_fn bdrv_co_flush(BlockDriverState *bs) =20 /* But don't actually force it to the disk with cache=3Dunsafe */ if (bs->open_flags & BDRV_O_NO_FLUSH) { - goto flush_parent; + goto flush_children; } =20 /* Check if we really need to flush anything */ if (bs->flushed_gen =3D=3D current_gen) { - goto flush_parent; + goto flush_children; } =20 - BLKDBG_EVENT(bs->file, BLKDBG_FLUSH_TO_DISK); + BLKDBG_EVENT(primary_child, BLKDBG_FLUSH_TO_DISK); if (!bs->drv) { /* bs->drv->bdrv_co_flush() might have ejected the BDS * (even in case of apparent success) */ @@ -2862,8 +2864,17 @@ int coroutine_fn bdrv_co_flush(BlockDriverState *bs) /* Now flush the underlying protocol. It will also have BDRV_O_NO_FLU= SH * in the case of cache=3Dunsafe, so there are no useless flushes. */ -flush_parent: - ret =3D bs->file ? bdrv_co_flush(bs->file->bs) : 0; +flush_children: + ret =3D 0; + QLIST_FOREACH(child, &bs->children, next) { + if (child->perm & (BLK_PERM_WRITE | BLK_PERM_WRITE_UNCHANGED)) { + int this_child_ret =3D bdrv_co_flush(child->bs); + if (!ret) { + ret =3D this_child_ret; + } + } + } + out: /* Notify any pending flushes that we have completed */ if (ret =3D=3D 0) { --=20 2.26.2