From nobody Sat Nov 15 04:18:22 2025 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=1593100733; cv=none; d=zohomail.com; s=zohoarc; b=Z8TsOrvb7LDEQ2ce2nDFxvZ/2q7UOyE+bNZTb5OruMAyxodWqLnTpDLM3yB+tVf0VQXsuMXOdMQM1q5Y6q+S4bo0XS0pfYRyBKN2/dDlf+IDBHIUVCojWoAqDAmT+i3/kMNAUe0XWimEI5Eg/RNRsllmQUealt62Ufbiyud2JDE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593100733; 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=eXRCbxWHdhFdTk379StqcMbCRmexSIRMFz/qo0e8ItE=; b=djpaaZM5JE+g5xkFpo11egPBbgPAoJGND/YtBL7ZbPz+jdlhwVENx5SI1/nSHi3qaeGqmjqvRGOoSxn6VuwT7ve1ckx1MJunDMldWHsyBbMkxkCW/t78ZoTnH4dXLK52qrWM0tGCijlngvoqz9jHLzIeN9toX2OhWCWrWX3tYkQ= 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 1593100733450896.5864649967925; Thu, 25 Jun 2020 08:58:53 -0700 (PDT) Received: from localhost ([::1]:36556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joUH6-0001oT-9O for importer@patchew.org; Thu, 25 Jun 2020 11:58:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joTjF-0006m4-Ut for qemu-devel@nongnu.org; Thu, 25 Jun 2020 11:23:53 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:59030 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 1joTjA-0001Qx-Ia for qemu-devel@nongnu.org; Thu, 25 Jun 2020 11:23:53 -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-443-xFmB7LR-MeaySYcHJMWDHg-1; Thu, 25 Jun 2020 11:23:46 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F2E1B800C60; Thu, 25 Jun 2020 15:23:44 +0000 (UTC) Received: from localhost (ovpn-113-182.ams2.redhat.com [10.36.113.182]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 96A721A913; Thu, 25 Jun 2020 15:23:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593098627; 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=eXRCbxWHdhFdTk379StqcMbCRmexSIRMFz/qo0e8ItE=; b=AZndKzlKHmsaRcDHBBAGrwo3ZGVrkf0WUjcAMB61v5IlOC24GVkx3ZcJKUlAtkeCF8Scvw rl2URCAoLLOG1r/7FF3LNpaH2ic9YZFiRD5HejU+eicwV++vtTEl8ADFeYZBjxlskmcLwv tuTme2Bz7VcZUSwjjkA2zjlYFB918ls= X-MC-Unique: xFmB7LR-MeaySYcHJMWDHg-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH v7 39/47] blockdev: Fix active commit choice Date: Thu, 25 Jun 2020 17:22:07 +0200 Message-Id: <20200625152215.941773-40-mreitz@redhat.com> In-Reply-To: <20200625152215.941773-1-mreitz@redhat.com> References: <20200625152215.941773-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 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/06/25 01:47:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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 , 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" We have to perform an active commit whenever the top node has a parent that has taken the WRITE permission on it. Signed-off-by: Max Reitz Reviewed-by: Vladimir Sementsov-Ogievskiy --- blockdev.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/blockdev.c b/blockdev.c index 402f1d1df1..237fffbe53 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2589,6 +2589,7 @@ void qmp_block_commit(bool has_job_id, const char *jo= b_id, const char *device, AioContext *aio_context; Error *local_err =3D NULL; int job_flags =3D JOB_DEFAULT; + uint64_t top_perm, top_shared; =20 if (!has_speed) { speed =3D 0; @@ -2704,14 +2705,31 @@ void qmp_block_commit(bool has_job_id, const char *= job_id, const char *device, goto out; } =20 - if (top_bs =3D=3D bs) { + /* + * Active commit is required if and only if someone has taken a + * WRITE permission on the top node. Historically, we have always + * used active commit for top nodes, so continue that practice. + * (Active commit is never really wrong.) + */ + bdrv_get_cumulative_perm(top_bs, &top_perm, &top_shared); + if (top_perm & BLK_PERM_WRITE || + bdrv_skip_filters(top_bs) =3D=3D bdrv_skip_filters(bs)) + { if (has_backing_file) { error_setg(errp, "'backing-file' specified," " but 'top' is the active layer"); goto out; } - commit_active_start(has_job_id ? job_id : NULL, bs, base_bs, - job_flags, speed, on_error, + if (!has_job_id) { + /* + * Emulate here what block_job_create() does, because it + * is possible that @bs !=3D @top_bs (the block job should + * be named after @bs, even if @top_bs is the actual + * source) + */ + job_id =3D bdrv_get_device_name(bs); + } + commit_active_start(job_id, top_bs, base_bs, job_flags, speed, on_= error, filter_node_name, NULL, NULL, false, &local_er= r); } else { BlockDriverState *overlay_bs =3D bdrv_find_overlay(bs, top_bs); --=20 2.26.2