From nobody Fri May 17 12:14:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1604147821; cv=pass; d=zohomail.com; s=zohoarc; b=YnMqcKevmqL9wEPEnjZKtoiA75ExuDqFjH17x9oEJIXkl9/5IldShYu9gbtAeXpvOK2w+wlIaZjdk7s2X9DIBVhxfc8wzPlGUO9mTulPY6ps2uC5Qa3+XYxcnFSwhkoH36+p43ZXhDGVCDVgT58yS9QBy/TuJqP1u5rIq5hGoV8= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604147821; 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=lcJJOEbqu4yHarlC96vOfIQCdQa3o4nLmn3cJ1c2fTY=; b=SsaLkfOpJsspYmYzGxzwBEWzSX1mbIlXZiolcEwLI2pMNauVmQvn2VNXx9C296JAjO5aNBnmC1cKhzLJT3dp5ToJB633uoE72KqCvb5b6LJ+3Q7kGm0IIttPVoLAJXNcNhrPj+wqXX6MfxNkIqpM41Q2mEwPTVKHQqEH7ATKr2g= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine 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 1604147821402293.77834928999596; Sat, 31 Oct 2020 05:37:01 -0700 (PDT) Received: from localhost ([::1]:60068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kYq7v-0002ov-Rz for importer@patchew.org; Sat, 31 Oct 2020 08:36:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kYq6P-0001SL-Gj; Sat, 31 Oct 2020 08:35:25 -0400 Received: from mail-eopbgr130103.outbound.protection.outlook.com ([40.107.13.103]:47840 helo=EUR01-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kYq6N-0000Bb-OI; Sat, 31 Oct 2020 08:35:25 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6152.eurprd08.prod.outlook.com (2603:10a6:20b:298::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18; Sat, 31 Oct 2020 12:35:15 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243%9]) with mapi id 15.20.3499.029; Sat, 31 Oct 2020 12:35:15 +0000 Received: from kvm.sw.ru (185.215.60.113) by AM0PR10CA0056.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18 via Frontend Transport; Sat, 31 Oct 2020 12:35:14 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LHzfJPuNDMaEmfaKgGX80xRYKUFsFdqTW7KJHVCgTQiPvZu55suhwGqHiMgzQEedFwixKSHkCjaVkY8igRwf5aTW/YmR8oiWT8dy5pP9oWbVSpSmHvghGoRIGqeX7Pjj5cs0kuBG6N+rmxKc7Ik/MZexrcXWdeqw8MZajcWF6CKORwAj7KtEn8MVYrctF86WvhmR+42SXdFi47LootlucKQ6gngqC52hQcrAZZt8kcboh7VWFbv9LSi2cmy56ih8CNDCwp0fi3nuVRArcAjtTTuq9yqIUX/vZ/mxEcjE6jdLzxKAgtDez64zvRj7MwOa6ZTtlneY7+D15d8V7rjX+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lcJJOEbqu4yHarlC96vOfIQCdQa3o4nLmn3cJ1c2fTY=; b=dQ882wHHHzS/Npp9HUv7vNzCgQQkubHXaz4PXeJAOr3DzkUe5PRJIJWrkutkeSpXUvBjx1ng5ElJPA/0c8wKASBVrUJRU0J8avJ07YV6ad4/Odw1K79qYPX22vMDhui62sGe4reX4hevNos/rp95u8n4mUHQTGhkkUXwIEzpE/MouSLcLn42H7b3U4CuwMyFQi8CA/Vr86FxY4BgS3YdG06trVT7XC+sxhHDGDddhlUZyaCer4lfiI3JuwtznJfSeuVEzu+ryQn+7PKwWrKCtWKqmXPfQdBQIfd942NFVXA5HEYwNOLejMyCJDoA1C8qJhMEiW7x6docZ82Gr2X3Ww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lcJJOEbqu4yHarlC96vOfIQCdQa3o4nLmn3cJ1c2fTY=; b=C6SF8XhE8GNdEHspx4x4DxDw4LAjTtFKDMXIb1tjPx5PTLtfAE68H+nix1qvdA8rss55Q0K/fZUfL7RrPp4nhqYg8MSbCsE+nB7LopOF3sYDk+CiPtlnmzQiNwYqceIK1U+EDB3ZuKbGUIP+3JXN6zVwTyJtVvnhaICDKICbikc= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, mreitz@redhat.com, kwolf@redhat.com, den@openvz.org, vsementsov@virtuozzo.com Subject: [PATCH 1/2] block: make bdrv_drop_intermediate() less wrong Date: Sat, 31 Oct 2020 15:35:01 +0300 Message-Id: <20201031123502.4558-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201031123502.4558-1-vsementsov@virtuozzo.com> References: <20201031123502.4558-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.113] X-ClientProxiedBy: AM0PR10CA0056.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::36) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a77de99d-f9de-4d31-af54-08d87d996ae0 X-MS-TrafficTypeDiagnostic: AS8PR08MB6152: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9Jw16qklhiy4cNzwADjeug9YE0F4IOP2bhh/Wvhq7sg2fcklbsvXEZr4Q/HJlF+w2nl3qXMe5mPWqmm37LF7G9Gp93QMOnEWKm040H/ssYyp87Xk2yYRrL+aHoBDBzNBhPimVVsAGKtOX6wRZ+F99P+13CTBsmkSE6G6RzIaEwa396PQ++0nJ9iuzb+Yzle8w5RqnbQStrO+YSwsFlmofLUW5uD5Iu4ebNx3MBLUsJe+znoZch8K/lXrA2RpGxPDrCUdsUpZTqGe9y9vuu6tgU7tAPAVc3NpAlzD3kCAk8wurqp80JvqcHQ1EZVjcITpadG6jPcefKO70rdtkj4RtA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(346002)(136003)(39840400004)(366004)(376002)(6506007)(8936002)(5660300002)(8676002)(36756003)(1076003)(107886003)(83380400001)(86362001)(66556008)(6666004)(2616005)(66476007)(956004)(2906002)(16526019)(52116002)(316002)(6916009)(4326008)(66946007)(6486002)(186003)(478600001)(26005)(6512007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: MULczuqhi8gF8bhQ3Q2bkaM4IiOJtMtnACue9sBw/K1uvCzis0pCfmHV/Yzyib0SsYagrWPrm99DlUrr6z5ltKyeRWKaE1On6JKxU5ENp3BVr/yo/uJPklahgfxnAz94yzLO2qukhXYc/FATQc/gQHAXTWaLzHD2Zdib5a7UN9Ct1QskRFrPqLEOz/VM4OYr/7liy451lIGIM2QnQenonRydQ7cXngQuUmm/pMDTg/QlzuAb+bXFZC43uxOL7NHqZ7ihCrbp3IMjZOMeJRmL03LY9pCrBX+CYfVqPsESYqEPJUutWXmVyKxxM3n9X3w8CCb9ho0YiGrQMn94ffQytkrN3spH/V8UWVYFTgbl3sFLIER/ocz6PSQKqJOTTAFFKCKNj973QzBPBl4pPE9OoQGsrv9XJ373/gekUnLL6JTpk3BXs2W/5dMYSbPgfB/MElGyIAc1JtJNLRpLa7Ui7F5259GNJOeqZozHLxsgh9qPuDhvv5DoxIFfOTp6zLWqWRb9Vx42RsKGCFVspJvexdwpR4xHnkPbpGNiSc9qbPolEZPs17gWRLkjxTjGoTZ+dZrcTHSCNbzGIzasV7p/bX6tV/Grsft7B1T4HKPIvfBYV+/QndGymXITBDjA+cm66szRWISL4NC0DMxiR2SqVA== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: a77de99d-f9de-4d31-af54-08d87d996ae0 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Oct 2020 12:35:15.1594 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nUTV9OJj3Ey0FSaGOiTTh4+QzB9LJGLb1AmSAM58+p0xgpo/mTHDxF/g1E37hEvDYeAybgF6VV+CPOO8qJCAIK1bA4WVrAlrhz0tPhjj5g8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6152 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=40.107.13.103; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-HE1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/31 08:35:15 X-ACL-Warn: Detected OS = Windows NT kernel [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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" First, permission update loop tries to do iterations transactionally, but the whole update is not transactional: nobody roll-back successful loop iterations when some iteration fails. Second, in the iteration we have nested permission update: c->klass->update_filename may point to bdrv_child_cb_update_filename() which calls bdrv_backing_update_filename(), which may do node reopen to RW. Permission update system is not prepared to nested updates, at least it has intermediate permission-update state stored in BdrvChild structures: has_backup_perm, backup_perm and backup_shared_perm. So, let's first do bdrv_replace_node() (which is more transactional than open-coded update in bdrv_drop_intermediate()) and then call update_filename() in separate. We still do not rollback changes in case of update_filename() failure but it's not much worse than pre-patch behavior. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/block.c b/block.c index 9538af4884..bd9f4e534b 100644 --- a/block.c +++ b/block.c @@ -4958,36 +4958,30 @@ int bdrv_drop_intermediate(BlockDriverState *top, B= lockDriverState *base, backing_file_str =3D base->filename; } =20 - QLIST_FOREACH_SAFE(c, &top->parents, next_parent, next) { - /* Check whether we are allowed to switch c from top to base */ - GSList *ignore_children =3D g_slist_prepend(NULL, c); - ret =3D bdrv_check_update_perm(base, NULL, c->perm, c->shared_perm, - ignore_children, NULL, &local_err); - g_slist_free(ignore_children); - if (ret < 0) { - error_report_err(local_err); - goto exit; - } + bdrv_replace_node(top, base, &local_err); + if (local_err) { + error_report_err(local_err); + goto exit; + } =20 - /* If so, update the backing file path in the image file */ + QLIST_FOREACH_SAFE(c, &base->parents, next_parent, next) { if (c->klass->update_filename) { ret =3D c->klass->update_filename(c, base, backing_file_str, &local_err); if (ret < 0) { - bdrv_abort_perm_update(base); + /* + * TODO: Actually, we want to rollback all previous iterat= ions + * of this loop, and (which is almost impossible) previous + * bdrv_replace_node()... + * + * Note, that c->klass->update_filename may lead to permis= sion + * update, so it's a bad idea to call it inside permission + * update transaction of bdrv_replace_node. + */ error_report_err(local_err); goto exit; } } - - /* - * Do the actual switch in the in-memory graph. - * Completes bdrv_check_update_perm() transaction internally. - * c->frozen is false, we have checked that above. - */ - bdrv_ref(base); - bdrv_replace_child(c, base); - bdrv_unref(top); } =20 if (update_inherits_from) { --=20 2.21.3 From nobody Fri May 17 12:14:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1604147826; cv=pass; d=zohomail.com; s=zohoarc; b=M5pd50/71q8zpIfl1TK2UxUulR+ixrLxQG93RiJCF+LYYso6XWtSplAz0S/QNPbKyubT/Ncf3+Kw4xy8et/HpZI22O+PNZnskc4a/tEFzY7nAnbhN65ONVF/g6UlwlAkLFo+jDOaYPWf6ySAtSjcJxT66tcp9qAosgOExbKPGuo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604147826; 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=lhvF4ktTDTUOtmlo8SyG3lrw7VrpYcNC4hi6c834yOE=; b=Vl2NmWIgJaRgh/hCE2ZYolgbElOGbmTKp+zzqKQUJ6qlTVaYcnK5m22nI8EvJICb8aTpwKVwP65w1CQt8tBVxHYDhySckbohnNags5sUGgvEbx+AyZPycpIHf7vp0gyAtLbGfmQRpbXsq0+YTTAkQTzBMxg0xNEdgX5cQTp5wNk= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine 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 1604147826468446.1510290146085; Sat, 31 Oct 2020 05:37:06 -0700 (PDT) Received: from localhost ([::1]:60494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kYq80-0002zd-Tq for importer@patchew.org; Sat, 31 Oct 2020 08:37:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kYq6S-0001Wg-3F; Sat, 31 Oct 2020 08:35:28 -0400 Received: from mail-eopbgr130103.outbound.protection.outlook.com ([40.107.13.103]:47840 helo=EUR01-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kYq6Q-0000Bb-5J; Sat, 31 Oct 2020 08:35:27 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6152.eurprd08.prod.outlook.com (2603:10a6:20b:298::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18; Sat, 31 Oct 2020 12:35:16 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243%9]) with mapi id 15.20.3499.029; Sat, 31 Oct 2020 12:35:16 +0000 Received: from kvm.sw.ru (185.215.60.113) by AM0PR10CA0056.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18 via Frontend Transport; Sat, 31 Oct 2020 12:35:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HEd8QfkyHVYIHAwEP732p2E0wbVhJIOVS5gv8pAB4HNc6zfSqRju+lYp0YgF9WQBmsuv0CnPy9LYs23jGE4xvWePZkr2p88aH6s0mhEWzS5/AfmTMMXtsZy2BriUzkjaJIq26hghQGkfsp3aB3VwvuLSal8TkVNU/OG4JBUo3xdgB7cv4g34q9I3zHrSONhVLhWd3FFZ0pz5cAl0Fl8lxpKH5msuq5U22+t+NdNyDTusojifzJIwhimX1VgCqjWQnJlUbbDBtTZBrBE+HmVqPily1kMFwTdSRC0A2m2UURqnttaNlYBAiZGag8+0r397yWUSzHEZcuCxyn62Jn0jPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lhvF4ktTDTUOtmlo8SyG3lrw7VrpYcNC4hi6c834yOE=; b=GTLxZlZWa/Rd8wOuFhRmjX44WJwfFx/CgU/AZjMQzWub56PH3nVvY0cjwIi3iEUfDA+uCvsKWdLlNh8CCkD5ziByE0vE+7/7eKMJmqNl/oVXHGtJaKPKgaeASVdUXoa3cmpxMxI7zuybDHIyJ3QTuqGQIT9LGRU+qyvu+hA7zky14n4o66c09tej4mAZ4gwb2ybkNnww7o9z4OGtTZeaNQCc4kwUejR4/ZJgpbGxx+bx0s94HjX3oaoK8grNvhmbplplxl83Vq6w1NEmzHuZ7KD8II03OFfgwqBPLXXzEWVXWeGjCPhtwh3BAhmu9K6pYytqKNT5ohaEjpDbSnAtUg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lhvF4ktTDTUOtmlo8SyG3lrw7VrpYcNC4hi6c834yOE=; b=NAbSsHqWdACG6IRUkD4QX6/qfp+OmlIB31Vc2vUFCe2I2NiAuyf62lH3ABBrj26S+YFnA5f1xh5gulERcwLCDcPZCuG8voHRCQ/pmoZwLuayYTjDP3MH6g2cNAewnaazH/qEU3b7LKPdZreKRhH7NwFAT26ScFpk+NQnW4TrATs= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, mreitz@redhat.com, kwolf@redhat.com, den@openvz.org, vsementsov@virtuozzo.com Subject: [PATCH 2/2] block: assert that permission commit sets same permissions Date: Sat, 31 Oct 2020 15:35:02 +0300 Message-Id: <20201031123502.4558-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201031123502.4558-1-vsementsov@virtuozzo.com> References: <20201031123502.4558-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.113] X-ClientProxiedBy: AM0PR10CA0056.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::36) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 45ce8f92-67f2-4d3d-9359-08d87d996b56 X-MS-TrafficTypeDiagnostic: AS8PR08MB6152: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:165; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o9e23219Bv/ps0U5Nr7SdFavGtxwiIjS3QMxLIu7b4EyG5pBJ0rD4xJiYXV+ZCDjy5+8C98ll8naFrRecXXswRa8C32cgj7tsSoew2flqiee5jewRQjOHa5ihIPnev3vh5nrdM9GLQGYdQbGJNzVmuwKSn708qPFbtw6/+C35lrLnBg1UehW9ACJAtEQtv2PUH4SyzkXRNIZjAOlS687pokXRpYdktKcl0c/1CBu/aPJ5CcDT56gbMZ+pjmVD3I2XC4EDnMUrdlcVyvucsSey0kqALLzpNZss//59IZSJawEgxJw06CdCAK8igeD/YS1FtR4/kT0E4Z3ux5cksF85Q== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(346002)(136003)(39840400004)(366004)(376002)(6506007)(8936002)(5660300002)(8676002)(36756003)(1076003)(107886003)(83380400001)(86362001)(66556008)(6666004)(2616005)(66476007)(956004)(2906002)(16526019)(52116002)(316002)(6916009)(4326008)(66946007)(6486002)(186003)(478600001)(26005)(6512007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: PutXVSF5uQHAYZGLmbyzam04rYHbW9bDB4NY5+XU/QnQPT4r4VkkphupcHVv4OQ3EVNXWBatLfdlFkLQ6ZyUVYkLo0H5o0DBytKdWbzsWTb9i+58FvgxbMkH+U7x9U+StNFx2S470WjXOT3F97tZMf4pbIGqt3Gx+4rRD2RHhGtrQNnnPYyupgcBCFN38vBWCyYKDhZ69R4IAQbn4ku2F2h/+HqEEi3X0VzVqMCrmhOY3pQ2BGD6zwS1a2cE3eQLQFJhUSdeDUbT922aPLdI75Nw6N+Ama5p9mwR5Chb8NjfqAC0Jld8ZV4y47JBfn9VRZxYlzyNS4onWlvvX9BNoyU/17eHgNKHtjzgcmj7GBfO0DYSAHSpYjJlA4hjq6+ge6+rn6M/lbE03Xv+ad2z6Igl7lS+bkWIEB8v8+d6/Vn/F7RcRmKd862dGZvpEcVV1P42cPafrP2j+S9HFly+e/kZDzWxKltHuK+MVZdJZ733Y0WbW89Wa5024bJI531NMJCIgpCkt4cYmcN6AVXmrhslR64PDRveyfgmq/eYrVspbTKJysHbYngQgGuupjFTrYwFJjflbVusnzoo3hdes9I6ZGs1baeK7IfZ0WHvPcIqmd1akI57pEHSfsgM4A32DsGRKmwLHBPxb5gZsl6Tsw== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 45ce8f92-67f2-4d3d-9359-08d87d996b56 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Oct 2020 12:35:15.8673 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: apvdGogttYgr6OplgQ4qebWJpDX/TOjUiDNRWoSdcXV/6/3t2A5KKDmOMVFkMhbmRDAArWv4kO0VYC6NMuEDrFQioYnpq+fufpCcdhR+2ts= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6152 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=40.107.13.103; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-HE1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/31 08:35:15 X-ACL-Warn: Detected OS = Windows NT kernel [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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" On permission update commit we must set same permissions as on _check_. Let's add assertions. Next step may be to drop permission parameters from _set_. Note that prior to previous commit, fixing bdrv_drop_intermediate(), new assertion in bdrv_child_set_perm() crashes on iotests 30 and 40. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index bd9f4e534b..0f4da59a6c 100644 --- a/block.c +++ b/block.c @@ -2105,9 +2105,10 @@ static void bdrv_abort_perm_update(BlockDriverState = *bs) } } =20 -static void bdrv_set_perm(BlockDriverState *bs, uint64_t cumulative_perms, - uint64_t cumulative_shared_perms) +static void bdrv_set_perm(BlockDriverState *bs, uint64_t _cumulative_perms, + uint64_t _cumulative_shared_perms) { + uint64_t cumulative_perms, cumulative_shared_perms; BlockDriver *drv =3D bs->drv; BdrvChild *c; =20 @@ -2115,6 +2116,10 @@ static void bdrv_set_perm(BlockDriverState *bs, uint= 64_t cumulative_perms, return; } =20 + bdrv_get_cumulative_perm(bs, &cumulative_perms, &cumulative_shared_per= ms); + assert(_cumulative_perms =3D=3D cumulative_perms); + assert(_cumulative_shared_perms =3D=3D cumulative_shared_perms); + /* Update this node */ if (drv->bdrv_set_perm) { drv->bdrv_set_perm(bs, cumulative_perms, cumulative_shared_perms); @@ -2301,6 +2306,8 @@ static void bdrv_child_set_perm(BdrvChild *c, uint64_= t perm, uint64_t shared) =20 c->has_backup_perm =3D false; =20 + assert(c->perm =3D=3D perm); + assert(c->shared_perm =3D=3D shared); c->perm =3D perm; c->shared_perm =3D shared; =20 --=20 2.21.3