From nobody Fri Mar 29 08:09:31 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=1615992004; cv=pass; d=zohomail.com; s=zohoarc; b=k2vFQjvgefqCMSU5tf4NvoW7YfKtFtjR4sVIHg5WyX+v/VTiOFF56v2Y4OQ8OKPicuLf/cvfnL3ZdHgyYdVUROyetImFNXyA4+hARRCXGlFEEYAcGQiUdHlVVYlLwkm4Ve8J1m9BwNJxTs1n0jZYsp6bWkIEuZhCw9FnJ9iRJRU= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615992004; 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=EfJ3cnscqs+XhUUTMe4Dmzlbcn438B4Sz5qs6ALVado=; b=gnrf+Wldy7okL7bPVBfJnvvWJ4voaSwJdIoV+IfzgWfAl8AO2lhw3FyHT5WHtjsSzV1r3/HJWEW0FKRyLxA7ZB+9k40Hqhlb3vsx1b5Nepi8gKWImOTZOMjlh61pZbh4vRdfat0qw8uSm3pj2hDK5a69rhGkhSzw8EWe5yQPKBk= 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 1615992004449513.8619088840528; Wed, 17 Mar 2021 07:40:04 -0700 (PDT) Received: from localhost ([::1]:40986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXL9-0007Ik-5l for importer@patchew.org; Wed, 17 Mar 2021 10:40:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXHP-00044T-En; Wed, 17 Mar 2021 10:36:11 -0400 Received: from mail-eopbgr10137.outbound.protection.outlook.com ([40.107.1.137]:61154 helo=EUR02-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 1lMXHM-0006nM-6i; Wed, 17 Mar 2021 10:36:10 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1650.eurprd08.prod.outlook.com (2603:10a6:203:2f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:03 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:03 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:02 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MTPFBEBoUZPLxV+Q/eb92EkhB/n5R6R6mwD7lcby4LZGxvm5aZ6bVO+Aw4QUEQfbAUPt6gVR+QOVsJ1ZfEb4uQQy1NgXiPdCi2Eu4eGgI+njiTQ8SVnl8xuPQ4+hMESfoW4ppNih+IjIUoFnKB2LKNcsrKJIJxCuugHjm3G6RU95YMC+huW5xF6xdkgHjQbOZz7SpAN29gGJ9jE166Cr0fhNJB8Q0wclQe272OG9aKHQKQqUiPevVtjVkpPaDi6GXXnfBWMcPHbXSMNcz1RhAhQpaIFYe0Z2v3Zh0cAvZbDOeg6dszR18YGC97vNyyz2yjOwdS4wR4TcXCDzh8KHDw== 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=EfJ3cnscqs+XhUUTMe4Dmzlbcn438B4Sz5qs6ALVado=; b=VcPPKmtqEMXGhfbxXRNsCBh9ioOSIIzzpVZK2mkZHN2g8eXmtzGd45c0JhHUQ6GRluLcSJNuAHu9YwNLj8bdT/a9qJqW/V0P/G6z7Cp4ZhtD/Cv/ShjKmQlQA8dQAHNX4nmAASzNEWb5jvEbPIzPUWKe3hPHkU+EGsR7HQgXY5Fv1Wmk5uVzgqjtwv9g1MjqGSWg5o6Se/SAyJfc/5vxND8wAlzD/uLjytjXYEBw1QqtvNM1Zwjo/dT+O+Q4x8NgOgfWbrGxzMbn3FjfU2vZRRgyrNAal/b5z9q30jJvfYh7kg73Z5eNj5QuFvIwx9CGAAXu594Ny0J8jyqeWnpqAg== 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=EfJ3cnscqs+XhUUTMe4Dmzlbcn438B4Sz5qs6ALVado=; b=UprwZvxuAGE2KOe0VjX93ttNC5W4Yz5DP9YIdNaZ/BpQMqx5SSU+0Ye92Ma5CfDYfWK/rIczlyQJTLyYlaU9MgMJnBbRym6cwlZ9ASoE+SVQGP48EVDQN+NxU3eXIVbPjnYxNts0S/EXuJ8zSRZ949iJrT9FbUgWWC6KQiuZsug= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 01/36] tests/test-bdrv-graph-mod: add test_parallel_exclusive_write Date: Wed, 17 Mar 2021 17:34:54 +0300 Message-Id: <20210317143529.615584-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: a7d0f47b-df02-4162-b14c-08d8e951fddb X-MS-TrafficTypeDiagnostic: AM5PR0801MB1650: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: k8a+d8Bl6M827HPGOGlzrBcIZqFUr6lFLRxkXUSc+EKdbbx2f4nkLZMEodIi8iiA+EWYGwWg69fp5DLoy5jBF1+VlzhTd+izjOGIseoo8jmQWza6O6swyv9N89yLKBH0WYrr+y+G087PbLCOgGX2pkeTLmjvd3DXgCCAh/2nApHR9UTIRgx9PNcENGMbRId3U2pcnC//gQJizD9H3BPR6wdAnxABFIKPO1K8knWc9tyKUNdio1xD7U58u9DdtjH2h8gx1JZFJDINFR5dQ/gf9X2Er7YUTvk44N/t0HBfXUdIeLRb0nS/dHgCUG8yANhK29E7kn1pVlkEIKmfgQx1UWmUfdgmSxsZFJ1eVilANmsw29CTMwac3E/dgNGA38NGDrM1JyiWC5OcrhTdRCoRXnp7ASXcd7e38dtIaFzhQfxj5P3v2aABCBNVNl+ng+N7yiRJydkXXTciFnOsrcJeyw4S7FhrlsUw2XihXTkuzsWQ2DXnFclQh2JPwZxOqnxf9r/VehRocgiDSS2ccpWagY65EOqpljX6wI2NhLao7lN9Yfg6xRIKjnxjW18N7mPmckHAzDaLlVCp0jx5DNdb3VIrp77/yj3GWZX1FEIJL4giuQ5/CLPxlXPl4VZ18v3UKPjkl8hLRk/zYcPzx5THWg== 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)(346002)(39840400004)(396003)(376002)(136003)(366004)(316002)(1076003)(956004)(6916009)(6506007)(69590400012)(66556008)(66476007)(6512007)(26005)(4326008)(5660300002)(83380400001)(8676002)(52116002)(2616005)(66946007)(6486002)(6666004)(186003)(36756003)(16526019)(2906002)(86362001)(8936002)(478600001)(2004002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?bex8u00amsj81V4AqXKENZkofuQo4YL9Dg+hHzoSl60Aud2pGQStsLPx6OBk?= =?us-ascii?Q?AorNaMe9vcSixsHk1lLJmSRJ1tMuA70L85VwI3fiqI1o2H/4bc0TaMyvvwjk?= =?us-ascii?Q?QD2xkzfYe2BaxmX0m3bGkENhksWD8NPmnCJv6NSDkSpUU4L1KBybfEN+l2vO?= =?us-ascii?Q?Pys2lk6deab+v+uGKehI2OPs2iuYdhYjJijOdCYuxTD1NzQ5nMjpAKYLwKrU?= =?us-ascii?Q?47PQ/gZZtkHCldR9MQTOZR+kJDoGtDci8r72PKW5YVPjJARdKcV6Ub4mPeiG?= =?us-ascii?Q?zAtftrdNyBphYq/4UMQaK9xQ4tiaW+3Oo05KrIQv4ikrK38oP4EkbCSgWnCr?= =?us-ascii?Q?/XI4jn7mGyfGtdc86cxkM0CzVd0L5VKj43FB8hSMBWvqDxkkuMIOOavEkXxx?= =?us-ascii?Q?0J4iO80QspdDECyYkYXXDVDsN3Yuza+HVIS+DMu+GKwop5E9E1U+Rqcr6Tr7?= =?us-ascii?Q?aU0CXY57yWCy4F/DQ3Glgx/LWvNkbcE8i1ctkIt9yCzck8TkHF4eWGfmrMYJ?= =?us-ascii?Q?j348qkLgOEL8Yvy//cABaW/C0ytOmP6BueKF/CgemFcJA1qDmGO4pOfkTECs?= =?us-ascii?Q?IlPQiXo5ZHGR6Mv0KJ1PwnuhtAf+aLW321wOffC2aDcYnau/qb38XZ3QGYFT?= =?us-ascii?Q?oGFo/e50iDIJhe/iW8VbYz7zBkLSiBFuWwvFP9oRH5wc85Z7Xg7F532HbV1U?= =?us-ascii?Q?DQxImOdlxiiSj405mocfqhrFo+66QrNiJFT59Ji3IOvkOmzW4oxvVsLaZR4g?= =?us-ascii?Q?9G504FmtiftK6u5tXccFsiO8L1+8GXeJazPgAWDSVDWLKENO09DEolhqigaR?= =?us-ascii?Q?f6Jq4yXnNJj4Ha5YAMe4633uVL1QdihBErecrXJDNhhCCRTLF1LgxNExNjoB?= =?us-ascii?Q?FSrexlLbM7snxt6G32G6vt+jO7+a2mw/t3n3SS+r8Rqk6wnxkqlfU60CYQbo?= =?us-ascii?Q?Xd7zC4XXaL9Fq4qa9ECW4amJp0chIRpsC/y03kjGFeQlPkVpq3hbLnC7h/Al?= =?us-ascii?Q?l7PnNqFQUef/8tWWSX0D+GvSjLFjrwaIN5gDwf20FANkMfbCSU5iHZZbtkRE?= =?us-ascii?Q?UrLNwaOHODLxw/OcNbyNsguahsdrT6N7RhmhZTKXGe04EWsILgrIGn9vWPRt?= =?us-ascii?Q?/ke2RmtcIUHCLXyZ0lPk6kx97m28F3/A4PWcdOXa1eCAQwtWNVOU07GKQLfS?= =?us-ascii?Q?a99/25j7Laeg30ga7F/L2DRkllpQ/rduavxBuzcPIIiuFMsc9Je7Q9PSGICZ?= =?us-ascii?Q?o/JIMEELkAonT3NGt/AHO87XFw0ZRl42l7oHckDVuXNJ++G/e/GW4ee1l0IX?= =?us-ascii?Q?oq66ES79sohYcQ4btlbHpxdB?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7d0f47b-df02-4162-b14c-08d8e951fddb X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:03.7354 (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: jWokP7kEFBtctDYpDxA07sSSjG8o+qs5zXueu+20IrOwY2FqUxvQIZBQm5Me0eKjpvRJCm9T+8ilF3ceQJwYBiaF3LV7zqpt37CcNmnmOac= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1650 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.1.137; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-HE1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" Add the test that shows that concept of ignore_children is incomplete. Actually, when we want to update something, ignoring permission of some existing BdrvChild, we should ignore also the propagated effect of this child to the other children. But that's not done. Better approach (update permissions on already updated graph) will be implemented later. Now the test fails, so it's added with -d argument to not break make check. Test fails with "Conflicts with use by fl1 as 'backing', which does not allow 'write' on b= ase" because when updating permissions we can ignore original top->fl1 BdrvChild. But we don't ignore exclusive write permission in fl1->base BdrvChild, which is propagated. Correct thing to do is make graph change first and then do permission update from the top node. To run test do ./test-bdrv-graph-mod -d -p /bdrv-graph-mod/parallel-exclusive-write from /tests. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- tests/unit/test-bdrv-graph-mod.c | 70 +++++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/tests/unit/test-bdrv-graph-mod.c b/tests/unit/test-bdrv-graph-= mod.c index c4f7d16039..4e4e83674a 100644 --- a/tests/unit/test-bdrv-graph-mod.c +++ b/tests/unit/test-bdrv-graph-mod.c @@ -1,7 +1,7 @@ /* * Block node graph modifications tests * - * Copyright (c) 2019 Virtuozzo International GmbH. All rights reserved. + * Copyright (c) 2019-2021 Virtuozzo International GmbH. All rights reserv= ed. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -44,6 +44,21 @@ static BlockDriver bdrv_no_perm =3D { .bdrv_child_perm =3D no_perm_default_perms, }; =20 +static void exclusive_write_perms(BlockDriverState *bs, BdrvChild *c, + BdrvChildRole role, + BlockReopenQueue *reopen_queue, + uint64_t perm, uint64_t shared, + uint64_t *nperm, uint64_t *nshared) +{ + *nperm =3D BLK_PERM_WRITE; + *nshared =3D BLK_PERM_ALL & ~BLK_PERM_WRITE; +} + +static BlockDriver bdrv_exclusive_writer =3D { + .format_name =3D "exclusive-writer", + .bdrv_child_perm =3D exclusive_write_perms, +}; + static BlockDriverState *no_perm_node(const char *name) { return bdrv_new_open_driver(&bdrv_no_perm, name, BDRV_O_RDWR, &error_a= bort); @@ -55,6 +70,12 @@ static BlockDriverState *pass_through_node(const char *n= ame) BDRV_O_RDWR, &error_abort); } =20 +static BlockDriverState *exclusive_writer_node(const char *name) +{ + return bdrv_new_open_driver(&bdrv_exclusive_writer, name, + BDRV_O_RDWR, &error_abort); +} + /* * test_update_perm_tree * @@ -185,8 +206,50 @@ static void test_should_update_child(void) blk_unref(root); } =20 +/* + * test_parallel_exclusive_write + * + * Check that when we replace node, old permissions of the node being remo= ved + * doesn't break the replacement. + */ +static void test_parallel_exclusive_write(void) +{ + BlockDriverState *top =3D exclusive_writer_node("top"); + BlockDriverState *base =3D no_perm_node("base"); + BlockDriverState *fl1 =3D pass_through_node("fl1"); + BlockDriverState *fl2 =3D pass_through_node("fl2"); + + /* + * bdrv_attach_child() eats child bs reference, so we need two @base + * references for two filters: + */ + bdrv_ref(base); + + bdrv_attach_child(top, fl1, "backing", &child_of_bds, BDRV_CHILD_DATA, + &error_abort); + bdrv_attach_child(fl1, base, "backing", &child_of_bds, BDRV_CHILD_FILT= ERED, + &error_abort); + bdrv_attach_child(fl2, base, "backing", &child_of_bds, BDRV_CHILD_FILT= ERED, + &error_abort); + + bdrv_replace_node(fl1, fl2, &error_abort); + + bdrv_unref(fl2); /* second reference was created by bdrv_replace_node(= ) */ + bdrv_unref(top); +} + int main(int argc, char *argv[]) { + int i; + bool debug =3D false; + + for (i =3D 1; i < argc; i++) { + if (!strcmp(argv[i], "-d")) { + debug =3D true; + break; + } + } + bdrv_init(); qemu_init_main_loop(&error_abort); =20 @@ -196,5 +259,10 @@ int main(int argc, char *argv[]) g_test_add_func("/bdrv-graph-mod/should-update-child", test_should_update_child); =20 + if (debug) { + g_test_add_func("/bdrv-graph-mod/parallel-exclusive-write", + test_parallel_exclusive_write); + } + return g_test_run(); } --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615992198; cv=pass; d=zohomail.com; s=zohoarc; b=noCSgX/txlRYm2UhouMA8ZDsdB7445DmvJW81+6Q2FYP56ZwPWOA7LiRKNMrZjLdNOVj7C57ujPFrEpfKo9RxVkoLXS0awHvlYAhbwtYGeyRTYdI3mKasObOfExBj5462hh6CyzE2G7YRqWFY1vpNQ7K6CYasCwJBHv/aXtpAi0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615992198; 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=x5FpE3f1ydvQQrnt9yPGT3iOztTVJ6HG5Jt1oGDWGYE=; b=auyxduGnPCzlVw6osuy5mg2D+YDtSkzm5J1kYK2LLBzDK2WXJwfX6Er4c1CBge27JxN1P8JXoBfrSEDODsPkTszrIfoue/yetdqGpWGPpBDZSlL6tz33hEChzEC+spGCax77UZOtnDDeeu1zZdlcX9ROMJjpUBcNU8hhNxD1WUU= 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 1615992198956768.470156615957; Wed, 17 Mar 2021 07:43:18 -0700 (PDT) Received: from localhost ([::1]:50222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXOH-0002nM-Q4 for importer@patchew.org; Wed, 17 Mar 2021 10:43:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXHS-0004D5-H8; Wed, 17 Mar 2021 10:36:14 -0400 Received: from mail-eopbgr10137.outbound.protection.outlook.com ([40.107.1.137]:61154 helo=EUR02-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 1lMXHQ-0006nM-0t; Wed, 17 Mar 2021 10:36:14 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1650.eurprd08.prod.outlook.com (2603:10a6:203:2f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:05 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:05 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:04 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NPogMbUXmIMGcxkqK3uNtXYpRrFj9lDkzDpba6rh5RNm9feHw6bsDlIFuNeoQZLKK2FrXytAla26ENbpdM1Wo2Mf1V6ro78wVPj5DHx8h9K47J0UHm+//+ZQDhu+Sq34OBItMzex+IRrk/ZbbwzX2QeUzrz+VhNEKeaevVG2Jpo2qKWsBY987HgAKDcs+SRHjEugxkB7qHzmRTQQbSelv6I6dvWvqVb2bstC8EuQdsJkY0/r5j0gpQAd6rTjLSlpyBxOxenzeSycqTwWghXkMtcEhLtMvvJFiSS0XTVkwKj7dvyQ9tgDXQg5EGJxVWnyTlWj6C/jKTXu8aMKtlahPA== 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=x5FpE3f1ydvQQrnt9yPGT3iOztTVJ6HG5Jt1oGDWGYE=; b=l3sdk7vgFIB6Ia2DJi8XLTlqZFv8Rcm2ReRdFTyNU0qo0b8+UApPeLp367bgGBiFU2gWWmnIsroqNa4xAfDqHx2R+azkpufobb4cZf3ayJaG7ks7V/+o0ykh9uX2Dq9FEvFhjh5mbljvqEFoy2HrPMcARdvAlXwE35pkrBU/u7Cp+lnAaa0zRcyd+UkQkiNOqLeUmrNL7LaZ+s44GJqmQcBStl3dXkbhXuMBHl3DskSyHgpn8jLXBKFhRgHYEp7mDQf2IAjaIlw4FXvt/ZqedBrxxzDfCXAF+G6D+oqwZHbrRUzM2aL2KZUd+vMgQ9P1LBfbRaJZFJ52wwhwlJoseQ== 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=x5FpE3f1ydvQQrnt9yPGT3iOztTVJ6HG5Jt1oGDWGYE=; b=EYSRAJ5VzeWKOq+MogUiKApI9U9mQ6bcWbRXf7vn76pD9wDjh5Hn0Nno7Wkvhpi+B8h8syY5eOepxzhBlOHr5d6FULyoterInBmeGuX9dKmUAVgVBREobGXhoIH0b7FCTtmsNaVGIyZ/u1CRgRJjqjpNsCS40AQPwcVdRvzCwgs= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 02/36] tests/test-bdrv-graph-mod: add test_parallel_perm_update Date: Wed, 17 Mar 2021 17:34:55 +0300 Message-Id: <20210317143529.615584-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: 3c15e57c-8861-4e74-b5a6-08d8e951fefd X-MS-TrafficTypeDiagnostic: AM5PR0801MB1650: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: seVJnx+1rVTWHBzSkfkRfLSDdeHi9twqDYmKovm6Hrv29Rsi9L12Tii0aFy6l7/EOIYdx+ul5av7tH79JbWWmBLzXbmNFq+ugYuJaOpQxrFIthDPnKdw8JBwmEfJzGCbxT1ybYLOnax3WdHmYja4qwxi9oA9sg924M/uoeSWPQLgv9qHXpF5JmWep3TyRXHIkoGKegUBhjWKjsPHNoiO+/Abj+9iwuBQ9KdeswhbzhRf6iUA6qEx4kf7Eg3+fCm2hX7gdbDHyEfLyosMgE/KprPfuVc+Vm0g7VXFDV1qkC9dvPLoVbRyxAksY/wiLqltnD5zJ0R7MhvU3VV38v2tgUSRE+3GGFKCo8orHq4YD2mjR+X+6Kczc0orMXHFCuRbifwG1e/MgZw66b/wUGrXqsnJQTyLabegc668HXPdLwNvnnuqvlvclKoGJUjuKjjac5mMRUBp+C1slEUoDTLZkvX5nxIrmhWsqBeR+AX3vmPowrE723f0g+USFNJFIiBtdFq01jNStNcpFyCKpmmXVylbUp42glP4+RfpbLAZBHuDk7nsu+FSkz+dr3qLvC/x 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)(346002)(39840400004)(396003)(376002)(136003)(366004)(316002)(1076003)(956004)(6916009)(6506007)(66556008)(66476007)(6512007)(26005)(4326008)(5660300002)(83380400001)(8676002)(52116002)(2616005)(66946007)(6486002)(6666004)(186003)(36756003)(16526019)(2906002)(86362001)(8936002)(478600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?B?eUlEV1VHYVp5dFV5QzZSeHgySzFZKy9qNUxmaE1yczMveDcxdjFDR2VXR2pG?= =?utf-8?B?a3JFZElrdmduMUFuWUdaYWpIWjFlQUR3dnhhalRoK0lVa2lNNy9NN1lLOW9z?= =?utf-8?B?ODFnT0RqNXVGaGNRdTFSTXE4UDVVZmVEUlQzUm8wTzFwd3ZtVWpnMTJnL2Fl?= =?utf-8?B?TEp1ZzNDdkowVC94cHdzQ2N2ZDgzaFo5dzRBeVphSHB6MUg1d1ZJeXJmVUg4?= =?utf-8?B?cnJrdmYyeUxiOUkzV1JnZlpJVHAxZ0dHdUlvUGZxVWRZWVVtdU9YOHl2S0VY?= =?utf-8?B?VFZqbHNrRmptWmNDUFRPNys4alA2a0NrYm5iU2dBQ0NPUjdzalBQRThEZXZj?= =?utf-8?B?aThnaUxTQi9Dcnk1OVp4QVgwKzBxbHp3RDlRRXRGeDdtcVFZN29uVlQ0V2xx?= =?utf-8?B?WElMQVV6OEd6K09lUkY3Q3RveHFaTmdEUzJITmQyWmtvSFFZQ2dyb096cVhE?= =?utf-8?B?VFp6TW5vNVNIanVCWTh5QnhkTkxWZTlXUFpMT3lUdTYwczRGc3NSbEJZMHlh?= =?utf-8?B?YjdodGJVMzNOSDZ0bG9NWnQ2VHRwLzRkVUNiRFlFdWtSR2dWTUdxTjk3K0Fv?= =?utf-8?B?QnhoZi90VW02b0lqcmZGU2dRY2U0TnM5Y0IzSC9XU2dvd3puS0JhVEtISEFr?= =?utf-8?B?U1U1VXBJb2t1eUNZTnhOdEUyaHJNY0ZVNGNjc3liR0JNd2RkSzBzN2IxcWZy?= =?utf-8?B?aGlteXBkYTQ5blJpdVpJY2JBT282dFZmeERuMEZtRDA1a2xKTkE4dmZpWG5K?= =?utf-8?B?WXAxQWhYL0tpdnc1dnFCNi9YR3ZTVE4zUXZyZCs0YkEwdmM5eTQ1a3huVS9K?= =?utf-8?B?cUhMeUlIVEFkajhRNkwrM2VNUFRBMm10OWlHSW5pbkk4dld2ODBQc1l6a2tN?= =?utf-8?B?Q08rWVV4RFNKNWlUMzE4Mmdpb3djTHNJdzVONmxDenFpbExsMXhDaTNKRnpq?= =?utf-8?B?eFNmajhqOXkrRkl1b0lqd2RFRE9ZWjR6SlBLNHIycWZiZE9WNlhpM1NueHlZ?= =?utf-8?B?b0xsL1hXazRwZ3VtK0ZwaTBScjdTbU55N2tSZ0xSUUxsSEZ3TUQyOGYraEF2?= =?utf-8?B?bG9Wb3grZXkxakJWR21zSGtZWjBVbGVUYkVDU3VFVXo3MkJHSjRBemFnd3BJ?= =?utf-8?B?N1ExSnl4ZTkvV3NXMEl6RWFjWTZ0bWpiZWpkSHpYV2FCTXJzSi9lZWo4dmRZ?= =?utf-8?B?aFFLNHJQZnhHL3BVUm1KMFRrejMzdFdmaFN6SmNUbHFxaXhGTENOeFhxUUlS?= =?utf-8?B?UVN5N2t0VEEyMWoySkUrWnRFQjBGQjFQMDF6WDZmZ3BBM1BDWkc5NzB1djNJ?= =?utf-8?B?RlRhL2hxMVUvMGN4WHVHYk4zdmJIMlYrZlg0OWpXQ0FtTDJIU0NnWnlvUHNP?= =?utf-8?B?bHZFWVlqOXc2VnlSSGlZNzdqazN5bGJIOXZuMU54ZzlHaWtrN1ZqNldabkgw?= =?utf-8?B?K2JsZ3NLaktqSXNWMGs2UVdQRU5YZDl6ajAvc3hSbDVmVGFidWR4Y0JBWjUv?= =?utf-8?B?YjY5K1E4UXFRcXNPcU1wL0JNSlNFTXYzdnVhMzJqRCtsYVdUNXdDQVFUZ3BY?= =?utf-8?B?aDZOMmRVcXZKNjV4M09lamNJaTBYN29UNG9iK1JORkNBalhzMXg3S3dLc3du?= =?utf-8?B?R2NHMit2V3BrSUs3cVN2d2ZQcXViYkZvM2NpRDIxK3BtVFRxWHMvQnBMQTBV?= =?utf-8?B?Ni9qb1lNNU1ha0o5UGlIUVV4bUh5ZUJ5ZEk0TXZYa0dsMWlGV2RsQ1BrUlI2?= =?utf-8?Q?v2fUuitkp8Fx4SPGHSG1y6jK8gWWZOIjgm586at?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3c15e57c-8861-4e74-b5a6-08d8e951fefd X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:05.4290 (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: 8LmBCEjR2nI08Qd33nIhcf9WOMykv4i7ZW73bnob4MftKkD1jWothObNOZXr4kLF8WBDu5joJ1hGJXsPz5YJcQU5hQwAS9O5duwcJiR5nUY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1650 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.1.137; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-HE1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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) Add test to show that simple DFS recursion order is not correct for permission update. Correct order is topological-sort order, which will be introduced later. Consider the block driver which has two filter children: one active with exclusive write access and one inactive with no specific permissions. And, these two children has a common base child, like this: =E2=94=8C=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=90 =E2=94= =8C=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=90 =E2=94=82 fl2 =E2=94=82 =E2=97=80=E2=94=80=E2=94=80 =E2=94=82 top =E2=94= =82 =E2=94=94=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=98 =E2=94= =94=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=98 =E2=94=82 =E2=94=82 =E2=94=82 =E2=94=82 w =E2=94=82 =E2=96=BC =E2=94=82 =E2=94=8C=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80= =E2=94=80=E2=94=90 =E2=94=82 =E2=94=82 fl1 =E2=94=82 =E2=94=82 =E2=94=94=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80= =E2=94=80=E2=94=98 =E2=94=82 =E2=94=82 =E2=94=82 =E2=94=82 w =E2=94=82 =E2=96=BC =E2=94=82 =E2=94=8C=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80= =E2=94=80=E2=94=90 =E2=94=94=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80= =E2=96=B6 =E2=94=82 base =E2=94=82 =E2=94=94=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80= =E2=94=98 So, exclusive write is propagated. Assume, we want to make fl2 active instead of fl1. So, we set some option for top driver and do permission update. If permission update (remember, it's DFS) goes first through top->fl1->base branch it will succeed: it firstly drop exclusive write permissions and than apply them for another BdrvChildren. But if permission update goes first through top->fl2->base branch it will fail, as when we try to update fl2->base child, old not yet updated fl1->base child will be in conflict. Now test fails, so it runs only with -d flag. To run do ./test-bdrv-graph-mod -d -p /bdrv-graph-mod/parallel-perm-update from /tests. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- tests/unit/test-bdrv-graph-mod.c | 116 +++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/tests/unit/test-bdrv-graph-mod.c b/tests/unit/test-bdrv-graph-= mod.c index 4e4e83674a..3b3bba1ee3 100644 --- a/tests/unit/test-bdrv-graph-mod.c +++ b/tests/unit/test-bdrv-graph-mod.c @@ -238,6 +238,120 @@ static void test_parallel_exclusive_write(void) bdrv_unref(top); } =20 +static void write_to_file_perms(BlockDriverState *bs, BdrvChild *c, + BdrvChildRole role, + BlockReopenQueue *reopen_queue, + uint64_t perm, uint64_t shared, + uint64_t *nperm, uint64_t *nshared) +{ + if (bs->file && c =3D=3D bs->file) { + *nperm =3D BLK_PERM_WRITE; + *nshared =3D BLK_PERM_ALL & ~BLK_PERM_WRITE; + } else { + *nperm =3D 0; + *nshared =3D BLK_PERM_ALL; + } +} + +static BlockDriver bdrv_write_to_file =3D { + .format_name =3D "tricky-perm", + .bdrv_child_perm =3D write_to_file_perms, +}; + + +/* + * The following test shows that topological-sort order is required for + * permission update, simple DFS is not enough. + * + * Consider the block driver which has two filter children: one active + * with exclusive write access and one inactive with no specific + * permissions. + * + * And, these two children has a common base child, like this: + * + * =E2=94=8C=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=90 =E2= =94=8C=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=90 + * =E2=94=82 fl2 =E2=94=82 =E2=97=80=E2=94=80=E2=94=80 =E2=94=82 top =E2= =94=82 + * =E2=94=94=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=98 =E2= =94=94=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=98 + * =E2=94=82 =E2=94=82 + * =E2=94=82 =E2=94=82 w + * =E2=94=82 =E2=96=BC + * =E2=94=82 =E2=94=8C=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94= =80=E2=94=80=E2=94=90 + * =E2=94=82 =E2=94=82 fl1 =E2=94=82 + * =E2=94=82 =E2=94=94=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94= =80=E2=94=80=E2=94=98 + * =E2=94=82 =E2=94=82 + * =E2=94=82 =E2=94=82 w + * =E2=94=82 =E2=96=BC + * =E2=94=82 =E2=94=8C=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94= =80=E2=94=80=E2=94=90 + * =E2=94=94=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94= =80=E2=96=B6 =E2=94=82 base =E2=94=82 + * =E2=94=94=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2=94=80=E2= =94=80=E2=94=98 + * + * So, exclusive write is propagated. + * + * Assume, we want to make fl2 active instead of fl1. + * So, we set some option for top driver and do permission update. + * + * With simple DFS, if permission update goes first through + * top->fl1->base branch it will succeed: it firstly drop exclusive write + * permissions and than apply them for another BdrvChildren. + * But if permission update goes first through top->fl2->base branch it + * will fail, as when we try to update fl2->base child, old not yet + * updated fl1->base child will be in conflict. + * + * With topological-sort order we always update parents before children, s= o fl1 + * and fl2 are both updated when we update base and there is no conflict. + */ +static void test_parallel_perm_update(void) +{ + BlockDriverState *top =3D no_perm_node("top"); + BlockDriverState *tricky =3D + bdrv_new_open_driver(&bdrv_write_to_file, "tricky", BDRV_O_RDW= R, + &error_abort); + BlockDriverState *base =3D no_perm_node("base"); + BlockDriverState *fl1 =3D pass_through_node("fl1"); + BlockDriverState *fl2 =3D pass_through_node("fl2"); + BdrvChild *c_fl1, *c_fl2; + + /* + * bdrv_attach_child() eats child bs reference, so we need two @base + * references for two filters: + */ + bdrv_ref(base); + + bdrv_attach_child(top, tricky, "file", &child_of_bds, BDRV_CHILD_DATA, + &error_abort); + c_fl1 =3D bdrv_attach_child(tricky, fl1, "first", &child_of_bds, + BDRV_CHILD_FILTERED, &error_abort); + c_fl2 =3D bdrv_attach_child(tricky, fl2, "second", &child_of_bds, + BDRV_CHILD_FILTERED, &error_abort); + bdrv_attach_child(fl1, base, "backing", &child_of_bds, BDRV_CHILD_FILT= ERED, + &error_abort); + bdrv_attach_child(fl2, base, "backing", &child_of_bds, BDRV_CHILD_FILT= ERED, + &error_abort); + + /* Select fl1 as first child to be active */ + tricky->file =3D c_fl1; + bdrv_child_refresh_perms(top, top->children.lh_first, &error_abort); + + assert(c_fl1->perm & BLK_PERM_WRITE); + assert(!(c_fl2->perm & BLK_PERM_WRITE)); + + /* Now, try to switch active child and update permissions */ + tricky->file =3D c_fl2; + bdrv_child_refresh_perms(top, top->children.lh_first, &error_abort); + + assert(c_fl2->perm & BLK_PERM_WRITE); + assert(!(c_fl1->perm & BLK_PERM_WRITE)); + + /* Switch once more, to not care about real child order in the list */ + tricky->file =3D c_fl1; + bdrv_child_refresh_perms(top, top->children.lh_first, &error_abort); + + assert(c_fl1->perm & BLK_PERM_WRITE); + assert(!(c_fl2->perm & BLK_PERM_WRITE)); + + bdrv_unref(top); +} + int main(int argc, char *argv[]) { int i; @@ -262,6 +376,8 @@ int main(int argc, char *argv[]) if (debug) { g_test_add_func("/bdrv-graph-mod/parallel-exclusive-write", test_parallel_exclusive_write); + g_test_add_func("/bdrv-graph-mod/parallel-perm-update", + test_parallel_perm_update); } =20 return g_test_run(); --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615991971; cv=pass; d=zohomail.com; s=zohoarc; b=CF7XkaTDSt7fKQcU/5KuyDcv6qKSbjhQaeoewyberURShyck0Y65rGb8TRSkOwb9ZzHKcQIkngHy7+lDRx4HHRboljFclRwETJZTPncvbe2/WSYQWBXiBO9tc5IedfGnj0onulKH289FzaznPcmjbgxljZKH37FyrXvYXj+gPys= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615991971; 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=249H0QJjjFlknMSfPWwdFnPO52SpoOOnQCVFSTVgICo=; b=QE5EPrX3d9BbtvKssP/Y5ZL5EoHQeP87ByBDRhcJ1q/BE/YGJihC77PjYTCfWjqJkaeG/P/lk+yOmogOVrYnGUCXu2t22diLzlfFIuUAKQfz5lFhq1aT/8fXfTQA958Yny8HoQ3zHyr/TRFX5F7X5KKoXssrOy2J8AdnLM7aHFk= 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 1615991971220607.4258534975645; Wed, 17 Mar 2021 07:39:31 -0700 (PDT) Received: from localhost ([::1]:40712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXKc-0007C1-1y for importer@patchew.org; Wed, 17 Mar 2021 10:39:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXHY-0004GO-9N; Wed, 17 Mar 2021 10:36:20 -0400 Received: from mail-eopbgr10137.outbound.protection.outlook.com ([40.107.1.137]:61154 helo=EUR02-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 1lMXHT-0006nM-70; Wed, 17 Mar 2021 10:36:19 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1650.eurprd08.prod.outlook.com (2603:10a6:203:2f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:07 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:06 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LxLES6LLgP4AtKuzi5S5EYv7iLDOlFeStX7dGlKHoiTNc7GFa+Yi8f2k6cBk08OAzv9wqquh2FHEIAkxcp5PhyPBVfvU3FOiYtdqZQXH2JW99sUlHxUIGG4Sv4vc3XcYWY+UYJuePsHpv+zNEhIRegg7V7vVEelA/BJIyOYU8KbAesZAAgvwJJv0ijVgcR0RJMqXgD3oLFGjF+dUTiVD2PCvNn5ff3UOBZ0UkgLrBt7PZWspByUAiRBppjo6nEZoaWe0m1fnFT5vmiQBJmyNesTKX7vQ1pGMbz+Vt7WYWjQ8/RVmYinik5YHRag/u3txqnrZJmHxrMqZ0mJFJN/DSQ== 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=249H0QJjjFlknMSfPWwdFnPO52SpoOOnQCVFSTVgICo=; b=kv7vqK6gN3r7bzckAFWjMPqSDFCUyFsFrP55/mFSaQ9oKRHBeolhaSrIMQ61pipEcbD9KK1qgUci8O4PvWcl/WAd1uHuZLymDJShQgKwRhrwzE6Om35fYLUAiYOf9HFOhrYjW8AdVQyPh1ii1sEvl2d/HDLe5q2u532E0rpfY1l9Y5MPMJRCvRwTEdMYmaYvzz2FGwSGXbbKCOxcxSKuZ/6aQWggu3g0QmdoWn8gWytEygO+c6ZWnug15nj0wxuSOZgfamzR5RQ3R0nyW0HIjEY7KhYbtvb1GMPCLlV1gF44yKYhcbFa0DWAlG3S5zjrX7xmIcsYgpjAZLt8dTwOXg== 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=249H0QJjjFlknMSfPWwdFnPO52SpoOOnQCVFSTVgICo=; b=HG+7E1/sqGYvo3E6VXOWx2lPpaaDGY4XgBGQ25qyvSJQLXoE2dCirVYbKnWwphTFoD9kusvRoN/oEbq7aMAGbLQDsXkRpPzrZNJ/mrXBpHlP7xIsNq9W5BWntkAUVEzQeL37ylpC9zH/AAmBB1aBIQMOyWtxmwiyPhry+Nx/0xc= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 03/36] tests/test-bdrv-graph-mod: add test_append_greedy_filter Date: Wed, 17 Mar 2021 17:34:56 +0300 Message-Id: <20210317143529.615584-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: d368e17d-878d-45b7-9368-08d8e951ffd0 X-MS-TrafficTypeDiagnostic: AM5PR0801MB1650: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gz2K7SIFDv8CzGxrmJ0o92Q41HfwRbmQONHf1Aa8PRf5uPvNO4pu2SSF0NCSLDfUPBwR0xrnKjtV1Vv6q49wbRR8rk4A7kAd+QiCbpL8cASNPiZpB+MkXjGbubmY/aRlKpTTtBACRSfCXvYvpEKNOHcZ0fUOF+c0q6WljV4rdId8H55AnEezqdLP5RAyfiGnQWZ7yhg6ryzwE30ho4y6AGYXuvakS9uk2eADQjAJGLtz/cvXB7UqU1X0fA4riTEpU/PClhDChxnEtmjy0AfPhixUiuM+gaXPDxC+McR6FcjfPSnGt02LZJqIB4J103i37KYj0uypXwIbqqf03t+5dv6rx3A9BpIiyZq7hTNmAgxFW6Akf6V0TyFCxHuRq7sfbQ+/+1BlwKHN35U7yBVaOiJZ0sJRnyfv9uKLwNGvfP+Q+Ff27vWAhuUfVaODU4RodXIu3Ju6XOSTGgCHOc2tMDQDn04eoIA/uo1PHS8mbCsYdYaAde/opXENCbECDefP1k4a4mAZA3UHvdMtVBJm3YPIDklmqp7Mn/hSHqOdnuIvkTlLHR1AXe9vtmwxoRvQUPHcHoO9sm++GHE17ffCUy5m1MUB1WS8p579nGAttcmzGmdcmDHGB3ucV24q+d1B 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)(346002)(39840400004)(396003)(376002)(136003)(366004)(316002)(1076003)(956004)(6916009)(6506007)(69590400012)(66556008)(66476007)(6512007)(26005)(4326008)(5660300002)(83380400001)(8676002)(52116002)(2616005)(66946007)(6486002)(6666004)(186003)(36756003)(16526019)(2906002)(86362001)(8936002)(478600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?wDyuHMXWEPEJPzBuqCW4T66CQjtuZtuuqDphQleGsw6aFzPM8wdNM64X894x?= =?us-ascii?Q?ZQip/dDipyAPNXtjtuzMLLz4c8Xj0rzqjHl2Ut/6dI4ZcKiAwhjZAyX1xMwZ?= =?us-ascii?Q?kfeQIfHc+DbjUlsWdQHVDS64NSDtO2BEI3lwO4Jgqnn84kE/Mpy9agWHi+kh?= =?us-ascii?Q?LmpAWf2nMkB+2LRhb2592LbMGflZWk/7qrNU+FMkwdU6fNt+hr7pDyCScRnA?= =?us-ascii?Q?NWKXEGZbhtzXDjNdci8qEN7uMx2RSn9H1+Dlyth5KxasLDuRjW3Ofnuk07W1?= =?us-ascii?Q?Tw0QYG6LuCjAnXpWxlXAxlIgXebzEFZug4QChWjIZbbgU39e/eNZybaudWw/?= =?us-ascii?Q?FHM5AOZIL1S4FxtUJdOJw4u1IvFqjuYasyT/s+k96wgH5qbwGNYc5huT3gsH?= =?us-ascii?Q?lRaVOXph3ae53tbGmuVqnoPPm4tLle2i0Kp2Mz910YxyeUvMNxkUZPzlbYmx?= =?us-ascii?Q?dx4zbMtAdL6N0no+JZN6bqLFRkMduWNzaQiw+HwpVpWXybvDRgnkB7PhFGrh?= =?us-ascii?Q?TwkHE36tzI+wTodDwy/mFd948oJljmse5/MmRM/B203/Lv3lTIWckFt4v/7L?= =?us-ascii?Q?8pwYJjBYXpgGHVdFVAbZCKj7m0s7Y4l2Lj00lYsWmvVPpuZzYkGikWMO9cu9?= =?us-ascii?Q?dBWqZ7otSiZClda0wq5eMX9J5dAnYE/jxBVHjVStymHfPBqPf0ms88I6aD8J?= =?us-ascii?Q?E7wHF/QEAcmb8bEVYZ7y6E+XS1n58YbFazqWYZ3PuNrUTFTuU88Q/oTHy7Ae?= =?us-ascii?Q?HPcv1sLKxPsxb9ma7te44gY0WS8UxB4p+xXRMRAkBuREDr9vMMqbenRaPAAN?= =?us-ascii?Q?GIslyOdw3IMzGYcblcHvDTsANxwfh6HFVc6lYWGhPOHjLuUhA73KtpcxU5jm?= =?us-ascii?Q?rDmyPW4IeLOts1aHj8MAbWAA+Q0FK8EcDWD1fK/tEOAAZQYD2sdKUyXw3nZA?= =?us-ascii?Q?mFwS4ZMcuiyqxEtFUVUGs3NwsoSan/i0jd6FmbVvZ9w35c/VvwnZhgdLkoLe?= =?us-ascii?Q?bD6CLDORGipRQe83k3dkTgqIcety4uP6ADsEg3YzRDJZFue30QJ0JTmZx6si?= =?us-ascii?Q?lh1u3vpSxVKsijuGy1JSAnw5pumO/xuunLTA7BDnthBmvg6Jiqdk3s/YVe96?= =?us-ascii?Q?4gVSy0zOz+9QT59Pxm/o+c3PMVRmOXKWIBUy8c2fDkSOgwrSXiA0mQNlEIph?= =?us-ascii?Q?4gkdphC+zCgEyko0Vr68MQLwMM0vDbwkGR/UjAFtikZurs+sCNtwhKls+Rqv?= =?us-ascii?Q?QK7aB+lN1QJ4bnmPUHXAQVwk184b13m92Wmh8Ypvj8MnWu71hpdrWarqsxJS?= =?us-ascii?Q?HxZKecZumuc8jHQ3cNglj9Rn?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: d368e17d-878d-45b7-9368-08d8e951ffd0 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:06.8508 (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: 13E8dufzs+2p4DFoFoBYjjHpFeALLuBxN+vm5cTOhABbdCuHIeQWRjRKK5hi1r/xY1TGVG2/lO4scfIbfRGKZgcjlaqwB+JfIbXPsL9sLQQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1650 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.1.137; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-HE1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" bdrv_append() is not quite good for inserting filters: it does extra permission update in intermediate state, where filter get it filtered child but is not yet replace it in a backing chain. Some filters (for example backup-top) may want permissions even when have no parents. And described intermediate state becomes invalid. That's (half a) reason, why we need "inactive" state for backup-top filter. bdrv_append() will be improved later, now let's add a unit test. Now test fails, so it runs only with -d flag. To run do ./test-bdrv-graph-mod -d -p /bdrv-graph-mod/append-greedy-filter from /tests. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- tests/unit/test-bdrv-graph-mod.c | 33 ++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/tests/unit/test-bdrv-graph-mod.c b/tests/unit/test-bdrv-graph-= mod.c index 3b3bba1ee3..65c69b23f7 100644 --- a/tests/unit/test-bdrv-graph-mod.c +++ b/tests/unit/test-bdrv-graph-mod.c @@ -352,6 +352,37 @@ static void test_parallel_perm_update(void) bdrv_unref(top); } =20 +/* + * It's possible that filter required permissions allows to insert it to b= acking + * chain, like: + * + * 1. [top] -> [filter] -> [base] + * + * but doesn't allow to add it as a branch: + * + * 2. [filter] --\ + * v + * [top] -> [base] + * + * So, inserting such filter should do all graph modifications and only th= en + * update permissions. If we try to go through intermediate state [2] and = update + * permissions on it we'll fail. + * + * Let's check that bdrv_append() can append such a filter. + */ +static void test_append_greedy_filter(void) +{ + BlockDriverState *top =3D exclusive_writer_node("top"); + BlockDriverState *base =3D no_perm_node("base"); + BlockDriverState *fl =3D exclusive_writer_node("fl1"); + + bdrv_attach_child(top, base, "backing", &child_of_bds, BDRV_CHILD_COW, + &error_abort); + + bdrv_append(fl, base, &error_abort); + bdrv_unref(top); +} + int main(int argc, char *argv[]) { int i; @@ -378,6 +409,8 @@ int main(int argc, char *argv[]) test_parallel_exclusive_write); g_test_add_func("/bdrv-graph-mod/parallel-perm-update", test_parallel_perm_update); + g_test_add_func("/bdrv-graph-mod/append-greedy-filter", + test_append_greedy_filter); } =20 return g_test_run(); --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615992184; cv=pass; d=zohomail.com; s=zohoarc; b=FVFf7ThL+c2SuLHrVTC9H5903x5sxPm87niV8kyIeoYoPX7ynNBcxZIv+BXWTU2UuLdmJ/U50kuBhPuwWfOMyELrD4se6W2Cama4dvTl9l3xjOnWQUMS+ppb9a+2Xq3R5xrogNRGJuTOztFMCMCnM8X2VQtRHs18hRXeIJh/H0M= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615992184; 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=4RaqixNqiJ+awM22JtpG7afb0o7QgXU7R2Rh8PGM0Zc=; b=nOuDO8XjptZvyjpyvHwrAstLAQevVSeOb2QwSS4yyewN+OtnJihs9bzB9YeoU73q5c4uIzejeMe9lKA+jwx0R9PLTNwb2u3HoDkHnbAQrGpUGjz23EhaJ+mj1NlY1rl8Apb7cfHVpeXc+kT+bEFbXkrutYnysz1+ZLkzSoBYyu4= 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 1615992184346671.1742121982071; Wed, 17 Mar 2021 07:43:04 -0700 (PDT) Received: from localhost ([::1]:49286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXO3-0002Pg-2c for importer@patchew.org; Wed, 17 Mar 2021 10:43:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXHc-0004SL-8X; Wed, 17 Mar 2021 10:36:24 -0400 Received: from mail-eopbgr10137.outbound.protection.outlook.com ([40.107.1.137]:61154 helo=EUR02-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 1lMXHY-0006nM-G9; Wed, 17 Mar 2021 10:36:23 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1650.eurprd08.prod.outlook.com (2603:10a6:203:2f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:08 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:08 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:07 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mfMyxT63n8NrEupKEymPRI+z9tg2bA9eKlHxxkdr9m++4B0rKnABog04tmcFvbcpblhQgJ0XJ7hUxMfB5ivmaEymdonqy7QWyAa4glaRmuKQ4ZAfgRPvQPu41+dBjUvdI2fXkQeLuaFnSoLpulUNEZyMzLX5UoaSEuZv8HCAWrqbuoiXWEsNCxGUC8axahZfQeFAxsJAVcdYNFLO0Rf1HnMUOwrL/H0JBOpMqEQKEkIisivXMtJlN0acq0Ck/eaQ2Y3jfRiWNFxjlnx7TO+DGAHBGRiKvi+Qq0MxT9Ohw6el54Xl4akdx4qZUrvv0B+El84sfCRE22TfhuByl9uMHQ== 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=4RaqixNqiJ+awM22JtpG7afb0o7QgXU7R2Rh8PGM0Zc=; b=SJHZUzouYpzfeIIHFC9jqD9bTbEVwLH9DE7DYlxssowutKauSmOAc5bVB21mARzcotDmiHVbkorxs02wvZ2s4lzk4j7paElajhYYD0wKhC69jnlL3XSXIAy+NEgJ5zTV6ORrqejdQLmunkljhRgFAA//F3nJ3wS2JFshZ7yReLZ03vT211C9qlSKzUTdrp15gQp0SoSwg2gKLYvD403lY0ZE1vOPeDJGo3GX9532TvHT9PgVe6wyJ9rbroSZcd+SEhPOqC9CQdQ0Xb5UsOYiZjHZ0qrv6U2IzZJuesl1o9Mr/dJXalDOCYtbBO/KNQREoof1bGPBGMOdZHZqXm0CIQ== 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=4RaqixNqiJ+awM22JtpG7afb0o7QgXU7R2Rh8PGM0Zc=; b=bgerqov8maJ6TTm6936YsPduUvD8ZrTfq8OA8n+rVGMXMcTBx8AzTRhv+Trproz6taq2ey6PDZvfCmtfBm2siXuzcpZVFAkf8393UkQVyNeox1V7cNOw63uTtfamKwGulyk6fiN2KyY8BkLMW4Ns0gC7Fb5wcLU9APWSJyXtlfM= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 04/36] block: bdrv_append(): don't consume reference Date: Wed, 17 Mar 2021 17:34:57 +0300 Message-Id: <20210317143529.615584-5-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: 9cc6bf93-58d8-41e9-84d6-08d8e95200a9 X-MS-TrafficTypeDiagnostic: AM5PR0801MB1650: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:313; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vR2uQG5vw1t3HaVpeHg1aSvqGo5XVrect+/mDBrR5UzLIPprtjKkBuBBggiQ/URufcK63BQZwck+hm8B2A7HaE6zPwzMT/ed5xJvvNn3240MdTqkIj3ago1d5+9SqIF7aj6X5E5UvM/CDyJqnJ1k5mS0SXJckT/EdIQ2dHCtr9v1LQrrbwBm7n0ZfBP8s0qX50XlwfD1buB0L7h3R+Q6Kz0r1r5vXqRpmpZD3G1bvHi/+wlMkbubzmZMmP0Zj8EHpVclZykokNein69xuff8W6p946EgpzXpx5hBDadICpQ3X52Cr+8vdoUSKs9iezEw0ZidZbw0Ql1N4BfhpvezSg7kts4LsLzL3JrxNmPUvKAD8RYfFCzrLnmYiyvUFrq7QynAIPPjEkjM/tPteC759qxXYCKOdfEfIcTiT7O312LJeCcm2GBcMYbKsX/8+UpJIN05aCQKML2/i4/p/2jblqw5sesGCRK3+gDd3rD7XqQCpB2+CvE/G2WIzkv5L/x1GYBTbTe8GtoVAf4hjVgR0DVUkaXeFNrhxWGlYLpy05erH2xlMCGhX0fBS6WCMdyCWf+OZ2PSA7PEXs1de+i7WF/y0bS08y0spBLZInSy3ko07aWP5+gkIF/VWvVZuzap 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)(346002)(39840400004)(396003)(376002)(136003)(366004)(316002)(1076003)(956004)(6916009)(6506007)(69590400012)(66556008)(66476007)(6512007)(26005)(4326008)(5660300002)(83380400001)(8676002)(52116002)(2616005)(66946007)(6486002)(6666004)(186003)(36756003)(16526019)(2906002)(86362001)(8936002)(478600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?kQeShmKtx/oP2Q/5vlrvM1pUO7ols8Wxbzl2F01zwaHW9rd841fxZbB52Zfd?= =?us-ascii?Q?Io/0nKdRiDwNdNmv4ZsJwvt7q6muOZ3RKvmKqDOIRCWx7HjmnkxeeW8VSOi1?= =?us-ascii?Q?Y6uab/+APXsMjRPNGxKsywkI0j+njTyr6E2Z4ZNDAiq5QAk+jduEXxoHSnSg?= =?us-ascii?Q?pHlPpmkSBBlGsaUxemMNKRK96C1JFasjYGPkDMvHo8gDbmvCKDtcJmDRrLkg?= =?us-ascii?Q?x8bpx1ZeFEz7rIYJG+KpptMW2GvpQ/AK4DwBZijEd4ZrCXW8AbdalAKQ5/KA?= =?us-ascii?Q?0SImFYmiv42vYNKMYj1uLVsyyqP0ySZ5o9wyPcvjneBsGXsm7X9NS36zjwHo?= =?us-ascii?Q?5pvq7SMyGB6qu6Yha7ocrauPqOZNpnnl3SOJEVfEzjwdh39HpZnuHIhi4UER?= =?us-ascii?Q?VTrc9g3elp6RtuXPKntmHQ3ZQGprPfpNTSZ0aA5llw+xCBvvHmRO0PtEdgwy?= =?us-ascii?Q?WoPjLY3vibQR0BTPXyocxNKvPh9/P+raenlntzFK6NpkUXuow+IMQ6bogbly?= =?us-ascii?Q?N2lDxCs5HxpdXNXvfLQE4CoNHMSlLUfeVVqSlsN9YGLIRPqCCsdYLFUhXvYb?= =?us-ascii?Q?9Jc27Baxj+uzwZtk7vfHUPvs2+iu6cvC237hQ4edvOJt5l5as9A7Ay4Sat33?= =?us-ascii?Q?gN+CdSkglqvPAliXarHijSMj9k/FpTCKV3QPNHezBWrEhqG9vezCnbAgs0KJ?= =?us-ascii?Q?OU6mYJZeGwB9SF4Uir6i2KMYVCJ1nMK0rutEOVqAlCiOC6YgCzddDmkh5Fvl?= =?us-ascii?Q?miBocQD9PkBhPMPAcE43U4Dw7N9KAASa3WIUAom0fGTrNvRnN3ZgbcGNWgjV?= =?us-ascii?Q?L9iHWrBR4pCAP8a32UiJXn2zjwIQNL40Oi2ysiuMSbP8+OoCRDWpF2Ln4P2P?= =?us-ascii?Q?eL1L2cyFqcgEXqFFr+IwnTrpC/W6qEB93lHKAT1+FFDLje0IrGUK02uqeBF4?= =?us-ascii?Q?3GPET0Z9VdZcCh4ulNAAd7Foq9ijLZRG/+26UWmX9lmD4SL3SkvLAvWQ+Nd9?= =?us-ascii?Q?6obXSwMZkP8ONk6bvpE05RFE0dEmmVjYaUcbHW/eOULHQM0IBDsAE0sCWqed?= =?us-ascii?Q?CXVYaXdG4L8nXZF2Axp1Qd2iGswS22m6joccynn5wmdJ04PwT1PduPBO9I3l?= =?us-ascii?Q?PTe1sDXOAhLr/fcAFkKOgz0UjA8OZFO7Xw+gR+K+HXf8O+y/2GSKtJXaMg4v?= =?us-ascii?Q?+IVXnVYuB4r2+eqbE6vItkCXu1A+U4W9I6bPWgisNSNdowP84NDDsJKxDAhd?= =?us-ascii?Q?qFnPmLwiIr2U+DU+8dr54A7iwFAFsNl7Y529aSwOOHaTnGejpcZkPo18FsyZ?= =?us-ascii?Q?vnwjBNOkJaF0JyyDDRjf/hwo?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9cc6bf93-58d8-41e9-84d6-08d8e95200a9 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:08.2924 (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: WdwBa5k8tb9H042sIU9NqYeFzplhQGUT1BRFiYJiVbnmcCFPIO8BSlOPSCrspvItO/DX0pgF7j0dhuY3LmfTU2e9+O6DLVoQKj/mqMZ+2rQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1650 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.1.137; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-HE1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" We have too much comments for this feature. It seems better just don't do it. Most of real users (tests don't count) have to create additional reference. Drop also comment in external_snapshot_prepare: - bdrv_append doesn't "remove" old bs in common sense, it sounds strange - the fact that bdrv_append can fail is obvious from the context - the fact that we must rollback all changes in transaction abort is known (it's the direct role of abort) Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Alberto Garcia Reviewed-by: Kevin Wolf --- block.c | 25 +++---------------------- block/backup-top.c | 1 - block/commit.c | 1 + block/mirror.c | 3 --- blockdev.c | 4 ---- tests/unit/test-bdrv-drain.c | 2 +- tests/unit/test-bdrv-graph-mod.c | 2 ++ 7 files changed, 7 insertions(+), 31 deletions(-) diff --git a/block.c b/block.c index f377158c42..297a4f7018 100644 --- a/block.c +++ b/block.c @@ -3179,11 +3179,6 @@ static BlockDriverState *bdrv_append_temp_snapshot(B= lockDriverState *bs, goto out; } =20 - /* bdrv_append() consumes a strong reference to bs_snapshot - * (i.e. it will call bdrv_unref() on it) even on error, so in - * order to be able to return one, we have to increase - * bs_snapshot's refcount here */ - bdrv_ref(bs_snapshot); ret =3D bdrv_append(bs_snapshot, bs, errp); if (ret < 0) { bs_snapshot =3D NULL; @@ -4645,36 +4640,22 @@ int bdrv_replace_node(BlockDriverState *from, Block= DriverState *to, * bs_new must not be attached to a BlockBackend. * * This function does not create any image files. - * - * bdrv_append() takes ownership of a bs_new reference and unrefs it becau= se - * that's what the callers commonly need. bs_new will be referenced by the= old - * parents of bs_top after bdrv_append() returns. If the caller needs to k= eep a - * reference of its own, it must call bdrv_ref(). */ int bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top, Error **errp) { int ret =3D bdrv_set_backing_hd(bs_new, bs_top, errp); if (ret < 0) { - goto out; + return ret; } =20 ret =3D bdrv_replace_node(bs_top, bs_new, errp); if (ret < 0) { bdrv_set_backing_hd(bs_new, NULL, &error_abort); - goto out; + return ret; } =20 - ret =3D 0; - -out: - /* - * bs_new is now referenced by its new parents, we don't need the - * additional reference any more. - */ - bdrv_unref(bs_new); - - return ret; + return 0; } =20 static void bdrv_delete(BlockDriverState *bs) diff --git a/block/backup-top.c b/block/backup-top.c index 589e8b651d..62d09f213e 100644 --- a/block/backup-top.c +++ b/block/backup-top.c @@ -234,7 +234,6 @@ BlockDriverState *bdrv_backup_top_append(BlockDriverSta= te *source, =20 bdrv_drained_begin(source); =20 - bdrv_ref(top); ret =3D bdrv_append(top, source, errp); if (ret < 0) { error_prepend(errp, "Cannot append backup-top filter: "); diff --git a/block/commit.c b/block/commit.c index dd9ba87349..b89bb20b75 100644 --- a/block/commit.c +++ b/block/commit.c @@ -312,6 +312,7 @@ void commit_start(const char *job_id, BlockDriverState = *bs, commit_top_bs->total_sectors =3D top->total_sectors; =20 ret =3D bdrv_append(commit_top_bs, top, errp); + bdrv_unref(commit_top_bs); /* referenced by new parents or failed */ if (ret < 0) { commit_top_bs =3D NULL; goto fail; diff --git a/block/mirror.c b/block/mirror.c index 6af02a57c4..a2a33267e5 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -1613,9 +1613,6 @@ static BlockJob *mirror_start_job( bs_opaque =3D g_new0(MirrorBDSOpaque, 1); mirror_top_bs->opaque =3D bs_opaque; =20 - /* bdrv_append takes ownership of the mirror_top_bs reference, need to= keep - * it alive until block_job_create() succeeds even if bs has no parent= . */ - bdrv_ref(mirror_top_bs); bdrv_drained_begin(bs); ret =3D bdrv_append(mirror_top_bs, bs, errp); bdrv_drained_end(bs); diff --git a/blockdev.c b/blockdev.c index 5cc7c7effe..825d40aa11 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1587,10 +1587,6 @@ static void external_snapshot_prepare(BlkActionState= *common, goto out; } =20 - /* This removes our old bs and adds the new bs. This is an operation t= hat - * can fail, so we need to do it in .prepare; undoing it for abort is - * always possible. */ - bdrv_ref(state->new_bs); ret =3D bdrv_append(state->new_bs, state->old_bs, errp); if (ret < 0) { goto out; diff --git a/tests/unit/test-bdrv-drain.c b/tests/unit/test-bdrv-drain.c index 8a29e33e00..892f7f47d8 100644 --- a/tests/unit/test-bdrv-drain.c +++ b/tests/unit/test-bdrv-drain.c @@ -1478,7 +1478,6 @@ static void test_append_to_drained(void) g_assert_cmpint(base_s->drain_count, =3D=3D, 1); g_assert_cmpint(base->in_flight, =3D=3D, 0); =20 - /* Takes ownership of overlay, so we don't have to unref it later */ bdrv_append(overlay, base, &error_abort); g_assert_cmpint(base->in_flight, =3D=3D, 0); g_assert_cmpint(overlay->in_flight, =3D=3D, 0); @@ -1495,6 +1494,7 @@ static void test_append_to_drained(void) g_assert_cmpint(overlay->quiesce_counter, =3D=3D, 0); g_assert_cmpint(overlay_s->drain_count, =3D=3D, 0); =20 + bdrv_unref(overlay); bdrv_unref(base); blk_unref(blk); } diff --git a/tests/unit/test-bdrv-graph-mod.c b/tests/unit/test-bdrv-graph-= mod.c index 65c69b23f7..8188ddd84c 100644 --- a/tests/unit/test-bdrv-graph-mod.c +++ b/tests/unit/test-bdrv-graph-mod.c @@ -138,6 +138,7 @@ static void test_update_perm_tree(void) ret =3D bdrv_append(filter, bs, NULL); g_assert_cmpint(ret, <, 0); =20 + bdrv_unref(filter); blk_unref(root); } =20 @@ -202,6 +203,7 @@ static void test_should_update_child(void) bdrv_append(filter, bs, &error_abort); g_assert(target->backing->bs =3D=3D bs); =20 + bdrv_unref(filter); bdrv_unref(bs); blk_unref(root); } --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615992337; cv=pass; d=zohomail.com; s=zohoarc; b=LNlaatN2kN5zZxo7X9tvss7YvxcOGx9Sj0+OSdyJnLU3jpzSgsQaxbuv2t6YICZRaq2rHXcQZxOsjFQA8zwZKitU4lDBT4Su9LZjMljp27FQOFLq7LI6Sz5yVkpo9TMdXlmPGqfdF/XHChXomRJHw7RLnCHbhB7f4WI+/YuWPCA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615992337; 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=AdA3xdhuqzIKtN/wS7LgVVKJD1dOihxJh06GFONPwCc=; b=CnXsqaYsX3SEeFur+bpiSWyaoMUcxM+4zvyGZNxjYtRDq9oNNn2wjkdeN7s9QTGphKLnQ4xpiR2NlJ7HQSS9+t4sUL2UpUMwsYcEjCk3FKWso/0yyh7WNPf6S9g1Y7QOoVwvzmY5lSli/vjLVqLEge8Fx84kOIDhEYzlhi+abWU= 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 1615992337977843.0867168664057; Wed, 17 Mar 2021 07:45:37 -0700 (PDT) Received: from localhost ([::1]:55706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXQW-00052b-Oi for importer@patchew.org; Wed, 17 Mar 2021 10:45:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXHf-0004aD-47; Wed, 17 Mar 2021 10:36:27 -0400 Received: from mail-eopbgr10137.outbound.protection.outlook.com ([40.107.1.137]:61154 helo=EUR02-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 1lMXHd-0006nM-2p; Wed, 17 Mar 2021 10:36:26 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1650.eurprd08.prod.outlook.com (2603:10a6:203:2f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:09 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:09 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:08 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FUt+p+p0rqNL+AOM5jbbZmSMRDQsTCOPDJgUD+z8QnxtGiS7rWusD9WgjtIlQjCwBGOp+Xy64ObcS8ohxl0IHI/EV5YMnUZK5RX5eV1KyaQ/M575XxJHsPaQ9WoHQIy6ZFoBeT07Nmb70lbWGQv2/6H3MFjII00ACQ8DqDgstQmDgv8ZrcNQGm/4gqcC1e4/wECJ1Zvju/WrjazL9PK0GdkKR4BS7j48GSZ7QLHBjmhRWZnx0bu9lAB3g35HbeneEztBIw//3t25lHk9ufT4k5STDK3uUFJF0fkj6bgCnlBjeJwbbGUEIpIXR/Esb9YbMAa9nabjc2m+nfRHlH1Mxg== 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=AdA3xdhuqzIKtN/wS7LgVVKJD1dOihxJh06GFONPwCc=; b=nbT8dPIlp+hy5tKVY4FE8YQDcayLtI6FFBmWUzBdcNH9z20e/ATXQxnHnUDVVIlcRDwPLKW669CITb+z2Z5yZDvhN/vO85tTXw93o8UyCWwL8UL27O1B+EWQH9ylVzuEbVqq8w12CSKFSaUYSFGl4VT5jGHi7B1NO1jyysP9hCW1KtM76AHM7O5vA5jWfe+JTYUJuxnmLmwVC0bCGTEkm6c3pU9eTj9Ciq55HJ5Gb5pIDh2t8sUfchNLTobhMw8OySiIvlQ4TCePOfSBVhITlP/ewLVsFhjs507v5HWVlWLHBa9zbN8u5q0BW0/PNkH83zExYpchmcSIPrGUFoHqyQ== 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=AdA3xdhuqzIKtN/wS7LgVVKJD1dOihxJh06GFONPwCc=; b=IaTKA55nopUHfYKPWEPoscFtPCX4wZCsiWh5rC/vku/pYrb/faFouJTL8WQ/XxLKjufxXyNCoVg+S7qySIClNRlOH8cRNxRq1fu72zeDnWwXuMaL7+pwy6qaTuJ9iD0VPbbAjN6X/MYREmd9CHgwf3nR61QGKYifmvQRYfNUM0c= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 05/36] block: BdrvChildClass: add .get_parent_aio_context handler Date: Wed, 17 Mar 2021 17:34:58 +0300 Message-Id: <20210317143529.615584-6-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: eb9a4eb5-6da2-4109-1ba8-08d8e9520186 X-MS-TrafficTypeDiagnostic: AM5PR0801MB1650: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1360; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uessEri0CYVa8x0CtOTUiGKIftxkdSdDkcidlrO2vZCxa/rp6w6mi6vZkUp/oM4RmSBS+r7mzh7QDj9x5TZJTNRuAe72hkn0srmFIbj1lZ+/7414/2JfvOy5AiK6jqVaOqa9zB0BCMEaxswW6+jiT/63HlZdawM9rQZ4NNV5m9sfZ+O18gUbsx9iHcnWzcwRruHs356ifCozmLg5UDB0lKC/nV2466xbDwvFrtp7M9+FfkrGXpdTODnGzZgHA/XEgH+JhIiCkD80NvBWNi4RThV1gmkNcA7SJ/uHZD2vRuaBjYix8hysYjQsqaxwKcfXb+H0AMFYPhvByX7pQN4tAT/oQwlta5jXc/TbafkpkSeQDzol0k0mi05fz5A2tCDBK4/EBKUMmMcTt1EEr/GUCtRZyeYrshpbLBqihFi2iz7O13Ct+kP2zt7c/8Wt+71wfNwKF3LxGWYoqF1wVubbhoVOu/z1Ct6jg2BMJP7sFveO01Kfra2RmJjXKGmNaZRShDbuUY2iYIQjgLq4y3iK53mOuzpv8CKJ2kIvPjts8tqR2madTjF7u0tiHj31/g3SPnNOlr49VI7NnoP8PksCz4XW0M+qa+U3OElzfDNMpjrH9kJ16uNcn2EV6e7FYNDWy5XdfcAZ0r4piSH86pm5Tg== 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)(346002)(39840400004)(396003)(376002)(136003)(366004)(316002)(1076003)(956004)(6916009)(6506007)(69590400012)(66556008)(66476007)(6512007)(26005)(4326008)(5660300002)(83380400001)(8676002)(52116002)(2616005)(66946007)(6486002)(6666004)(186003)(36756003)(16526019)(2906002)(86362001)(8936002)(478600001)(142923001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?bJlMuFdI3gurG7KUbXlSKOWxkLc1/FIenuf5N282q0oor70IIiX5uqH6ZOer?= =?us-ascii?Q?6mkeObErMQQGse3FmrDntvc6tWvn7w8w9Npi5xBHElIZeWnKDRMMZxhcLiq0?= =?us-ascii?Q?zttkPFFfrppqfyAqGkN+oJBtYbOulk9yAmbj9CYojt5JJ+efHyw6Ue453dPC?= =?us-ascii?Q?ID1yxl+Onap+kua9RT5p2dPyXdFJO4NrwIgaYN/8lBmLH3P55WuOXZZqCFaA?= =?us-ascii?Q?tbQlHTJD8ImdaaNq2Czc4zbU57MjY22WSj7X/U2d1iYVzBqeNsQE3N4lvYgp?= =?us-ascii?Q?VYrdT3wHQhzM3BY8eQJmsgnjMed+yKa93GFyQQcQw17Td2TK/2iE+YUoM2rL?= =?us-ascii?Q?Wo3a7fdpn5t/q2OalTARpFIk4nWg/hW/buBloN5cOKlzNZqTfXfVciJ8QwuA?= =?us-ascii?Q?dkGQzyy4sOnJadvsGPcqH9e4ylArj405fLvtfhYQ32H/XpKwdRPCeEpu2sYz?= =?us-ascii?Q?+73/dyR98md3Fzc/6pxI0oOiTaaj8ewvlw0MHqXOik/b2+BD9DaI7awpV5Md?= =?us-ascii?Q?IRYMd4jjE9S2MXuLMrTdlzX+vXEMsK3/uBluQVJDGsXpMqGzdrS0TiohMzu8?= =?us-ascii?Q?rLsdii6CH5s1QzBuAqPC4bhh9Had8Vr951kLJs7nNtw6DDi3yA835GfKs2MV?= =?us-ascii?Q?O6C+HuznHaQRJWT6tlcbsWB40716vacl+rNICx18UCCKTaMou4h/ajHu4af/?= =?us-ascii?Q?8j2x4fqZAs+MVt1rrZ3miTe+GhFqXPVRLBxmgsWmarEa2yRNLnug9vz0kSYC?= =?us-ascii?Q?lQ3Jjs6JusDms7zL53KO+Aa7xGeaRZxn99EyVH9jewwSf3CwEDiHvc3/Gm8e?= =?us-ascii?Q?1hFHZt61WQ1+9+gWz9pAsYWriVfxo/Eptb1bjFMSvJqwuht1UNQ+80lhgPQr?= =?us-ascii?Q?Ig5EIoLxFPpZNRCLA9mpOKMNrXpnnC5OWTYq/sol3wfp6geG9y419MySA3hq?= =?us-ascii?Q?hHjoSCU0eonjoRLe8VJHMVoZkdHLkpBi3rh+ISEEmDMsdB8qugwB8fcxOmZq?= =?us-ascii?Q?nO/1QcojJ7OX8vIOqXE5g0UPU9XyFd7VbDOgCMAYWwcuo6jSyGO5XmHUK9EB?= =?us-ascii?Q?vu0b19XXfY6MR9MT2HlubkyBdwOBuCiPh35eUD+BaRhQkh2nQ/yZH5gMN8co?= =?us-ascii?Q?ILjEi478Lx8J/iSDDOODDArfM/9EODzcgRcAWTYht/5wqaByXEr8vHIH5aaU?= =?us-ascii?Q?+ZAF/nCA5cDcrTr1VA3DEOsjZMxS8aT9wQT+puyIgiZx4gqGtRMQe+9wQ/pI?= =?us-ascii?Q?cO09QF6eJmgQRrJaS6apW/SAsFytZMeZiQQ3swWk92451p91oaoCXiKrZYiz?= =?us-ascii?Q?9Os/f0FSRSf6w1ox/13DSfQG?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb9a4eb5-6da2-4109-1ba8-08d8e9520186 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:09.7012 (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: YMcQY7runz+QdedZ/GGLeFqDBMXChephB9202JqrTDtCCzhV8EQ8ZjJjOM+xaMYq6h3sCThZkM7hoN52FabB+az513Cr7xlN04JazpybL70= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1650 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.1.137; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-HE1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" Add new handler to get aio context and implement it in all child classes. Add corresponding public interface to be used soon. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Alberto Garcia Reviewed-by: Kevin Wolf --- include/block/block.h | 2 ++ include/block/block_int.h | 2 ++ block.c | 13 +++++++++++++ block/block-backend.c | 9 +++++++++ blockjob.c | 8 ++++++++ 5 files changed, 34 insertions(+) diff --git a/include/block/block.h b/include/block/block.h index b3f6e509d4..54279baa95 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -702,6 +702,8 @@ bool bdrv_child_can_set_aio_context(BdrvChild *c, AioCo= ntext *ctx, GSList **ignore, Error **errp); bool bdrv_can_set_aio_context(BlockDriverState *bs, AioContext *ctx, GSList **ignore, Error **errp); +AioContext *bdrv_child_get_parent_aio_context(BdrvChild *c); + int bdrv_probe_blocksizes(BlockDriverState *bs, BlockSizes *bsz); int bdrv_probe_geometry(BlockDriverState *bs, HDGeometry *geo); =20 diff --git a/include/block/block_int.h b/include/block/block_int.h index 88e4111939..737ec632c4 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -789,6 +789,8 @@ struct BdrvChildClass { bool (*can_set_aio_ctx)(BdrvChild *child, AioContext *ctx, GSList **ignore, Error **errp); void (*set_aio_ctx)(BdrvChild *child, AioContext *ctx, GSList **ignore= ); + + AioContext *(*get_parent_aio_context)(BdrvChild *child); }; =20 extern const BdrvChildClass child_of_bds; diff --git a/block.c b/block.c index 297a4f7018..2c80fc1639 100644 --- a/block.c +++ b/block.c @@ -1360,6 +1360,13 @@ static int bdrv_child_cb_update_filename(BdrvChild *= c, BlockDriverState *base, return 0; } =20 +static AioContext *bdrv_child_cb_get_parent_aio_context(BdrvChild *c) +{ + BlockDriverState *bs =3D c->opaque; + + return bdrv_get_aio_context(bs); +} + const BdrvChildClass child_of_bds =3D { .parent_is_bds =3D true, .get_parent_desc =3D bdrv_child_get_parent_desc, @@ -1373,8 +1380,14 @@ const BdrvChildClass child_of_bds =3D { .can_set_aio_ctx =3D bdrv_child_cb_can_set_aio_ctx, .set_aio_ctx =3D bdrv_child_cb_set_aio_ctx, .update_filename =3D bdrv_child_cb_update_filename, + .get_parent_aio_context =3D bdrv_child_cb_get_parent_aio_context, }; =20 +AioContext *bdrv_child_get_parent_aio_context(BdrvChild *c) +{ + return c->klass->get_parent_aio_context(c); +} + static int bdrv_open_flags(BlockDriverState *bs, int flags) { int open_flags =3D flags; diff --git a/block/block-backend.c b/block/block-backend.c index 413af51f3b..3f656ef361 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -298,6 +298,13 @@ static void blk_root_detach(BdrvChild *child) } } =20 +static AioContext *blk_root_get_parent_aio_context(BdrvChild *c) +{ + BlockBackend *blk =3D c->opaque; + + return blk_get_aio_context(blk); +} + static const BdrvChildClass child_root =3D { .inherit_options =3D blk_root_inherit_options, =20 @@ -318,6 +325,8 @@ static const BdrvChildClass child_root =3D { =20 .can_set_aio_ctx =3D blk_root_can_set_aio_ctx, .set_aio_ctx =3D blk_root_set_aio_ctx, + + .get_parent_aio_context =3D blk_root_get_parent_aio_context, }; =20 /* diff --git a/blockjob.c b/blockjob.c index 207e8c7fd9..160bf38b19 100644 --- a/blockjob.c +++ b/blockjob.c @@ -163,6 +163,13 @@ static void child_job_set_aio_ctx(BdrvChild *c, AioCon= text *ctx, job->job.aio_context =3D ctx; } =20 +static AioContext *child_job_get_parent_aio_context(BdrvChild *c) +{ + BlockJob *job =3D c->opaque; + + return job->job.aio_context; +} + static const BdrvChildClass child_job =3D { .get_parent_desc =3D child_job_get_parent_desc, .drained_begin =3D child_job_drained_begin, @@ -171,6 +178,7 @@ static const BdrvChildClass child_job =3D { .can_set_aio_ctx =3D child_job_can_set_aio_ctx, .set_aio_ctx =3D child_job_set_aio_ctx, .stay_at_node =3D true, + .get_parent_aio_context =3D child_job_get_parent_aio_context, }; =20 void block_job_remove_all_bdrv(BlockJob *job) --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615992377; cv=pass; d=zohomail.com; s=zohoarc; b=dGzqUfM9dlZvFqpNXdVu8EyiD9e5z9VszFD+N9Oy652Ez1ijomvqhp0b64HfiYKR0eJbuxSns/vDbfJ/yje57m1g6K+Vi1jdwaXfcXPWcpEy6dxOcgYIdr/YPiKHY0qSDb8vLWPPDj7Bd0FkEEl9ksvNJVOrZ16wO862YipmeJE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615992377; 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=kYCntIuhTWAONDUsdbL/DKoFIDm9A8RdCqZNPDSsHVY=; b=bjcldF53pvF6uXu/hSiVONl/2BdFzMeCVMNWogCgJnIPbyWfzCMQOkxrn/DUwJ2pa84wPHJ9BaJUf8luzM7oA3mcZfNN7DhZB5FB1H8c8Fjvbp1YWTeROoF0pt0frDbk7x8TtuHPBvR02T0R562umPBeHGUWY7Y1+jEUkxhverQ= 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 161599237718564.17172299141725; Wed, 17 Mar 2021 07:46:17 -0700 (PDT) Received: from localhost ([::1]:58956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXRA-0006TM-0H for importer@patchew.org; Wed, 17 Mar 2021 10:46:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXHZ-0004KD-16; Wed, 17 Mar 2021 10:36:21 -0400 Received: from mail-eopbgr60091.outbound.protection.outlook.com ([40.107.6.91]:41454 helo=EUR04-DB3-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 1lMXHT-0006rZ-JT; Wed, 17 Mar 2021 10:36:20 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3544.eurprd08.prod.outlook.com (2603:10a6:20b:4e::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:11 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:11 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S0rWasMT1o6Fhmki/B2jNLD8ciE2H/rQK2EcOo/6hjfZInGsx3n5CZK1WrW11syY5vzH2UszWBWe7Es3dN2AV2bP/+Um0nTosA2Tr2c4I1S6PN/TYdbDWhhVd8xNkWLQoqMR+wumfCa6mKOR+0QIQXOMjcw3GSKQrID2thG5RVfg1S9mrlC74lOheWTP9xGO1Xc9LD4la+TPIxNWXt++lXJfyU5hNqLCC4qD0Y/Cd+Ig+zNmwA2TzK71EkqB1eFZT+/FPunQzi1g1A2iTmARUWcqbw8qRm/c+Eczg5jBkRoNzqIS6D47BrbBC6bHSHK1/Ixn6ImGNbdv/S7OGVvXbw== 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=kYCntIuhTWAONDUsdbL/DKoFIDm9A8RdCqZNPDSsHVY=; b=XMFPZM/WE8Z3GH6RYME4Il/w18Z5WNr2ZhYeBfom8uQ2ZjK1fd7asMeDwh6PGvczjH8l/FVLNi5XE2DsX3xvv29tTsPUQ/o69v+ccjE4lNQCSVA+JjO5+nNg3RMNaIpQ7jYlmIsm8HNqbub7HiIu9zGNyfGuHc1YxZ3ij+U5ZcGQcvVc0VNa9bsJCHsXzdfU+0KB6z50rYnHr0g/vneK9AJB1Jp2+yr9j3LSDfacunKsWWWONIo0g35E8z8izzoP1rOeJIF4M9wextI/HGMjfBriEoGOmXHYTeN1l6kdCxdmFt9an92nXdnlH0jx8+OOVynGH5RK36m3TsmMYClbrQ== 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=kYCntIuhTWAONDUsdbL/DKoFIDm9A8RdCqZNPDSsHVY=; b=PErWshqMEV1tPYZJqaMako4LoJpr2N/YUfljBTo3Y7vfMkvrCH/1akwUFpextqsrMIgC+4xQPk9wX/JP19AqqPRW2BL1o8cSqQaUrtCbbjP/aEwr5CwFPwIzFiJ9V/qLDR6XrTU2S9BE1VGL4LQcMMZIHI1tpxgL7FiyvnrhiAE= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 06/36] block: drop ctx argument from bdrv_root_attach_child Date: Wed, 17 Mar 2021 17:34:59 +0300 Message-Id: <20210317143529.615584-7-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: 893c5a51-c0c0-4afe-3105-08d8e9520266 X-MS-TrafficTypeDiagnostic: AM6PR08MB3544: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:576; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rZlutG8D0euTrThj3WGEW9UgR/y4+AbZubgMi5kvsILpmah0Ege97LEwLyusZcWmptW3OrL5bq5tgRGbaRNOjKjF/a/iejVDqTijbi1iOOhcbB8cbNExGNUYQ7cOV+5AVFrXpZErLYmw1nWCuTlMqQr0rcr2/rkNYsF6XV0Vh2Rjl3MNJYGvbQ4Q1YICSGy3yo2jsQe94uly8wqByvBRZeT5ycasNh4LHGZnRD7RMnIqZ0/VEHBQfFKLL2r2rlR6EoC+KKCH2W7QoUapfXCKEPd7cEp8ILRissMHqrzv4qPEwRvB4scWTeX+kycgyR46tGgQZCCY4DKf7lEFPfwSEmrXJKcMF63t+TBwGqPG5sO/XZaDojKtCF381RIdlbEFWrGr6N68AE0yCVLPM81CUH7TBZYHO7fVOCtjwUsE7Y0qf/S5dW3qV9pUosMeDSWbkrpI7NI7W0H17hAtfSSQ5sLH+ccC03+XvjQOyQqRxdINzCVKQNq0+QbOXy6QU/g69qEazIvZIXzO2mLy+bk7Gk1ZowaBHDtFkTUIyAC0UXxg69t7bywaKF2ZMDwjx+loF9FUAEyLJj1l27tilJV11ewxTSgbdpJ/d3Y2bP05SGaFrdlXGsZvj7j+d8OnGK0w 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)(346002)(366004)(376002)(39840400004)(136003)(396003)(186003)(8676002)(16526019)(26005)(86362001)(1076003)(52116002)(36756003)(6916009)(66476007)(6506007)(4326008)(6486002)(2616005)(5660300002)(8936002)(66556008)(66946007)(83380400001)(2906002)(478600001)(956004)(6666004)(69590400012)(6512007)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?FACuCsE79YHWH0lEQJ2+wLX1808Nigddd5ty8FZVjW/wU76fs4U1XLHhjb6l?= =?us-ascii?Q?PjlZq2zyu0sidcLYb70Hc0P6pqC7ekXlK4XY95YqkOIhLsyVVC+as78x6oeX?= =?us-ascii?Q?yYjf7Y8cujAMar77TcPyEgm6211FE1XFWOBj82rWBDrtXAKDR6Rck3QDMxqm?= =?us-ascii?Q?1em0JJS9aMH3WHTw/VXSt2VDhqc6IvJf+h+UmsSbELbKNd96bXU3Izvrtmy/?= =?us-ascii?Q?c/6vySIdhOk2kYNpz1DUuNFFX1DYJvBhVmyqzHfeaxu69YMmhvkV27yk4B+c?= =?us-ascii?Q?tZbYFsSCawg5m+gkX9ae/vs2FhYiiugfO665cm9iZKE9kiyxLMBHPA5nbBVi?= =?us-ascii?Q?zqTEmOY4W3x1A6kkQNJou1pWXdfZkiGA3fn8xNX3m++2nFFnWk9/uosJjkuU?= =?us-ascii?Q?T9oBGthpwS2aYTwB4xbs2qzxPOcbQzzz4Rwm/zXw1HKpH+SlWiLdclTPsPi5?= =?us-ascii?Q?YVSclcSzEztF1rjZ32tazIv+Nju7fz/FvohyGbtQ02wYR9vSsCkziAnu1lOc?= =?us-ascii?Q?K/XK+18fNw99WmqU01DcmBDzNPE6hbtQOyQK+bgZR0JGxDMCaL07AkDw5knm?= =?us-ascii?Q?X73VrS3W+GnwzzcI6xTB7Xey/W4IrEgFu/+pLJYV0w+YxN0GgTeDtJVcUJP1?= =?us-ascii?Q?raCcwTuxzXkwO4afa+RxVaCqzfN9EWYMJQBx9/9V6D8WcdsjMumdEJnZNmBj?= =?us-ascii?Q?KYmC3iWOcpGNke1UPz1oLq+Cv9ciNnKRI4+/ZFBnWr/XcWXSShq/p4JKHDPs?= =?us-ascii?Q?dPQ0rV9T4+Cs/GZMcBWuswwpPlRe0BHw3ffhTJvOe9FqAuNNpZh2qoWzq7kU?= =?us-ascii?Q?PN5QqAY8OULHLwyzDJUV4BOu6Y3SYDxvkW0gBk960v0Esu+sZXiQXrJIbdIf?= =?us-ascii?Q?s5g2oLW3e4NbcrnDuMl8eoPqS9piNmXUHQklCxL8nk+Zh+T8YP47tcBktq9G?= =?us-ascii?Q?+N0rpCw0nku936zGjeVR1Nbwc0ONfdsSBJeNWy9PbCp1ycA2cW13gm+zkHkc?= =?us-ascii?Q?5rloUQemy9jPKtqleGv3d5U3Z4/Nm2pCHpqDr9wbkzkOjHEyjxH7ybrEReRf?= =?us-ascii?Q?5qR0pXPol90HgJUz/HYZUM0EecOsJO6IGoJAKc4NLUNbgEMA3/siNDTxetQJ?= =?us-ascii?Q?aKTdbsFZBlldtpYXTcTlG74xMvxwgb2SELTRJVBC8kGDPaP3QjF1EokpY9CQ?= =?us-ascii?Q?z1AtvS4OssHDmho5PPiCBn8+dF/f5yWkgbTJ/z0QoBdec8aoDrh4egbL1J1g?= =?us-ascii?Q?ArXO/6+3uE50OPf1c+exY+LJ6KK8eRlhr2hIvOp8G0F5Raw2HNuIECx+Tjti?= =?us-ascii?Q?WhsSZJLZawaye0Xvy8lnh9zW?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 893c5a51-c0c0-4afe-3105-08d8e9520266 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:11.2275 (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: Uc21KAQzS7mYB2uUHJeqHgof+BFV+IFPrmtibA+eII9uMYF2XlYNYAvdWLFENddp+ezahNy/KY1GdW+1BjSQ7y4WsyJ/T9P8JoVkefnjggo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3544 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.6.91; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-DB3-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" Passing parent aio context is redundant, as child_class and parent opaque pointer are enough to retrieve it. Drop the argument and use new bdrv_child_get_parent_aio_context() interface. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Alberto Garcia Reviewed-by: Kevin Wolf --- include/block/block_int.h | 1 - block.c | 8 +++++--- block/block-backend.c | 4 ++-- blockjob.c | 3 +-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/block/block_int.h b/include/block/block_int.h index 737ec632c4..dd2de6bd1d 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -1308,7 +1308,6 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *c= hild_bs, const char *child_name, const BdrvChildClass *child_class, BdrvChildRole child_role, - AioContext *ctx, uint64_t perm, uint64_t shared_perm, void *opaque, Error **errp); void bdrv_root_unref_child(BdrvChild *child); diff --git a/block.c b/block.c index 2c80fc1639..61703027ec 100644 --- a/block.c +++ b/block.c @@ -2666,13 +2666,13 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState = *child_bs, const char *child_name, const BdrvChildClass *child_class, BdrvChildRole child_role, - AioContext *ctx, uint64_t perm, uint64_t shared_perm, void *opaque, Error **errp) { BdrvChild *child; Error *local_err =3D NULL; int ret; + AioContext *ctx; =20 ret =3D bdrv_check_update_perm(child_bs, NULL, perm, shared_perm, NULL= , errp); if (ret < 0) { @@ -2692,6 +2692,8 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *c= hild_bs, .opaque =3D opaque, }; =20 + ctx =3D bdrv_child_get_parent_aio_context(child); + /* If the AioContexts don't match, first try to move the subtree of * child_bs into the AioContext of the new parent. If this doesn't wor= k, * try moving the parent into the AioContext of child_bs instead. */ @@ -2752,8 +2754,8 @@ BdrvChild *bdrv_attach_child(BlockDriverState *parent= _bs, perm, shared_perm, &perm, &shared_perm); =20 child =3D bdrv_root_attach_child(child_bs, child_name, child_class, - child_role, bdrv_get_aio_context(parent= _bs), - perm, shared_perm, parent_bs, errp); + child_role, perm, shared_perm, parent_b= s, + errp); if (child =3D=3D NULL) { return NULL; } diff --git a/block/block-backend.c b/block/block-backend.c index 3f656ef361..e4892fd6a5 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -435,7 +435,7 @@ BlockBackend *blk_new_open(const char *filename, const = char *reference, =20 blk->root =3D bdrv_root_attach_child(bs, "root", &child_root, BDRV_CHILD_FILTERED | BDRV_CHILD_PR= IMARY, - blk->ctx, perm, BLK_PERM_ALL, blk, = errp); + perm, BLK_PERM_ALL, blk, errp); if (!blk->root) { blk_unref(blk); return NULL; @@ -849,7 +849,7 @@ int blk_insert_bs(BlockBackend *blk, BlockDriverState *= bs, Error **errp) bdrv_ref(bs); blk->root =3D bdrv_root_attach_child(bs, "root", &child_root, BDRV_CHILD_FILTERED | BDRV_CHILD_PR= IMARY, - blk->ctx, blk->perm, blk->shared_pe= rm, + blk->perm, blk->shared_perm, blk, errp); if (blk->root =3D=3D NULL) { return -EPERM; diff --git a/blockjob.c b/blockjob.c index 160bf38b19..2fe1d788ba 100644 --- a/blockjob.c +++ b/blockjob.c @@ -229,8 +229,7 @@ int block_job_add_bdrv(BlockJob *job, const char *name,= BlockDriverState *bs, if (need_context_ops && job->job.aio_context !=3D qemu_get_aio_context= ()) { aio_context_release(job->job.aio_context); } - c =3D bdrv_root_attach_child(bs, name, &child_job, 0, - job->job.aio_context, perm, shared_perm, jo= b, + c =3D bdrv_root_attach_child(bs, name, &child_job, 0, perm, shared_per= m, job, errp); if (need_context_ops && job->job.aio_context !=3D qemu_get_aio_context= ()) { aio_context_acquire(job->job.aio_context); --=20 2.29.2 From nobody Fri Mar 29 08:09:31 2024 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; arc=fail (Bad Signature); dmarc=pass(p=none dis=none) header.from=nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615992141021965.3978873698852; Wed, 17 Mar 2021 07:42:21 -0700 (PDT) Received: from localhost ([::1]:47112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXNL-0001Vr-KO for importer@patchew.org; Wed, 17 Mar 2021 10:42:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXHc-0004Tl-PS; Wed, 17 Mar 2021 10:36:24 -0400 Received: from mail-eopbgr60123.outbound.protection.outlook.com ([40.107.6.123]:28737 helo=EUR04-DB3-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 1lMXHa-0006ux-OT; Wed, 17 Mar 2021 10:36:24 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3544.eurprd08.prod.outlook.com (2603:10a6:20b:4e::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:12 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:12 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AKo+osNCbAiH++9bOtU4QObXJQDXLTvacsdK8ScuNtIs3hM1pfZNfhH6DdAbZrBVeVGb0e/Nj+XHxc3U6n4AHCvHkMYir0mz2SmiTbOFHoeiBw3vSFoHghXfPS2B+WqbXS5exUAMsniPJGOyekl0fpceZVxnvXEZDEEzlWBk38XKUlq29AjZ4BNOog9/8aX+FRDHkesN0e6ShcF+xbZgxcp9QZkBE6JnoQSQeiCVVrzYWX/pCvRfMvXj1u1zuO2wR7Es0EUIa2cT8bvnqMjliTvbRAzpPdKvnAVL8W6+ZMcvlRmy6yqzWkcR1RbGYfIJ75lU9/6TQ9UoP0Ixg5gQuQ== 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=LXz4brO/+ecQ8hx5vUwvnOMg+EuTEt/9meSVqnGu+r4=; b=Gd2tFu3279tnnnjF34qPEG4iSz+aUwKIvA0nhvPu9wCcCiJ6hACiWQBJfCt9OSt/7qEUdIN8aFpo9UJgYTtMQB7nEkp3xzC1ZpG5KpqSmx650DANcssccJeXb8kld6lcQWLtt8/EwtNscdBRj7IHdOvkkjFRvt0KgVi2llWxMe3VlpB+sLbDsRnjbQV6wCtlyn5fQfncJK6hiNRSNrxZX4zKszFTPibo33Y26WNOkqXWUHyVNs4IBvxX0Gw1Z74+crpOHtZR4JktdFw38bOH3Col7ttpwc3NA+ug2tMAhjoc7qK24t4F/uJPnJYJtG2UDc94fwP3q4YzDwEhIGJlvA== 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=LXz4brO/+ecQ8hx5vUwvnOMg+EuTEt/9meSVqnGu+r4=; b=Zk8q0XrvEMt978RvxHGB1tPZ6viZ8+B/gtzWKeqAXXi1APh0y0HXjfUIwtTg7odAgmi1WxXk9X2PrSssBxURySdi4qMz+mlc1/JfXEnNxLDWch+Jf6AXzVr+Yw9rKxuL8B512WHX9oKhbS1Ym8kab/0ZgskXpVL0/uo2tPkSfyk= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com, Alberto Garcia Subject: [PATCH v3 07/36] block: make bdrv_reopen_{prepare, commit, abort} private Date: Wed, 17 Mar 2021 17:35:00 +0300 Message-Id: <20210317143529.615584-8-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: 9757d11f-78b0-4ce4-9497-08d8e9520352 X-MS-TrafficTypeDiagnostic: AM6PR08MB3544: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:446; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Pjm5ZW9AAFW2mshxGC5u/l3g9ggIkF3hiatZ4nWG/Qi7WgoWnJ0iyB3upgQyoB6PluyfxrDsGx/1nnBX65rEUJlkP0waDt/mJgKOZ7gHTNHz613VbqDhXD/9gFrJdXA8vm5xkLtrEbM/Ot16/2j1XSr58MZLa1CI5dKXXRiD+Jr9gWUuyCaSL3v4M7NhV/JY7cswbBALjhwemft4jEwTNrbdQI7xosNpyUFHD2js/Iydf7Ta9QCvyg5Pn41SIhf3QJYzQ9yZODB2sGVZJMYlSidRY/PhkPvugZEgQ0zdRFzIbsfpFbT6plEDM3aY6LQLr4/Q8AjZgFP9Qr5X8KJ6PTwrPwuML+3jljpHVjzs/OmMASdtgczk/AEaLT9F/RCusZAlyfUlL2Rv7nTZHh4Qwha+JsON4XQoZ7+ZQA0/xWSDsHhuE4dwvEjWOC+ud+QM6je1m0srl5wuXBtEHuWn62mVwz5slPia4V96k0+cQAhYGLLFAS/Q33rcGrmp+E+PQiByNFq+qGX2ghJKVTYnqm+Abmc3Dx48nqEp69JO1IU2YM5J8xkcmA7Cxdu1TkDD4L9L3gQQhTSUBr00dXXx7wkRtHnl25jeS/EBdhhSb7KzmyTNgbh9D5VoTtQqxGxh 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)(346002)(366004)(376002)(39840400004)(136003)(396003)(186003)(8676002)(16526019)(26005)(86362001)(1076003)(52116002)(36756003)(6916009)(66476007)(6506007)(4326008)(6486002)(2616005)(5660300002)(8936002)(66556008)(66946007)(83380400001)(2906002)(478600001)(956004)(6666004)(69590400012)(6512007)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?+sWvqPyroPXp1Wx2fJt4rPb3N5E4LnSno9crR0u8+1+LsTDW8aBRjoxHt7f0?= =?us-ascii?Q?suRDaXLcr1APGGjDZVQBvHXEWEHzOzO8433l7inxPEJ/nTcFDG9/qokjsI3C?= =?us-ascii?Q?+HWnX4Ts0TOJZMAZnbDP9h6BbkukDCaTc3zDRTgoUScsK/D6ymBn0Anhb6CH?= =?us-ascii?Q?mWxi2Bs338MXUj/76E8lfDifWBVsdV3r5+zdKaFBsrHCZKZTlZu/0GN1mJaN?= =?us-ascii?Q?eQSd4GnloST55TcF2fysZllbzbbrJSBpsJwZ+aIL9t7dExQARaxyJWmMJRu+?= =?us-ascii?Q?ICRhs+dj/19qnT49kqD/eD9Z6UD1KPZmbeqb+RYMwyooY2gSUF9DZiXJCi6l?= =?us-ascii?Q?+VMVg33FcAKngtNt2PMFs/EkRlPW16/ADesUQE/LHYGGs1iJqHMw/aF2Rk/t?= =?us-ascii?Q?pt30+eCPJo3a0nrSfRhFAqFbv0gN8XIpmpTDDRWDsajbgIXq+otfoXvlanah?= =?us-ascii?Q?aVldzQkbavQgBIzz3bEBnio41SbjgwHKZFvpXtf2QZc7bGCAVd1/lyVR7Sv7?= =?us-ascii?Q?s4LGQzqtN5IFEejFjGmMPUF0bOCXJtT02NKERMtp59/uEgP/rleq0VThoO1q?= =?us-ascii?Q?bPTcstmcBAmxlyUSSQhNxWrwXNMuw/YCkjLSAXPVjpblntL2Ow+cSIiKRudf?= =?us-ascii?Q?Otadv05OkuyL0neOMIry/a0+3TTK9ua2kPRrhce0HPVAnhGwXw2jFTmTymU8?= =?us-ascii?Q?uGJcIFtLCK5HZicSdmkJFa00Cet5O0zJBQBqY12Dgb3TcfgBdXFRS/v1eTiL?= =?us-ascii?Q?yFI/QUeMxMwkZ04vxM+l7scX82erRSH5ZSzB6zGfpyNsCXWRatZZrGOexamA?= =?us-ascii?Q?oQv91kl+E09ER9jZFkuHgJ5tH9LVi8daei2dAh7feSY4nX1Xuqpky4Q0ZC8o?= =?us-ascii?Q?zsXizm370eE0Uogvch/WFvNvPrztYzEzU0ZT/0akkmGxfACSdGukcJQoprnd?= =?us-ascii?Q?E/Y87c5hYgNOtV7080yUoai8sDAfjmHgGWPRb89RgX3t6Ifm6IihqVOhdqP5?= =?us-ascii?Q?/8LDK93AjgLzF21IwrmbdjUUhyfVM4s+3PJDkCySVSoUZ9wXUEejMehp/GnT?= =?us-ascii?Q?FcyrvEV2zrwYElt+2Bhgw/ImvqRckNeW9KhRfCu480srUPrEnZuH5NPiFXlF?= =?us-ascii?Q?QV+IGbFJ4Krhg92lzJDNZo+NfB/lkoIbSmH/QB6B9p4V6vAXnJemhgCOgZFg?= =?us-ascii?Q?D4D17TJaV35uADsL6TWuKl5gqV+4S0/sq02645QQ068XBFfvxlQfp7Rn4bbY?= =?us-ascii?Q?CiwdEVLUpR1EZ4Cheub/54Ugfxg6kDAORWjAWZt0x2uYgM3d/TraVWcUk1Lp?= =?us-ascii?Q?txt5/ymraV20X/dkKMAUN3UD?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9757d11f-78b0-4ce4-9497-08d8e9520352 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:12.6822 (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: ZRSIor2OwmGcI6ocS34jukEpPM16Z2jr0A092lK7zZgUn+sTbftwVzMjqMnFiAGxJr2TfzveTC4VNjmHaa7nYb3NeIdR7ZjbLdxscihDNUU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3544 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.6.123; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-DB3-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" Reply-to: Vladimir Sementsov-Ogievskiy From: Vladimir Sementsov-Ogievskiy via X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" These functions are called only from bdrv_reopen_multiple() in block.c. No reason to publish them. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Alberto Garcia Reviewed-by: Kevin Wolf --- include/block/block.h | 4 ---- block.c | 13 +++++++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/block/block.h b/include/block/block.h index 54279baa95..16e496a5c4 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -387,10 +387,6 @@ BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *= bs_queue, int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp); int bdrv_reopen_set_read_only(BlockDriverState *bs, bool read_only, Error **errp); -int bdrv_reopen_prepare(BDRVReopenState *reopen_state, - BlockReopenQueue *queue, Error **errp); -void bdrv_reopen_commit(BDRVReopenState *reopen_state); -void bdrv_reopen_abort(BDRVReopenState *reopen_state); int bdrv_pwrite_zeroes(BdrvChild *child, int64_t offset, int64_t bytes, BdrvRequestFlags flags); int bdrv_make_zero(BdrvChild *child, BdrvRequestFlags flags); diff --git a/block.c b/block.c index 61703027ec..b951ecb5db 100644 --- a/block.c +++ b/block.c @@ -82,6 +82,11 @@ static BlockDriverState *bdrv_open_inherit(const char *f= ilename, BdrvChildRole child_role, Error **errp); =20 +static int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQ= ueue + *queue, Error **errp); +static void bdrv_reopen_commit(BDRVReopenState *reopen_state); +static void bdrv_reopen_abort(BDRVReopenState *reopen_state); + /* If non-zero, use only whitelisted block drivers */ static int use_bdrv_whitelist; =20 @@ -4119,8 +4124,8 @@ static int bdrv_reopen_parse_backing(BDRVReopenState = *reopen_state, * commit() for any other BDS that have been left in a prepare() state * */ -int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *q= ueue, - Error **errp) +static int bdrv_reopen_prepare(BDRVReopenState *reopen_state, + BlockReopenQueue *queue, Error **errp) { int ret =3D -1; int old_flags; @@ -4335,7 +4340,7 @@ error: * makes them final by swapping the staging BlockDriverState contents into * the active BlockDriverState contents. */ -void bdrv_reopen_commit(BDRVReopenState *reopen_state) +static void bdrv_reopen_commit(BDRVReopenState *reopen_state) { BlockDriver *drv; BlockDriverState *bs; @@ -4395,7 +4400,7 @@ void bdrv_reopen_commit(BDRVReopenState *reopen_state) * Abort the reopen, and delete and free the staged changes in * reopen_state */ -void bdrv_reopen_abort(BDRVReopenState *reopen_state) +static void bdrv_reopen_abort(BDRVReopenState *reopen_state) { BlockDriver *drv; =20 --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615992362; cv=pass; d=zohomail.com; s=zohoarc; b=aBPSnLC2l8dBYLDGf3dE4V3Mnu1BpJc2cwONJu8g383sIB69jj3FLvr7A687UDEg6+6EE/7AIj/KMHTt3YgcFWeB4MNXNcnXdp0wHmMfSShjzjDZSBHOyTvGuFHA9SlyuFJDPUu/zBuIe2FV0mpQ2d5ylr3TW30BKWrYhTwrEkw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615992362; 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=38KeW3Z/OP1AkNBh5V4c4IuqPMb+O116Yw2N5E2fwLA=; b=QRnxNjU2Ml7W9JxJZgcevZDwy94D4+hSbE3Pdi/v0aBwifbNOjNVE5axqokwy9shGi3WNGephXnMrJHivGedm/ma9h8IAxK0jqBYWHMRDxwcEEQgEwgGHAhNtllzbeGYFrF79ftN2AUMEJpWE+1jCuRgTK+YVdXjq9lhtKxP+K0= 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 161599236277493.0237196339558; Wed, 17 Mar 2021 07:46:02 -0700 (PDT) Received: from localhost ([::1]:57784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXQv-0005vD-KB for importer@patchew.org; Wed, 17 Mar 2021 10:46:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXHd-0004VQ-Fb; Wed, 17 Mar 2021 10:36:25 -0400 Received: from mail-eopbgr60091.outbound.protection.outlook.com ([40.107.6.91]:41454 helo=EUR04-DB3-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 1lMXHZ-0006rZ-Rk; Wed, 17 Mar 2021 10:36:25 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3544.eurprd08.prod.outlook.com (2603:10a6:20b:4e::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:14 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:14 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:12 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IVgaz57h9x0tFHulLSrV8ty/ubwATZ3JhfvUHFCfJsFokdCKpUeYT1fxSKHa21vLlodzSFIAK8U2tCrySa4LgnB0W+UjzI1eyCoL8TaOkJ0g2nf28tVMPJWggKiJdAmtB+nFcZpsW4hiWFv/ceH4W65dZefL2ddXXfVhMJYVBhJjaXXoeyPnrXsdvvpaBljnQKz3eYFBT7FPF1HnQdysBZgv29DRZ+prAolGjx9jgVEvsGnXbQS0Ww8157hAil1/uZvAM4tNhd3YJHdkYneFup0jXZhS03vSeOsDhKe5ZfnyYnn4+lHLgBxGSt1IH+Oyg1BbcG0kTP4k6hUiK+Nk0A== 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=38KeW3Z/OP1AkNBh5V4c4IuqPMb+O116Yw2N5E2fwLA=; b=bAz3aDya4ZQqCuT4V8Ts/hA5Zj05L85o2305lBpl1Y496Q5L8ExWBdpxFSADG5FyBQ371GCNIkO5g51+e2zO2EVNIW94QCdOq+tExH8X+aQcnFD99XTnCL8M16KCbvMKvkXLbzFADwIgHU9LlfXr2FdadLHRKSLmWFmCqacjWcyG4sO8edD22ZZKc+WSJjXPdK3M+4xkpzBq8aZrpkkv2nR2X6BsWleN8D+chiuiM8EcR4WBByMtSaNqz9SrVDSfBDlgr6L1JCVuWctGXbNxpqn2QZ9bhzidkst6AETunje84Ps3jMQkbo6GDMei/CFIQdu7/O/3LmCLWkMe0v/tWA== 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=38KeW3Z/OP1AkNBh5V4c4IuqPMb+O116Yw2N5E2fwLA=; b=WXbPUR9yN/qReBHsN4b6pOD7AmO43q2fkKYr7TrNfwo7w7g8BUQGED1OdsKYpmgp6+sNOJcWTbAomcqehxwj6wPJDABqKsKDSZh83Ad9wDiV9HmIcnLgwo+WURRY2AqPj5MxMD1n9JHgS4j4KJsXEU/kAzj6sK3aCrw8RV7ory0= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 08/36] util: add transactions.c Date: Wed, 17 Mar 2021 17:35:01 +0300 Message-Id: <20210317143529.615584-9-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: 2f49f786-c9ca-482f-bcad-08d8e9520420 X-MS-TrafficTypeDiagnostic: AM6PR08MB3544: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LUKpOvUwoHertijUo+QAvz//ZZKfZyt/7uOMxbpwBBZmJW4SlbLFa/aVHDlPPbOdzkSvxLad6LYvmwJ9tGC/TO24cu3i4HhOImlWpTKvi7xDdfyhLAWGt2g4l4gMrwgS5Dg5bOhEIUN0PjoCkar+sBw0VzACe+wFQHiuOLpenLyojx/0HTmhoCEOquWFWgJwzoR41UhLsE/Cs1U7r2erPF5kNaBW1plSH8H2aMSJ+KIEYJ84D4wWIR6+cmsXS/qHQINeHaMaXJ6/j/cPUn6V/+I62UCjaZfRmTObRXPWUTBtUJGuVbz+RvMSXNndfbr/GAzE/f9oFQk59EjNU4smYCerbLaQNJf0pFPanYev1o7+Ikr+QIGQMdeIZMNgxXe5G68zfGr5hb96thHI3QKQ7T2IoPfdlssa/5M2hOnqH3c32Ht/inPXN1Iq76+XgzMZN1l8fDF/lSFGZSUKza0MuipypU/d9/KrhHNRbFLVlyI//kzVNHlKODeX1hR3Os5Jir/zPWLsmRHwyIVOJ71XTalUHZOdQmpMYmbtlNa4G4/Mjz87oCpprqMc06Ie9I6aKfxnTxAhZaTB0MEZMkmVqkqduYovJMjuNWP3Xt+Oc93zGweXBNibJKSg5juwY8pz20dI2nR3P8MMdl/HLtzyHkJP1pmttsXU/e/iY+DfKFK9JQxX0kTw2xnfeerw9z6E+5TXQ7QUFqLGke94LksW8Q== 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)(346002)(366004)(376002)(39840400004)(136003)(396003)(186003)(8676002)(16526019)(26005)(86362001)(1076003)(52116002)(36756003)(6916009)(66476007)(6506007)(4326008)(6486002)(2616005)(5660300002)(8936002)(66556008)(66946007)(83380400001)(2906002)(478600001)(956004)(6666004)(69590400012)(6512007)(316002)(2004002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?Wsu8OwrH2ntrRxWd2v7T0HZzr6UleWRab/xX2/gi5Sak0RNx8mVNF2i3OHJr?= =?us-ascii?Q?umascsr/lucfXov2E6n8+6X+1UsObsS9wIgMpOQ8mFbaxzHGVNispbDu0df+?= =?us-ascii?Q?6eXiYTZie7Z6CeudDJBhNzKgi/GbwgNGDZEuqowEZMjdwDnFIjuEKNKVWxRf?= =?us-ascii?Q?W77CwOFZ1r9rC+zVDdwZaXHnzDkB9APZsm1j7GIQbM7iYxzzsRzt+FkyXSOt?= =?us-ascii?Q?M1kibBGPB62+KlY78pxS7PwPGiMW+PtvcLlpjZl0UF6flCsAaQoVoRdj7fLV?= =?us-ascii?Q?SSSXBJftzlDc8W2t99TT2SF+b9Fir5UrEVfHPkTzRR8FB8tsQheDDAT62XFd?= =?us-ascii?Q?n5TmDE7envOcl3Ppleid6s+xbEmM52qpBrWPZ6vsIcbGqufMZsewNzRmPWWv?= =?us-ascii?Q?Q3FnJUiglYfpailNdw6JMGzbrRheIYQNRqY7wS+e24K/7aUXhfORtbIXY2KG?= =?us-ascii?Q?WYfe3wXs9cf/qVmTj/lH/8iDRInOWjgbq1KByWO8Dalaq6720k9Btbmi8Pf+?= =?us-ascii?Q?wax+2is45doVWWBYubuuuA78XggwDjYcc7eil0AFrkN/CQXrU25go/FiG0RL?= =?us-ascii?Q?ghWuZdieHylyQwGUbMeBDUAu/xckOx7Eb4stHpoYOsAj5RWhTsxQ/Ac4PHce?= =?us-ascii?Q?1H/YL2xMy+LfSbvLuIXgwkNbQ3njiTnARI4bCN31eQyQxxbU4O5QwocKY0Bj?= =?us-ascii?Q?/Hi7GAIO4iEP3sAzIm+alSTzpxihPSVWBE6qhRzDhfSq1cxhO3gK9pfHkwIZ?= =?us-ascii?Q?IJx8QP/6BdD+s9w1yKXJYAQ7e5/PcxVr0nyaU00Hw/fIDy4qjKKqLs9SAvEW?= =?us-ascii?Q?2dv3zSzPvaI2ud9HrBWUxF7WoqMdCBenXCaz4Tm/fpTGABaCSpG4XPKICUot?= =?us-ascii?Q?zjgT3gHGms1QfRTcZCWrYaSZvq4M0yEVnVVQhiXBukSQvrzpDsbVXmVb7RrC?= =?us-ascii?Q?NOxFuBfUozuEYesn32reMpt1WBsPQOJ45wiaNn4mVT13cTMz8Up75U5423nL?= =?us-ascii?Q?pG9HD3R2OCalM16lkn/QCoyLph5JtX3lEfo1jLdqD31HVQ7+YpFQmlVHHmv/?= =?us-ascii?Q?1PBsYY/XrUmKwQzsfzfxC/8yURmOeaVzFgHo5XGH+6vd2Uu4kNMtUiwizEX1?= =?us-ascii?Q?jQNyjgcgJhW374JDPAUxvJuzvMmS/SlsF+hlxMv99svvVzmkC+i+9C0LeefJ?= =?us-ascii?Q?DANzNksFwwLYO6WVAtzx39uUaYlE72shby8Q+02V/cXHS8/m+uvTKxdfdpX1?= =?us-ascii?Q?IeP7tIqdt2sDv7dlGkq1tK+wuKsEBpAB9JpPMPEW0ux6EL3zY1yOWdWrk8k/?= =?us-ascii?Q?17NPVQ6o922MTvp7rxAOMZKk?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2f49f786-c9ca-482f-bcad-08d8e9520420 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:14.3648 (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: w4AVnu6rCu76ql1/iAEa1Ack8zB4eNcm0So2U2qD25kqyKCKP/jxgdQZSYv+JtvLqw8DKewRL2Db0pdJZeCXqJqwY8zT4LrksbP5Zejq8vk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3544 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.6.91; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-DB3-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" Add simple transaction API to use in further update of block graph operations. Supposed usage is: - "prepare" is main function of the action and it should make the main effect of the action to be visible for the following actions, keeping possibility of roll-back, saving necessary things in action state, which is prepended to the action list (to do that, prepare func should call tran_add()). So, driver struct doesn't include "prepare" field, as it is supposed to be called directly. - commit/rollback is supposed to be called for the list of action states, to commit/rollback all the actions in reverse order - When possible "commit" should not make visible effect for other actions, which make possible transparent logical interaction between actions. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- include/qemu/transactions.h | 63 ++++++++++++++++++++++++ util/transactions.c | 96 +++++++++++++++++++++++++++++++++++++ MAINTAINERS | 6 +++ util/meson.build | 1 + 4 files changed, 166 insertions(+) create mode 100644 include/qemu/transactions.h create mode 100644 util/transactions.c diff --git a/include/qemu/transactions.h b/include/qemu/transactions.h new file mode 100644 index 0000000000..e7add9637f --- /dev/null +++ b/include/qemu/transactions.h @@ -0,0 +1,63 @@ +/* + * Simple transactions API + * + * Copyright (c) 2021 Virtuozzo International GmbH. + * + * Author: + * Vladimir Sementsov-Ogievskiy + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * + * =3D Generic transaction API =3D + * + * The intended usage is the following: you create "prepare" functions, wh= ich + * represents the actions. They will usually have Transaction* argument, a= nd + * call tran_add() to register finalization callbacks. For finalization + * callbacks, prepare corresponding TransactionActionDrv structures. + * + * Than, when you need to make a transaction, create an empty Transaction = by + * tran_create(), call your "prepare" functions on it, and finally call + * tran_abort() or tran_commit() to finalize the transaction by correspond= ing + * finalization actions in reverse order. + */ + +#ifndef QEMU_TRANSACTIONS_H +#define QEMU_TRANSACTIONS_H + +#include + +typedef struct TransactionActionDrv { + void (*abort)(void *opaque); + void (*commit)(void *opaque); + void (*clean)(void *opaque); +} TransactionActionDrv; + +typedef struct Transaction Transaction; + +Transaction *tran_new(void); +void tran_add(Transaction *tran, TransactionActionDrv *drv, void *opaque); +void tran_abort(Transaction *tran); +void tran_commit(Transaction *tran); + +static inline void tran_finalize(Transaction *tran, int ret) +{ + if (ret < 0) { + tran_abort(tran); + } else { + tran_commit(tran); + } +} + +#endif /* QEMU_TRANSACTIONS_H */ diff --git a/util/transactions.c b/util/transactions.c new file mode 100644 index 0000000000..d0bc9a3e73 --- /dev/null +++ b/util/transactions.c @@ -0,0 +1,96 @@ +/* + * Simple transactions API + * + * Copyright (c) 2021 Virtuozzo International GmbH. + * + * Author: + * Sementsov-Ogievskiy Vladimir + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "qemu/osdep.h" + +#include "qemu/transactions.h" +#include "qemu/queue.h" + +typedef struct TransactionAction { + TransactionActionDrv *drv; + void *opaque; + QSLIST_ENTRY(TransactionAction) entry; +} TransactionAction; + +struct Transaction { + QSLIST_HEAD(, TransactionAction) actions; +}; + +Transaction *tran_new(void) +{ + Transaction *tran =3D g_new(Transaction, 1); + + QSLIST_INIT(&tran->actions); + + return tran; +} + +void tran_add(Transaction *tran, TransactionActionDrv *drv, void *opaque) +{ + TransactionAction *act; + + act =3D g_new(TransactionAction, 1); + *act =3D (TransactionAction) { + .drv =3D drv, + .opaque =3D opaque + }; + + QSLIST_INSERT_HEAD(&tran->actions, act, entry); +} + +void tran_abort(Transaction *tran) +{ + TransactionAction *act, *next; + + QSLIST_FOREACH_SAFE(act, &tran->actions, entry, next) { + if (act->drv->abort) { + act->drv->abort(act->opaque); + } + + if (act->drv->clean) { + act->drv->clean(act->opaque); + } + + g_free(act); + } + + g_free(tran); +} + +void tran_commit(Transaction *tran) +{ + TransactionAction *act, *next; + + QSLIST_FOREACH_SAFE(act, &tran->actions, entry, next) { + if (act->drv->commit) { + act->drv->commit(act->opaque); + } + + if (act->drv->clean) { + act->drv->clean(act->opaque); + } + + g_free(act); + } + + g_free(tran); +} diff --git a/MAINTAINERS b/MAINTAINERS index 5ca3c9f851..d5e6ff2224 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2514,6 +2514,12 @@ M: Vladimir Sementsov-Ogievskiy S: Maintained F: scripts/simplebench/ =20 +Transactions helper +M: Vladimir Sementsov-Ogievskiy +S: Maintained +F: include/qemu/transactions.h +F: util/transactions.c + QAPI M: Markus Armbruster M: Michael Roth diff --git a/util/meson.build b/util/meson.build index 984fba965f..3c39631bfe 100644 --- a/util/meson.build +++ b/util/meson.build @@ -41,6 +41,7 @@ util_ss.add(files('qsp.c')) util_ss.add(files('range.c')) util_ss.add(files('stats64.c')) util_ss.add(files('systemd.c')) +util_ss.add(files('transactions.c')) util_ss.add(when: 'CONFIG_POSIX', if_true: files('drm.c')) util_ss.add(files('guest-random.c')) =20 --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615992524; cv=pass; d=zohomail.com; s=zohoarc; b=YXLwyQYINNxEd5lq51M91XoR+8J3/XinO6eXgaioLT/jhdTzB8fJ19rT/ph3HfI3xUjwUgkn1vJjA5xXOAGw3TahTWrKehLNRaGAdXkWJ04TPtxjztwRlxcf4XJEaAFKAdU4j0U5LU+b9gw6tXgCr0Xy5JMEjNE40P+sTlB6Emk= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615992524; 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=xpRvbR0wIk1u+mqbe+3IGqgyETTOJ4zPJnwNMWDLSLQ=; b=mtQgN7W4k28j+wyMgnRZkX4EBzB0QgDDKAFbJscDduHFqjUzyXbTI5Z3ttZhtx6o3/BWtsf/ydZeOKgXTEMosIlqIXzZ1JczRGD3PkuM6Y7WwRhR43oVgJO05cwe12R4OyIM1elEdwVK/HZywslZ7FGNevvlM3kS3jNTn7XyWZU= 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 16159925242991004.1389203765688; Wed, 17 Mar 2021 07:48:44 -0700 (PDT) Received: from localhost ([::1]:37740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXTX-0000wv-6J for importer@patchew.org; Wed, 17 Mar 2021 10:48:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34562) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXHf-0004au-BN; Wed, 17 Mar 2021 10:36:27 -0400 Received: from mail-eopbgr60123.outbound.protection.outlook.com ([40.107.6.123]:28737 helo=EUR04-DB3-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 1lMXHd-0006ux-EX; Wed, 17 Mar 2021 10:36:27 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3544.eurprd08.prod.outlook.com (2603:10a6:20b:4e::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:15 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:15 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:14 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WdeUme95+4yebyOoddQVksrcUHzOV2n3+EBYBbtoKDSRI+Ndh5GTVV02femiGaJIIayyE2PDBR4JX8OcGM9jA6JApAaA7iHtLLMJ+Isj20pdwAIs1mOuLhDqOm7SIDwbUoHzfOj9yqSjLb+ZrV3oLRYAuLCVYsxzzTBkoGWrA9ykEsNaqnt5xwA9evlYalR+AkM/WkSSMwiX83jRYlFw4j6UHqUZvFrNedT89hjukT9HFLAqUzU/Q3vkWmh59jV84XRlNUjCFuA825ikHwHYTJ4MM2/Nu8Ps43XW7+34LyYmFVdMJkcAUHYDubBAroGHSjXS4uYzxXRnxb4uxNrrNw== 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=xpRvbR0wIk1u+mqbe+3IGqgyETTOJ4zPJnwNMWDLSLQ=; b=IanWCjZwEsGcENULYYtUGGivkqwUYq/clwWcdKALoX5kWf4CiJESrdgEZMbU/kL5MPe4oJ8ZMoqopH7wX5SPz8YQjYbNtzdNa6qv3BJGfDvAUSB1z+Y8ciRSlG1KZdhAFkldZtgVDZ3caodiYXjTV5EltZk34U7eemc6HZaUNXWy0uUjb3YP1gkT9jWdFPn/EZfOpj3jrOBVm2RzRoXDy8uibml6Y+wuWJx+/UEzzjXx01mwR95bEmdwMcIAeyEXZuCvdDH5eGO5u/ecIS82GoOi6d+Jz97HvALGue1C6kkxsTbIpls5240Wej2Wq/Wjeqt3Ld9gsNdqmCZ6CRSGZg== 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=xpRvbR0wIk1u+mqbe+3IGqgyETTOJ4zPJnwNMWDLSLQ=; b=sMm104LbDqvSoFYyVwjuA1VdfYSAzpvyzn6j8ZovB5awL1f8/SMbvXENWqcgdU5hwkGgg+QaH2Rtpt4GFjlGGlth0TKydYisQU/3VFebzyxjBWAcgsQlr847QYrfNXjUhmj5gJ3xlM7V1qX2ADCARN3yDA0abWKsUJVHYmgSNxo= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 09/36] block: bdrv_refresh_perms: check for parents permissions conflict Date: Wed, 17 Mar 2021 17:35:02 +0300 Message-Id: <20210317143529.615584-10-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: 4f3fdc70-90e8-413b-3460-08d8e952051f X-MS-TrafficTypeDiagnostic: AM6PR08MB3544: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2512; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6giYb/uLaLRKIH0xmDJveT/551CClhcM59p8syZFPHW1LfZ7qI2n8lqdNitn+LXrBYtunUhDusKEFag44+iYzxmjYSWLMsG1KyNGS48I7HptyGDd8j8nE8Z6rBwGJkpleVHNo0wQFWIXhs4/gQMbV9cCVt3WD0jxJekxOSrJaiuO3KYhgxI8y1KZ/zclYPuN6Vp6VK2duaJr4RA/vwKamYtioIeXFnm8qQ1Ijz47KqQ3cdrPm7iIc57kwwgRSFJ9E7JKIrW9vgSIxu/IQUAPOw35rT37giBn5+M6bldpvCxmYznTVGKZE7i80A8IadWe6ASKy2ZWXZ7h1FZClzMXpUMl3Qg2lSx7uHB8325qPZOCxi9c7xLMNFP8Jzq7kshvAfCIB5Y813cRLninWVJuLGI8pLLEAM9f+7ikGhb4FWaAjkArl+9OQWw2dG/cFdre75RQZv2Pj/EIlGlI7Yb84XsVAgbrd9YuRM59do+nZNXnXGZEP1fQkPR1hqFY8YFip2IuxBsSHU1DKTBZq5WZGoJsJ1BiI8Kslad7f9WV0I0YYg22dzN8VkWqbAIFaNn+pGbTb71YLiGA+jetJo0t5Jfr9LLgoPCPgEVQ3xYlqS8= 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)(346002)(366004)(376002)(39840400004)(136003)(396003)(186003)(8676002)(16526019)(26005)(86362001)(1076003)(52116002)(36756003)(6916009)(66476007)(6506007)(4326008)(6486002)(2616005)(5660300002)(8936002)(66556008)(66946007)(83380400001)(2906002)(478600001)(956004)(6666004)(69590400012)(6512007)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?tpitBqe3SQ6LZ9BuPZ6z1lmOo+65CIk7XU87qS8Wnlz+AzyuXNPC0uKVyNsp?= =?us-ascii?Q?Z5qM9dB/3QYd6EZclCN4NSSLPrF4Iyb+OESW9vwngP9dzxvWHdGuXa4yf1j2?= =?us-ascii?Q?YqSLgciLL6J64dxFhYFZGYj7XuXCs7/w2Tb4GtjEJ/vA0HvDfOaDKZmVnFpw?= =?us-ascii?Q?u61n+7HcAtmNLnlRdFinlYD52FmVQjx9OYrV9Hju3PbnxKPbNlJt0wyJroSB?= =?us-ascii?Q?H9IUTHoqGodo1Gp81r2YYhZFqZJWIWuYeE0opoEqcM1DvOZI6GyleGOIQNgE?= =?us-ascii?Q?K5yJ/r/qrYY8OReieo3FMqc0VfRUuXjEUNmJJOhwEG1IyyhFbcEtjwbFDkTZ?= =?us-ascii?Q?cBCnRwfLI1K/RWlO5TRd/8lkafLQ89HNwPA5+EZia+gnHVY2AI8gKQHn9WgC?= =?us-ascii?Q?e3MD+jjB7pOffi6p14gfvn4nu4mitBdNVCjt4xl+wbRMF6bGyRQiHwII6OqR?= =?us-ascii?Q?ynyKEQ+o3sWNj3YVrTFtKNOLST6mX/VNpEOt0e5ZQvFuHh1hbXQHM9yCJhRC?= =?us-ascii?Q?Nnbm9c9fXzIyAVP74qQHaPTh+ErDlHCXFgp9uT4dbPiOIKOMGZPuLpSEmRK+?= =?us-ascii?Q?Q8AmCW0Ibaig1njKkvvm1vwupgnke91Arw9yUkPNy/OiFWvKDXyQqBQncFTb?= =?us-ascii?Q?zvP/wZIu4Lwi6RJVcCnYDt+mG5Ys/E3w0jaEQlhHH2+CI/C5CpYJFrvKl/Lg?= =?us-ascii?Q?U1G/N791pYnYnumQowDzlvM+UQ4NrWCLat6YdFZhxhjWavwWoo+YzNEUJGsv?= =?us-ascii?Q?J+fRxRSq/MJZWtWtJbD35DPwH0S7S9MOXz1hm4dxoASWiwBEIyZhNl20uSmp?= =?us-ascii?Q?Nj+jceFMFwIVXcPUizPQELAk0Tce+vh0LdImGefX42ERkhR5IIR47lBoz6A+?= =?us-ascii?Q?BjpZv7jGsX9HY1Yfgr7CfU1dJaHBViNqqUkDbiiiNhqUvKzxBQnzmm/lYafo?= =?us-ascii?Q?0TKy52DLcc+g93JliAE47v4aVOuCzIleF9Ai8POJMq7yLkzVtOM6Lji1LUTM?= =?us-ascii?Q?MpOqTwjLn8NCbNoliUlvvi+ZUtnKFj/KZjXIRZDj1XzxrKDwmbiI5bV7lnQk?= =?us-ascii?Q?RAQk3TamNxSVBzSzJaoE6/huv8L7vjkTqGxRpIangxzGGanK4GyXHak8aHJz?= =?us-ascii?Q?DWbORZ0fSXcbR56ed/spWhU1joqFKD8ch9jWdPZIVAeqpGDFfkHxIvrGSBMA?= =?us-ascii?Q?UyFZBQJYCAT6SjFP4Z2Kf66ZOVRJZkxhgyTpvZF+MeFp0wEIRD0gqQFbqewE?= =?us-ascii?Q?RbDtvHxywajfOtVEST5nzVjT891KW9Y+Sm75L8OMw07VBeIYbwucUEFKGsID?= =?us-ascii?Q?TO8Ezx/1Hab+1XVxgoJkM8Cv?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f3fdc70-90e8-413b-3460-08d8e952051f X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:15.7298 (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: 2LMduClia9cW08awq8GfmjU4d8xkXyBUrIbMchxSnxsnzjFmQSVGVbDXjeJ5RYkUjl3DABtC20HqdfVV65hwes0pj9E2SnX6YNxv4MU1he4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3544 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.6.123; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-DB3-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" Add additional check that node parents do not interfere with each other. This should not hurt existing callers and allows in further patch use bdrv_refresh_perms() to update a subtree of changed BdrvChild (check that change is correct). New check will substitute bdrv_check_update_perm() in following permissions refactoring, so keep error messages the same to avoid unit test result changes. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Alberto Garcia Reviewed-by: Kevin Wolf --- block.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 54 insertions(+), 9 deletions(-) diff --git a/block.c b/block.c index b951ecb5db..69db01c2ec 100644 --- a/block.c +++ b/block.c @@ -1992,6 +1992,57 @@ bool bdrv_is_writable(BlockDriverState *bs) return bdrv_is_writable_after_reopen(bs, NULL); } =20 +static char *bdrv_child_user_desc(BdrvChild *c) +{ + if (c->klass->get_parent_desc) { + return c->klass->get_parent_desc(c); + } + + return g_strdup("another user"); +} + +static bool bdrv_a_allow_b(BdrvChild *a, BdrvChild *b, Error **errp) +{ + g_autofree char *user =3D NULL; + g_autofree char *perm_names =3D NULL; + + if ((b->perm & a->shared_perm) =3D=3D b->perm) { + return true; + } + + perm_names =3D bdrv_perm_names(b->perm & ~a->shared_perm); + user =3D bdrv_child_user_desc(a); + error_setg(errp, "Conflicts with use by %s as '%s', which does not " + "allow '%s' on %s", + user, a->name, perm_names, bdrv_get_node_name(b->bs)); + + return false; +} + +static bool bdrv_parent_perms_conflict(BlockDriverState *bs, Error **errp) +{ + BdrvChild *a, *b; + + /* + * During the loop we'll look at each pair twice. That's correct becau= se + * bdrv_a_allow_b() is asymmetric and we should check each pair in both + * directions. + */ + QLIST_FOREACH(a, &bs->parents, next_parent) { + QLIST_FOREACH(b, &bs->parents, next_parent) { + if (a =3D=3D b) { + continue; + } + + if (!bdrv_a_allow_b(a, b, errp)) { + return true; + } + } + } + + return false; +} + static void bdrv_child_perm(BlockDriverState *bs, BlockDriverState *child_= bs, BdrvChild *c, BdrvChildRole role, BlockReopenQueue *reopen_queue, @@ -2169,15 +2220,6 @@ void bdrv_get_cumulative_perm(BlockDriverState *bs, = uint64_t *perm, *shared_perm =3D cumulative_shared_perms; } =20 -static char *bdrv_child_user_desc(BdrvChild *c) -{ - if (c->klass->get_parent_desc) { - return c->klass->get_parent_desc(c); - } - - return g_strdup("another user"); -} - char *bdrv_perm_names(uint64_t perm) { struct perm_name { @@ -2321,6 +2363,9 @@ static int bdrv_refresh_perms(BlockDriverState *bs, E= rror **errp) int ret; uint64_t perm, shared_perm; =20 + if (bdrv_parent_perms_conflict(bs, errp)) { + return -EPERM; + } bdrv_get_cumulative_perm(bs, &perm, &shared_perm); ret =3D bdrv_check_perm(bs, NULL, perm, shared_perm, NULL, errp); if (ret < 0) { --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615992502; cv=pass; d=zohomail.com; s=zohoarc; b=AiTTlqnWwazFr+h9hm+AHfgXDKxf7APmJeLCVIekPrw1GRjBkbcV8kHFh/HsUZDYFXT1K436dQN1RCz6AlZLK9/w+97pnjglLswDQKXDIATJFmTNBEQfvORzozn1ZucYtdaE/tEQQgj0PmqX2yN770luDAjBp5KClwskRF7uuYA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615992502; 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=f69/5RhnqM85k6ZpPxLyVyFvR458MtTs99ZEJDDoFvk=; b=fPNnQbRYxSIdF65xcfBPVtQ/f19OmyUnZ3QVxUjmREc0KRuh83oT0fpuaMZV7130fwdF+cgTCkbJ7CMeUd88eGeyOy0clWgcEA+yWQr+wBMQlHNIMLLcfAdx1gf9K7cddNBYzFMG5MMLkflzqEyuOCsdTVcnDGrAJY4i8temBpo= 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 1615992502102653.761736456111; Wed, 17 Mar 2021 07:48:22 -0700 (PDT) Received: from localhost ([::1]:35998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXTA-0000C4-KE for importer@patchew.org; Wed, 17 Mar 2021 10:48:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXHg-0004en-Pc; Wed, 17 Mar 2021 10:36:28 -0400 Received: from mail-eopbgr60091.outbound.protection.outlook.com ([40.107.6.91]:41454 helo=EUR04-DB3-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 1lMXHe-0006rZ-3E; Wed, 17 Mar 2021 10:36:28 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3544.eurprd08.prod.outlook.com (2603:10a6:20b:4e::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:17 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:17 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H8C5lKwJ+l+KsBl2v38IO22+jD/2Cck4av0lMWPqfyM8gPASsXSDjOV6IB8CW82dPi+yj21IrQW5HSMWhi0xuO+2RndSUcGbd8G1WWHLDP9oo6FtKQS6DBUPBWA8rUWiSbjs53+UrRAWDqNw5cYl/aQRaxWG68N5mPT+cbbhOMDxBLE5vQDrw1gD78+knf/bccz3HdFKzY2H84j3mOnZNDYZYVDhKMpz0Bh92bOwLlGhFz6Whs5y4x6RR4ARZOSNh1zuxmSjBvXq3YSvszYUZlCuzBLUxTmEJfoJ4fIMmgLo0WusDRS1rgesLl2R1rsbu8jghwXO2o6+h6etTg2XIQ== 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=f69/5RhnqM85k6ZpPxLyVyFvR458MtTs99ZEJDDoFvk=; b=RFv2h2G0mEOQU1P7l/9u8znFznpSA5j5dneOo/w3iLhHhuPVvgK/4WCMsMssMEOPuQEZJMTS1EUR6lFB87qAMpo5yz3OWYE45g/F4gzHO7q1yFeZ0AlqDNekgL/o4Q2jPI6WFAtaQFaPwJta+75xDGoXNYs6/M7lhOIoF8wjQjhd5zUaSM/tv95Ra53CimCxjsDw8iLhDQbWt0A4qOYlEtZSsSYcEt7jnKtB6vQU0+VTRA1OaeGqoLA6PEJzPUQpwtZ+e+/1yjFPsGzeYsAEnZQFT5ih5Fg85XI/Xm3eD4XbgtYDAGm93OgAaplD9VJaKyRjTq2WnpcdyNB+z6uo/w== 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=f69/5RhnqM85k6ZpPxLyVyFvR458MtTs99ZEJDDoFvk=; b=N2wI7G4dDIZE0CEeZS5OXZ8acImhwh8QrH6wnIfTZZ6vATHga7sVONd50H9KvWJhZYZ80nO71Vb+lUbLr3OYdeVjDiR9dYQ7BoDiAvOaYTNJZTdnnrSZpGYRAf4WaKlsGiBUUi844rhNvSyJ7zIDSE1xJhhVHCTixvrK/H5YDAs= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 10/36] block: refactor bdrv_child* permission functions Date: Wed, 17 Mar 2021 17:35:03 +0300 Message-Id: <20210317143529.615584-11-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: 5d7f7439-0d9a-458c-e4d8-08d8e95205f3 X-MS-TrafficTypeDiagnostic: AM6PR08MB3544: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3631; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x7xtwM+R/p18ZZyDt3RXL+3hpwDmc6wqRFnsdBh2Q2XNOdcHSSrY9eT6gY7bK24dEpVcsvayG5uMXSDEGbCLjFNFtMcqsB51NqvXjyOwhzFEW9Zv+C0LamxFLhdSH3TxMXfORbPREUt8CKpYHM2gI6tBdR8kVrlQbYQgRLj+i6hVZbw7T5kkh1mJgxZQmHQZXg/pCnzeDUT7/ah2jvMcjWOMm22UMRdxCHE5DbXkKtp9YbylAEo5QxwDa+t3MVi1qZQif0gcfxBSgfLDehE+9159lHMGiz1NyX7R9Ce0ix9Si5woTLaNZ/QY9AIRunxer2SL1YMO2bJjx6KYK8uTJLtzKwjnnGtHzvVg8XZap1wpFAqWHTaDIOJjjmooyKdaFTJigUbLFK2Bu4PQy0usUD8lEOEMUO4ujh2H8NR+5tZjOPUS6zvcq9W/VIJemrGD+AeK8VO5BQxB2CFPnl0Sgm3gw3v7awqQi5Eqlb7ag1XcFd1/XBclCVFYzoILGbiRmACPtSxJH/77l2jb1ovFdD+Svb4ZITYmaLTNp/6He3xrTXWjSjfA8sg4vlDDkbAMihO7ZJ4pDkIhF0l/+vUTe8MfMc66OTatHHO3Ezx6oeK4BBil22X4/MON28/TdAQh 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)(346002)(366004)(376002)(39840400004)(136003)(396003)(186003)(8676002)(16526019)(26005)(86362001)(1076003)(52116002)(36756003)(6916009)(66476007)(6506007)(4326008)(6486002)(2616005)(5660300002)(8936002)(66556008)(66946007)(83380400001)(2906002)(478600001)(956004)(6666004)(69590400012)(6512007)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?FGN6+pbuJQjnifyd2SN5O3beuNela2aUcymUK4L6HXj+g604vtURUKcT9E4H?= =?us-ascii?Q?YFLlacUI9PE2nzmouwsxp+z2QtgsxkgtOup87nwCRJb7bEF3QrIvKK59aYgy?= =?us-ascii?Q?GVknmVtW3/fOhz/MtGMNS21f3cy9q3k/IPEqKHx3IGV8I3gTu4mm/2zHcrI5?= =?us-ascii?Q?+mxOTfPuDtbSs8wSH57FUQFWZ21TcbDgII6Nd0HTksvbiH0Scgts6Uzge0q9?= =?us-ascii?Q?OY6a+sfKRuO/JpKT2YdND8qHQmc9xsA6Hqj3Dkm0Na1h+sX38Ei8wNcKzdT3?= =?us-ascii?Q?xUgI/sXg564P6OtFIIeqNs57HWD8QvGbeJbSqjxIvtQYBr+ZVLE3pArTAj8p?= =?us-ascii?Q?4ah0OlroWFol4jTIjRAFivJKLyCCVrjg5GEfIoswLzJRuAy5h1ZSyUNoXlJa?= =?us-ascii?Q?l22Maty34jcLC4rZTbhyN4SPCERwjyvk0WWleoTpoXxO7/78/gp/kLMxonj1?= =?us-ascii?Q?ItlxFKziJf3pIkSiAZVBSO7qsAcMzi/FykCmjbFpQPFznNY7KQ46NPo1UKVj?= =?us-ascii?Q?VRvLeiBa2E91Fnw9iuK4G1kshphBVB85SSwZco3OUSTsFq/KWRjveBQt6qzB?= =?us-ascii?Q?HE3NU5GyXL513AQKHklrmg27/lhDDpS8V8VkeKTsDpxaAAUAATkQ6HXb3S+O?= =?us-ascii?Q?MN6ec0S6bQcJyLQ0rSqxbUaijgBegeseC1F5uFcl6ogmBcJzu1n+ESwJmzt5?= =?us-ascii?Q?2PzUbAeN6yriOvGeVgZdAvQsRBPB7a1rMa9+hv2QOxjDMFFeSYvA7m8Gu8xS?= =?us-ascii?Q?JGte0ylmN6XUc6mfz5jzJxoORIDE7MObJ0d6e7sc472inUjaySejT+o62qyZ?= =?us-ascii?Q?pKF37AnzCsE1sR2k9gn6bUHgwGi+gGAz4UdiM2ePuRxHNsG81xOGmUqyN9Tv?= =?us-ascii?Q?pLNqEqiuemC5W8I6j2uMjevcK0CQnbuk2S5T8rBFkHCPdRG/kXaIyjXb0uqY?= =?us-ascii?Q?kj0ZlhjfOym7O0dYx9LqaWAFv1tSFQDdlQeKiIZN57EnOXNtqetNtZJM+wEq?= =?us-ascii?Q?09FfE/TImoWbrKKQluJovAn/NcO8ZOEfsw92OYoUsXwFaEHJYfY+9zDmnj2l?= =?us-ascii?Q?9DT0r8dZioXhnkwmWJv0wW//VwXoPbt6E25qGMhZS8uvr+IJpZwPTbddE9x/?= =?us-ascii?Q?Hk5BznX/cdE13CvKC3c3XoXL3zTuOEh3plzS9dYeo/zfbOyWGldshG/HTqHC?= =?us-ascii?Q?L21umOpgYxmixgSopswa5BbqHsqc3dRAdcoFoA7aiVcA3XCrPl6QHWjhcSPx?= =?us-ascii?Q?emHpAXOQUspzPxjcGt2/h3R2mYLhkCLchbu5AkfimhfYYyLtq6imloijn7ON?= =?us-ascii?Q?9QsNCXT4X4641drC5wy+pIt6?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d7f7439-0d9a-458c-e4d8-08d8e95205f3 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:17.1794 (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: rb0d/AsniQeylY8z/5Vh2Yy747y3Az4n+9JDgxruiq315z/r4GdHdwr7J61gRc4RMUMKJAMKoZ7/mFRIkdLLoUxa85rN4g0mGGqx/227UdU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3544 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.6.91; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-DB3-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" Split out non-recursive parts, and refactor as block graph transaction action. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block.c | 79 ++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 59 insertions(+), 20 deletions(-) diff --git a/block.c b/block.c index 69db01c2ec..2d64c498fc 100644 --- a/block.c +++ b/block.c @@ -49,6 +49,7 @@ #include "qemu/timer.h" #include "qemu/cutils.h" #include "qemu/id.h" +#include "qemu/transactions.h" #include "block/coroutines.h" =20 #ifdef CONFIG_BSD @@ -2059,6 +2060,61 @@ static void bdrv_child_perm(BlockDriverState *bs, Bl= ockDriverState *child_bs, } } =20 +static void bdrv_child_set_perm_commit(void *opaque) +{ + BdrvChild *c =3D opaque; + + c->has_backup_perm =3D false; +} + +static void bdrv_child_set_perm_abort(void *opaque) +{ + BdrvChild *c =3D opaque; + /* + * We may have child->has_backup_perm unset at this point, as in case = of + * _check_ stage of permission update failure we may _check_ not the w= hole + * subtree. Still, _abort_ is called on the whole subtree anyway. + */ + if (c->has_backup_perm) { + c->perm =3D c->backup_perm; + c->shared_perm =3D c->backup_shared_perm; + c->has_backup_perm =3D false; + } +} + +static TransactionActionDrv bdrv_child_set_pem_drv =3D { + .abort =3D bdrv_child_set_perm_abort, + .commit =3D bdrv_child_set_perm_commit, +}; + +/* + * With tran=3DNULL needs to be followed by direct call to either + * bdrv_child_set_perm_commit() or bdrv_child_set_perm_abort(). + * + * With non-NULL tran needs to be followed by tran_abort() or tran_commit() + * instead. + */ +static void bdrv_child_set_perm_safe(BdrvChild *c, uint64_t perm, + uint64_t shared, Transaction *tran) +{ + if (!c->has_backup_perm) { + c->has_backup_perm =3D true; + c->backup_perm =3D c->perm; + c->backup_shared_perm =3D c->shared_perm; + } + /* + * Note: it's OK if c->has_backup_perm was already set, as we can find= the + * same c twice during check_perm procedure + */ + + c->perm =3D perm; + c->shared_perm =3D shared; + + if (tran) { + tran_add(tran, &bdrv_child_set_pem_drv, c); + } +} + /* * Check whether permissions on this node can be changed in a way that * @cumulative_perms and @cumulative_shared_perms are the new cumulative @@ -2324,37 +2380,20 @@ static int bdrv_child_check_perm(BdrvChild *c, Bloc= kReopenQueue *q, return ret; } =20 - if (!c->has_backup_perm) { - c->has_backup_perm =3D true; - c->backup_perm =3D c->perm; - c->backup_shared_perm =3D c->shared_perm; - } - /* - * Note: it's OK if c->has_backup_perm was already set, as we can find= the - * same child twice during check_perm procedure - */ - - c->perm =3D perm; - c->shared_perm =3D shared; + bdrv_child_set_perm_safe(c, perm, shared, NULL); =20 return 0; } =20 static void bdrv_child_set_perm(BdrvChild *c) { - c->has_backup_perm =3D false; - + bdrv_child_set_perm_commit(c); bdrv_set_perm(c->bs); } =20 static void bdrv_child_abort_perm_update(BdrvChild *c) { - if (c->has_backup_perm) { - c->perm =3D c->backup_perm; - c->shared_perm =3D c->backup_shared_perm; - c->has_backup_perm =3D false; - } - + bdrv_child_set_perm_abort(c); bdrv_abort_perm_update(c->bs); } =20 --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615992710; cv=pass; d=zohomail.com; s=zohoarc; b=bh9HNUXqzgE8djRljDBebGnYpIJ35OZV0I5YrIOan7VErtI2m3TLIzMoz3gSuDsmj1SiibbM8HJz+hNDDXqQaeDJ/OvYyfXPjTb0uJaYxdpTZruzlxkI7ZFv160d+cGRjR3mYLV7wO4Zl30QFB3u6tHZI7oeajtYuZxykaMXxy8= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615992710; 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=AeAyPFXMxUDHKazQMEbvQ9kXfFq2N/wTghh6ijVg7Bo=; b=Gso+sHSkIgq2sqI+2yZKR9wFXvjY8v7OC9QHex6X8FpPwaUcbvIUU2Maj9UL8TFvaWyUA8P1bYY4uMa2MxTWwKAt+tZq9Z21DGua0QbKrg0H5GSnSoBGOXr62vzx4mPaVyHOI2jArHzv01dZjXg4r/9/NIdQp1HHw6hFpJJ7sR4= 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 1615992710116266.14057885571424; Wed, 17 Mar 2021 07:51:50 -0700 (PDT) Received: from localhost ([::1]:45632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXWX-0004Eg-4k for importer@patchew.org; Wed, 17 Mar 2021 10:51:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34600) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXHi-0004iV-O6; Wed, 17 Mar 2021 10:36:30 -0400 Received: from mail-eopbgr60123.outbound.protection.outlook.com ([40.107.6.123]:28737 helo=EUR04-DB3-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 1lMXHg-0006ux-0y; Wed, 17 Mar 2021 10:36:30 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3544.eurprd08.prod.outlook.com (2603:10a6:20b:4e::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:18 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:18 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:17 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IwuRR4moS1Fk4SKgcpK8FCRDsX6uSbnb3aNl+/C5RQ+mSlLvc2RonsqqHSiR99UCmEhXzmi7Lr6TdnEWH/JvhprXtObaIB3yC1jW++H/LynJYVotPyyDREtJ7j7VEZKr5X09BVeEI03tOlwSXrDdyQNXq/gpCcFCpRlhVNib1E2JlvkK130IdXGlS6cSM68JDu9NZ4biMvT/7oscKfkX3+YBOSLTtZRkWL19fIDKRe6+NyKbOoEOHrX+EZ28bR8PdweNBXn9THqlPx/ZgW0o2S3cc9qBoswZzLHUdD1b33X0hT+na932F5uF6t5UkfYlaNmRv93KvuN9mLAoeaYGVQ== 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=AeAyPFXMxUDHKazQMEbvQ9kXfFq2N/wTghh6ijVg7Bo=; b=OpnaxagJ5t1PeyFc4dl/HbgsOdceKQmmKIb+R4iewyZNzLv9XGiY4dgFmj1gqX45JXgJYrHfNBCdQ1B2n/CdMu2qMPFGNpEhML9YO1xZGJ6L5b2TmxGPGz5yX/jUsgGIbiasL/6ho/ClsGvaPzvgZvBdlXc54YwBslzuz4wKxlrAfqYmFdbT2j7U9+KEHhWzT5lRECnwLx1rHnV8N13BxUCIO50+BXPcodolA4NejQ6KBgw6NOrtsZjQG3zohJ+BYbnHxCGuoYDEQ4+MIP0Qh2sY0l/kSjr6Z++PE4tfr5Wlo2pwfVotaYzkSE7VeldbkRiPRqF5Q9VLVbN/LeNe5Q== 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=AeAyPFXMxUDHKazQMEbvQ9kXfFq2N/wTghh6ijVg7Bo=; b=Ft1B+175J4zYRelTJuoAy+H5fEZpErbB9n5fFXGwBV0IlzX/Wie578EJwSAe8uEWjXzaSD3+GJ7vAoHA2trjopGPGDqvzRA/8RgbGGHQ1bg5cTQ+PMDNvKxRC+nkGSwsG3CGtbQz/irZj2n3TKW2ylnpFFBnMZF6G7dtkE8vgQA= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 11/36] block: rewrite bdrv_child_try_set_perm() using bdrv_refresh_perms() Date: Wed, 17 Mar 2021 17:35:04 +0300 Message-Id: <20210317143529.615584-12-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: 38c50336-6cca-47d6-88f3-08d8e95206d8 X-MS-TrafficTypeDiagnostic: AM6PR08MB3544: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:243; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SnSu1VPj2MEVaGNHfocusPW6r9igDFwKOuu56scHTqFZ0Js/M5x7Iqo0ktMSWfUj8pGzOVzKbKdmEmF9mKKpFhao9Ubj/ins1b5ZMXBvcNmmtRzRSJgONBiH7Zk1WZW75c3EIu5sU3lWZbEn57lKAWj230MolMf5fhzNLrLSg8/hX+UPdAN5sbaFOZiUucWnUzxNXORuqRdyf83yWYFkKrdmCEGBQ21IPDJo79Rhz+vkrdqFXByUgsfxF6hJkM7SxveDfgMkF6E4TyOx4HUcJ6WLkj1fpRpnGW7lxIlVGZQr+LXdmMK6U3RcISJvRw2e0y1PuCnIjy0PPKCh47fy1v3isX5zWzfaOZnwqTnsNUf5+Q6OVDzoVOak7in1Pp8TWA5QJq+8PVnPfDHBHzHD68SOTvYZPrTnNAhzLS5u7mu+Vm2wBEboiDVEBeuO0m06wXEULMCK4hAPVKiS7s4wHI2TUPaL43ob3RrKnQALeczn0h91eXaQ8Cpbcej47op5Wl9vMpHIUBzUdJLLZNuV6a0t3Z1LQujg6AcHZsxvG6CbnYqzMWPYfmiQdZC7+NePHuYfvoP9MOUi8MhAroMAMq8nTgL4zBaGajZWQ8xNRKPTgU/wtKxHa9vaQ5NUeZ9S 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)(346002)(366004)(376002)(39840400004)(136003)(396003)(186003)(8676002)(16526019)(26005)(86362001)(1076003)(52116002)(36756003)(6916009)(66476007)(6506007)(4326008)(6486002)(2616005)(5660300002)(8936002)(66556008)(66946007)(83380400001)(2906002)(478600001)(956004)(6666004)(69590400012)(6512007)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?B/3cOr+9Vf5nLCx0NuLiEm4uEBHLkIOkiv3qwRLKMu58xxP7yZP39Jzy16nO?= =?us-ascii?Q?ccX0tLw+Ys/caJsZQ1VmtpSvHzZjCTyFKT3BeOtQ/vZTI9gYF0tyg9sakBU6?= =?us-ascii?Q?VkXw9gVgFzm2Xnoq0lAvASiEIJwPkXGc0AOpB5oXTmgpffWZy/ypUps3MAaP?= =?us-ascii?Q?2dxgHtyflcI5bKKFbfN4egBXipMGhQDR/Lo3fYWVCLShT1QdQ+eNX5ffTDxh?= =?us-ascii?Q?zuxGZVHlB5XEEGUPqFD9itQ4Xomt/0Pk/12BeymTu2cmaIiuDOj1sZAdz/u3?= =?us-ascii?Q?MlesBCw0zR4MMPC+Y5KUEKNd5HC9aKdkb/TcuVufVNWA+C2+WuHOmOlvX4Xw?= =?us-ascii?Q?G9YXBNcxTknhdWzNbgFzorDdJLiVBt6Uiq4yS52GSzQL4AkZigno4h5elr4n?= =?us-ascii?Q?ZMNWgyF9fjDDSPmshXXkTLZEr5lAD7BvtagvU61Gzz6cdAs0KLr0zCjNoePu?= =?us-ascii?Q?sWNv2fmiMiy7pquw3nW6/313vs6IFgXJTATqg5N4QZYutEKhDKzk9259lPE5?= =?us-ascii?Q?sBDD1a3/XhwD6LeB0SpYcmxUIf4lxqcYH/z3EUV5JjPxZ037FVbF8k6NV1iy?= =?us-ascii?Q?DaoiH47mu7LifVTZV3YobeTIKeb1FEJusSC5YzBRMAlY4bJ/239SFT8Lf/0j?= =?us-ascii?Q?jRno4Lx963OR6FXXw/i65Db/lnMoZEqJ4haMBdICw7iHgHBUwxc/4TUzLSI+?= =?us-ascii?Q?1eCln04PYWzq33rEI7UKwtne1lYjdYkcLo5p2cRELZJZR0tu8kW9c2EfnFr6?= =?us-ascii?Q?Yl406PkwnVgkR9/DBYveK9+WFuzHeu/ESNKQZqwplXw69q61RLsORDRcfiBx?= =?us-ascii?Q?cLCYrMj5vHUolBuNj1z7icV4/vI2U3JYkoEhiVqb2WBhpStUhEtTr443GFz8?= =?us-ascii?Q?CfD/jdGlPNGGR1U2ebtgchPlmlLyCGWwGwilT5IifyJYQ82RjoBoxp8tAwNs?= =?us-ascii?Q?b+6xFoU7V9JVSgxK2wBZWUe3Fi1LSimFGzdHuK/fZ0mAeG4ysdcboYZ6zCHH?= =?us-ascii?Q?2ajanoiWcdqS8RNV9+bSrqFUOGUv2k02JSZ2gzTvBvS6tNQGB+NmyUbQSHZk?= =?us-ascii?Q?aHOsvk7Xm4vzI9S69rd8/W9fMyzDFYQVUXwGWAH23uCS13bZ2S1xsAvM78HF?= =?us-ascii?Q?rJQZwW+SXGF1Amhh6wvDga2EBtrE2Z0EwL9kj97QCenspdZ6sYuYj8o4mBB9?= =?us-ascii?Q?F1ykwfaPAcn8s5e3dEHpZ+VkKCa3zX644nRtrME7jTS5erxKdqf7VQwqIgO2?= =?us-ascii?Q?YlQ5H82mGsXUCyg8QoH94zSx5jJlBlMxgWFQzMbJ9Ztwoh4dcLp4HPfXHhe1?= =?us-ascii?Q?E39mnfX3LE0YHmpzEcL8wtcc?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38c50336-6cca-47d6-88f3-08d8e95206d8 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:18.6958 (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: bv0m2dD3olmtoehOu3+6WMYxwr9Ejagx8v8ZnGGO8E6zfP0dK29jA1BvCcjRCjvylaEbQc2lMpOxIggUO2HQgU9x/pAoVouVsZ/k0cIN0f8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3544 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.6.123; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-DB3-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" We are going to drop recursive bdrv_child_* functions, so stop use them in bdrv_child_try_set_perm() as a first step. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/block.c b/block.c index 2d64c498fc..1f10ce1861 100644 --- a/block.c +++ b/block.c @@ -2420,11 +2420,16 @@ int bdrv_child_try_set_perm(BdrvChild *c, uint64_t = perm, uint64_t shared, Error **errp) { Error *local_err =3D NULL; + Transaction *tran =3D tran_new(); int ret; =20 - ret =3D bdrv_child_check_perm(c, NULL, perm, shared, NULL, &local_err); + bdrv_child_set_perm_safe(c, perm, shared, tran); + + ret =3D bdrv_refresh_perms(c->bs, &local_err); + + tran_finalize(tran, ret); + if (ret < 0) { - bdrv_child_abort_perm_update(c); if ((perm & ~c->perm) || (c->shared_perm & ~shared)) { /* tighten permissions */ error_propagate(errp, local_err); @@ -2438,12 +2443,9 @@ int bdrv_child_try_set_perm(BdrvChild *c, uint64_t p= erm, uint64_t shared, error_free(local_err); ret =3D 0; } - return ret; } =20 - bdrv_child_set_perm(c); - - return 0; + return ret; } =20 int bdrv_child_refresh_perms(BlockDriverState *bs, BdrvChild *c, Error **e= rrp) --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615992544; cv=pass; d=zohomail.com; s=zohoarc; b=T3uivrLRdKUMpQQKi3Fg9juF48rUNqExWATOrP/K/JV0x0zlsF8GkB2VXYiZFZuUdNI0PitniuGDOGdPsVB4kZUNB+D7RIyAzAOasUQl9OyEvFJCzOSrbgKErAvc0uysnk5pAy8h7B24MmuQD4RId2712LZ2Vd9IvkCVQw7bpMw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615992544; 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=FVoUbX/2NBWkFRZH1DnLqOgabO3gdj2DysRzgJZEeUI=; b=hT8fZEpbaPTYQkGHY071wU4HpynR67LMJMCgy0PKMzOgQYR7rnCofUEY7xpwK7srvXJRZ8hUqCH//MBZkVkh8de/UFYj+EOuJLnyayQFTSB4EaIiMKVKgsoUxWm0eiuBNnvzmk5vGAzukTVtM7jwXZniedamGb0xLdrEGu0I2t8= 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 1615992544538529.9908973590576; Wed, 17 Mar 2021 07:49:04 -0700 (PDT) Received: from localhost ([::1]:39176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXTr-0001WC-Ci for importer@patchew.org; Wed, 17 Mar 2021 10:49:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34588) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXHh-0004gb-NA; Wed, 17 Mar 2021 10:36:29 -0400 Received: from mail-eopbgr10137.outbound.protection.outlook.com ([40.107.1.137]:61154 helo=EUR02-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 1lMXHf-0006nM-Tw; Wed, 17 Mar 2021 10:36:29 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1650.eurprd08.prod.outlook.com (2603:10a6:203:2f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:20 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:20 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:19 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=noxbsRoAYEcnIs22hq5Unp2fCSJ2aBZPHFN+vv5KOI1L0q0deBhZN2cjIxpXGswRaLZUkcQA9wmJjgCQydCyiHuvhOC9VowhCT0NXYo9BBnbnP9c0+0G62GUXIz2AKmFEw1WAXybjN+TmoxqK/qp5FUS42H6ZxkiqIL/0SSClcGnSz35ZeFSW7OeWVJWipohO0UG9b3G9ZFIdNeLjLxsfpOqbclGQ3hI5kWun/rtcJGxL6tEATXpZNb6KqXOhqxK3sOUTL81ZXtciSmsk5bj24DCvEfXwYDTNuom+KiRD694eH1xVInQaJe1smk5o86fOu90fQwv6eBFkfRBODeO+A== 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=FVoUbX/2NBWkFRZH1DnLqOgabO3gdj2DysRzgJZEeUI=; b=dFZBgtqTVtBquv8higDWiiZ4HuzoH3h+Kp6Z9sK8upiSxV5cGEs7BwOmOsJByl7Ty7npFGrePQtcW56iRiBQw3AakG7MDfEQjAt6JTy8LSOKVOl4FVASWlQ5BPt/Aq9oxfjFnbk/MpeA3DCJN4AWUSoKNQkr/nm7LRg5Grl43udJN/+jQG9ZY/O14dWh1oJ4rbKN727tuAXKdI0OMO/hMU6r1cJihANxK+vSp3sLLRy8x3w4UIqh/gglzy+CuJ/dQeaNgRc7MSPMfE7jm7Nk8QFPrgVWIWPLBqXK1bJJnQsdunhVRMJ7YU3Jbo2GtaHdzIgbZvlz175AJHeSmg2oqw== 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=FVoUbX/2NBWkFRZH1DnLqOgabO3gdj2DysRzgJZEeUI=; b=D9vzMrTnw+554YapbWbATExMtDXdEhaE0N3UTby95MwqLglWawg6EDPRK8kNPhuUlmBpUxa23ECCAdF02EvU0PMnoEURWDrInTSzpS4opAR6l9TFsexbOuhFxMA1dZAeG/HWp55deN/h5KmfU1KgDX1CQEk5iGo/IpjMKLoKQ0I= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com, Alberto Garcia Subject: [PATCH v3 12/36] block: inline bdrv_child_*() permission functions calls Date: Wed, 17 Mar 2021 17:35:05 +0300 Message-Id: <20210317143529.615584-13-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: dc9faa1a-a340-4747-0e55-08d8e95207eb X-MS-TrafficTypeDiagnostic: AM5PR0801MB1650: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:45; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: a0e2iIUPjBPSqHFceA/1ZVmQWrhvQUhu6wt3A+PZsrAZeKFkxucG+6SCmRsIkWF9cXgLyk7rh9eFh4Yq8D+rab2+2XKUb/55OOjrfYCeBMhGmi7xUh7o0+sm1ZCtH0ng3YxUzIn4xMyzBrpkJNMLYIZ50jZIS7/dAVyB3gnoiNtyLJYZmu8m9tpL2M4oLbyh3P4VeQBBrk15kK9llCWCOX60PK+8b2vQ/0apsJBxdmA57EQuZdXlivxwFahoGQNmu40burzYBRRoiAFA0nW1UPpcJgzl78UsW5iRwELZ4/XxfK9pFqh0Wx1WCGJKMB8JGRySSJXhVuLPI+A1d7ZVyS9WXO/0aDiiQjJRmprasptroC3avn/4jeqwvCrBZrcNPelIb7mjESrFo2d0XjEkPLoG3Pj+Fk/UBaWkJEWxEDsF3zzy45y/EztQBMTVmEkXI1t03rqU2TsQ0C0UtW/IOeNxDR7In5Kto3604TUShCW3CKdVaJ6iwdZks2ACmvJMgs0cWwBirbrygrUbcDp2xIIcbil2O4H9G4dc0F8olx325rIBI3fl5m+N3OJODEQv1rZVwBx4SkgGfPOGehaviqC0DU88s0wTwBgXY8PLl0WzrQD3zDEHAaPdBTHjLAD1 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)(346002)(39840400004)(396003)(376002)(136003)(366004)(316002)(1076003)(956004)(6916009)(6506007)(69590400012)(66556008)(66476007)(6512007)(26005)(4326008)(5660300002)(83380400001)(8676002)(52116002)(2616005)(66946007)(6486002)(6666004)(186003)(36756003)(16526019)(2906002)(86362001)(8936002)(478600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?YuV462oIn7/iKygyQIQ1cPGG1QykBYfUmEAWoLoyz41jie3tT3hreUwMPTBN?= =?us-ascii?Q?pDHE9UiSFtx2RZajlHTWauitviPOjlfCqEaEVUX6TLysAuAjSuwAwye3X6oG?= =?us-ascii?Q?Yi8XWZ84S5xjRcfth2HWW9jNUudZcBCvceNFFJSmdB/FdDFTRMqQ56UrnEpF?= =?us-ascii?Q?qxnn+nJ1sv8XyoU1LZkihEugcMreYRmVroLe8Set0uJvaLzprnrx+UPMl9u+?= =?us-ascii?Q?YInQvNlu7PEB3aBBlUy9ibFcMOv1OQMxNcBJz0k/KtZMk/YUpA6oMsHAejbt?= =?us-ascii?Q?fGLxMPrXUw+wCuuG0InGeSwVV3L9M37nsTLIlYKRiKvvRARZMNRbE7z8uyzo?= =?us-ascii?Q?cOODnm0DtGr+kzngq5Sidq2/BNbtq4WBLYPhhamsiNI7BxXzuuO4L6ZhyyX9?= =?us-ascii?Q?QzZYCTiJZuPI9lnXYgBFa0lGHJyG4JCMQomdBpuEExda+0XOfRtlV3HereJE?= =?us-ascii?Q?CEt9Nri4q3aaIQ4aMHfifNzsja+4085E+/Ypokt+prFoypGlnCO03oAtIHXj?= =?us-ascii?Q?BTKnZIQLiCUxljcriF1/i6yBUwjmWZ0h1DK1BJ+35HOuHNyuEX5dEGoM87Zs?= =?us-ascii?Q?OBKmqTYyknV44XwDU3om6rkGAYgiT85CL1DJchMTYYEiATbkusdMA/13aeA7?= =?us-ascii?Q?jwMw0H2XeJ4bCFMp8EFHmFNXiO9ngJ9BceoS6vJwSlD6Y4G4mc6DqMGAFVf/?= =?us-ascii?Q?WfpOrSIWuxvXkNdaNumbPqDLMK08cP5tYxpOAMvh9FYSNa2wJIHWlZPtYHD3?= =?us-ascii?Q?Djm/QGEix8zBLCu+vukX5ei/SCl/Xe5gaFRg9vmpPZh2De5XaSbE8bWkltj6?= =?us-ascii?Q?8WdRrNmtr7nBmn3Mbi21Sw/SKRo8o2KZ7TMl30Ga9DHALmy30sJWyWAshwiO?= =?us-ascii?Q?dR35auIPeG28IG4KCVhLif2t+FWwVsvBWfmjMe4SGWpX1I5tgO0rejET+3JQ?= =?us-ascii?Q?u2SIls7DDcmYb5i8K/mAobqyLlD1dg7gCvTZyuS77iCVcj7lAKkxwwOIc9mt?= =?us-ascii?Q?YRBS9LqCHgl8fCMrqmPTypH1tUglig7OQfORcmG2KlG7hgoHT0JcwkpoxCLo?= =?us-ascii?Q?iGw25DhUEqUC0LuICWO6kpZvVTKjALWS8RN1Ga/eqcWP/R76GB3faPYYWk0K?= =?us-ascii?Q?qvY0Ss47M3noL0N/iKoqnJdYt9RfMqPIX3DbDaAgOTK6bF4XDxAbpyx6I6ZM?= =?us-ascii?Q?QeSrj8Vg0SYSZ7qchfjUmFXOLUPwsmQbdGYe2ok6IfUo/RLARBLelZKHP70C?= =?us-ascii?Q?PY178nr/nelrry4PyTfRWd2wq1AJWSC7KHb6HJcfhdYrvFX8EGblhpCqxVnz?= =?us-ascii?Q?v16K7b6gm9V0nh2rkp3Z7qXU?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc9faa1a-a340-4747-0e55-08d8e95207eb X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:20.5018 (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: PBq3htAdq7++eTakThTHfotLJdxaZGOSBKc7OGo1fdE9+c8R/ZCRPHFUg3jMIx2UFxVH51Kyb693Ef9n7TfG7QLjjL7b6w5EEwpZIwWjRr4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1650 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.1.137; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-HE1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" Each of them has only one caller. Open-coding simplifies further pemission-update system changes. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Alberto Garcia Reviewed-by: Kevin Wolf --- block.c | 59 +++++++++++++++++---------------------------------------- 1 file changed, 17 insertions(+), 42 deletions(-) diff --git a/block.c b/block.c index 1f10ce1861..29fec1ffc0 100644 --- a/block.c +++ b/block.c @@ -1940,11 +1940,11 @@ static int bdrv_fill_options(QDict **options, const= char *filename, return 0; } =20 -static int bdrv_child_check_perm(BdrvChild *c, BlockReopenQueue *q, - uint64_t perm, uint64_t shared, - GSList *ignore_children, Error **errp); -static void bdrv_child_abort_perm_update(BdrvChild *c); -static void bdrv_child_set_perm(BdrvChild *c); +static int bdrv_check_update_perm(BlockDriverState *bs, BlockReopenQueue *= q, + uint64_t new_used_perm, + uint64_t new_shared_perm, + GSList *ignore_children, + Error **errp); =20 typedef struct BlockReopenQueueEntry { bool prepared; @@ -2192,15 +2192,21 @@ static int bdrv_check_perm(BlockDriverState *bs, Bl= ockReopenQueue *q, /* Check all children */ QLIST_FOREACH(c, &bs->children, next) { uint64_t cur_perm, cur_shared; + GSList *cur_ignore_children; =20 bdrv_child_perm(bs, c->bs, c, c->role, q, cumulative_perms, cumulative_shared_perms, &cur_perm, &cur_shared); - ret =3D bdrv_child_check_perm(c, q, cur_perm, cur_shared, ignore_c= hildren, - errp); + + cur_ignore_children =3D g_slist_prepend(g_slist_copy(ignore_childr= en), c); + ret =3D bdrv_check_update_perm(c->bs, q, cur_perm, cur_shared, + cur_ignore_children, errp); + g_slist_free(cur_ignore_children); if (ret < 0) { return ret; } + + bdrv_child_set_perm_safe(c, cur_perm, cur_shared, NULL); } =20 return 0; @@ -2227,7 +2233,8 @@ static void bdrv_abort_perm_update(BlockDriverState *= bs) } =20 QLIST_FOREACH(c, &bs->children, next) { - bdrv_child_abort_perm_update(c); + bdrv_child_set_perm_abort(c); + bdrv_abort_perm_update(c->bs); } } =20 @@ -2256,7 +2263,8 @@ static void bdrv_set_perm(BlockDriverState *bs) =20 /* Update all children */ QLIST_FOREACH(c, &bs->children, next) { - bdrv_child_set_perm(c); + bdrv_child_set_perm_commit(c); + bdrv_set_perm(c->bs); } } =20 @@ -2364,39 +2372,6 @@ static int bdrv_check_update_perm(BlockDriverState *= bs, BlockReopenQueue *q, ignore_children, errp); } =20 -/* Needs to be followed by a call to either bdrv_child_set_perm() or - * bdrv_child_abort_perm_update(). */ -static int bdrv_child_check_perm(BdrvChild *c, BlockReopenQueue *q, - uint64_t perm, uint64_t shared, - GSList *ignore_children, Error **errp) -{ - int ret; - - ignore_children =3D g_slist_prepend(g_slist_copy(ignore_children), c); - ret =3D bdrv_check_update_perm(c->bs, q, perm, shared, ignore_children= , errp); - g_slist_free(ignore_children); - - if (ret < 0) { - return ret; - } - - bdrv_child_set_perm_safe(c, perm, shared, NULL); - - return 0; -} - -static void bdrv_child_set_perm(BdrvChild *c) -{ - bdrv_child_set_perm_commit(c); - bdrv_set_perm(c->bs); -} - -static void bdrv_child_abort_perm_update(BdrvChild *c) -{ - bdrv_child_set_perm_abort(c); - bdrv_abort_perm_update(c->bs); -} - static int bdrv_refresh_perms(BlockDriverState *bs, Error **errp) { int ret; --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615992754; cv=pass; d=zohomail.com; s=zohoarc; b=jRvpQzohSSAzB3e/ZL8hZJc4eqSY6AFP27Y1wiMhjIDDEMBZ3zunJx7ig66Q0OZNmPK3igfrVp5IuBhE4F5jjQ4wLik6tASgIO2ATYtq9Rkm+Xtib4UsNKJilHLs0rC9AA06T4kpTXWZiVEfXP46ct/+/VgYOqq1HCtpoj2E3EE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615992754; 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=HFu7vg3wFCPC5WcQLVUakgFLpsOD5qxuvTUyLoQJ6x4=; b=UMwloWTWmNZfcQEKw/I8OTJJkEupyZxN4/wRihJktzpy6mQXGuJpRGyumyFrx75sXStcD8ciZ8yCbywOluQNjTBJTtHvPba2IGe5TZglFUnzSV8czUHhlvI33WHu9rqV5pj04FvG//MJI6cVWgfhZexI5Ac3xIModGZ/lSDt/BQ= 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 1615992754139701.6017994678211; Wed, 17 Mar 2021 07:52:34 -0700 (PDT) Received: from localhost ([::1]:47838 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXXD-00057H-Ad for importer@patchew.org; Wed, 17 Mar 2021 10:52:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXHu-0004pz-Nx; Wed, 17 Mar 2021 10:36:43 -0400 Received: from mail-eopbgr10137.outbound.protection.outlook.com ([40.107.1.137]:61154 helo=EUR02-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 1lMXHi-0006nM-Ij; Wed, 17 Mar 2021 10:36:42 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1650.eurprd08.prod.outlook.com (2603:10a6:203:2f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:22 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:22 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:20 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nO1Udt8apRazAiGbAdcgzdznaXeSHyNRU5R5CkZLnMS0YqRHQeP9FKh1aN2LQTyjURMXwuAntheJgumJq3btBzX/PXzn3XK7Xygw64xFahdqPtiWx1G4BajCiJWfGzzWREjhwo3lt1zBOeJugg4i12wGlI6lOkiya//TkOJPvqw0aWrVFNL+Iag5I7mckEb49+aJbhD8HwS8J5yXwx42vcDzJHUWbMoq/neLOKjFhXQcXQfWbnM9HmZg7JaQVwUYFtqhC+YLd8Hirfn2QFsI6mEN1sB7AgLYYt4tBzoEP1SmeKUzVFBwGMp8rpIJJ5wH34J4S0ZjFCHOHK3fFPma4g== 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=HFu7vg3wFCPC5WcQLVUakgFLpsOD5qxuvTUyLoQJ6x4=; b=SoFqRZ/2APvF658Q4RkUf9/cm/GpYB2SkoFjYKAPQyuEr0PyEtlmb6Kpz4Ev92LIB2rrg7Wc5v9E3nzF8wrUlDN1eRe+kiyGJTyLG0Gdps7zSxMsFFhWswOi3MIW7U83E5DD9Km8U8zR7E3kLsS2b1NtLpJnKQDgizFdHrmgHNRcmBSl3b49ADLGPQAFRiJcFAkNy8W8pum+ACDoViGRSCfKNWFAwM1972F1kybRA6cBwjZy4QYidXu+fUBRKfzP5LOyUSHCpTP3H2t6OeABd4OylLlm6FComstJoTrYLL2WFvmOWs+ukS+tajBWY84UTrhMTIWVk6VpJ3HdP4ahLA== 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=HFu7vg3wFCPC5WcQLVUakgFLpsOD5qxuvTUyLoQJ6x4=; b=IWmmZ2o4OENWFSj+2uvoixFx3dmzeoDaanCc/7GVgLsZ9Qb30TOjI+RBeFNlS6YowNh4ijdP7PE0lwkldeAqKYTBJgh2HtAjzXNeJs3B/tnjFocoDoEnZwzTmb6Sl0xcarUJ+IM5BxUL8w+hnjkWIzXbOtHZZZT/6OG+KS/vCLw= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 13/36] block: use topological sort for permission update Date: Wed, 17 Mar 2021 17:35:06 +0300 Message-Id: <20210317143529.615584-14-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: ff2eec20-09b7-46ec-91f0-08d8e95208cd X-MS-TrafficTypeDiagnostic: AM5PR0801MB1650: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hDFYairwByPldW9UcneN2r2raXhs2PVMFuuEkDE0tcOkZBU6qJTWOjD6C02a4IHBjvwNl0m3aMoodThmThki/FrKbrXh7/nW0QCmmPYj0zteDmHi1TI2h7U9WRp1AziuXyrMNOIpga8opN9rGRq7T89wviVazMMrtJETR0GbhGofpd41LCI0m+RLKYeuLq+BGupsHARqbKpZRbCgw4YStlkRMfzOvG3VLx439VqTVaGXvc5skd2PHeNRL/t08ieI6yQI3uCA7ZAKTAc+rLZH60h9wLfMIoOa3jzxV7rFgk7YOWYYarU8gmRI49dYQF5pXzf1ifu0hw9evgO4lX8/Aog/1iXQQW8lyc9U5VHkWJJXGFDopLlJGtWsXqTxy+PkmIPFrimk1WurE+mhPKHa0MTvie/keUBa8wGDXw1ijPlAhOozvQXA3OJQX+w5WoAak9LSxFZCyMFWoyyM9OcfEHHI1wbg50BdutV8J8esWa/GTFveSe8rSl+/R46WaHoDuPxSLKxLj/ZXveicFwh23XmhZmykE8Jl+5375TSsqWbhqOkSACgceZN66btgX0Mq0Fwb2+1XHjE+WI57ImoqqZGXduil4/PyuNoSYmPrvUlARlg6AmtsA/IrxCmoZC6O 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)(346002)(39840400004)(396003)(376002)(136003)(366004)(316002)(1076003)(956004)(6916009)(6506007)(69590400012)(66556008)(66476007)(6512007)(26005)(4326008)(5660300002)(83380400001)(8676002)(52116002)(2616005)(66946007)(6486002)(6666004)(186003)(36756003)(16526019)(2906002)(86362001)(8936002)(15650500001)(478600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?HlccsdQrVd8OrbBWN6FcocuXhfrTSnmteVw4G6K1e6/O2p304TqDU7MD1/oK?= =?us-ascii?Q?wxJGE6qIiBMfIDaM3HqBgFUUKpWtst94OYDHgORznyJhNdp07QrdWcfLbeOn?= =?us-ascii?Q?XFK1v+WSatm2RxPyjSslAqTkz1cMWDUFV6gAr8ZW7p3sfXFXT2fPi0wSBRnr?= =?us-ascii?Q?4pM12HhdS1pYwXcYcae4++6kYEXzWruqnDOKnc6TK0g7FmAxWqrC7uekOEGv?= =?us-ascii?Q?I2mrbGobfCDD85SP74S1feMjWLIZj6tWFzcBQiDAwOeCjVNPqygKY4s8kg2w?= =?us-ascii?Q?py6mN0LExoZkNJQ0fM6KUCYYyes1BVtmTd5j3hV/lX+7VTZzSnFu/VEaYIsI?= =?us-ascii?Q?QIw1lwgPxFfq39LCuljLztKYI6l0p2LO2dc146SB8K9RQLP6ahcugRWK/Fqd?= =?us-ascii?Q?rez+e2yFPJ5Q2zj23nNzTFteS5hmCOvbjb+QqnHaec5EX2TmDMMmIrfNrUfv?= =?us-ascii?Q?bKnsL0CKUI6sRJTsLkJczKvvkeI1WQH5nfrkmp/JEOEUf6g5MfGRFf8LTdbI?= =?us-ascii?Q?6Uf59Q7nvAzF+3ABF0RBOLaqD0YNV5ahbj2UYP9Wk+cGE9D+dlsMPXUKJIUT?= =?us-ascii?Q?gmp6JynZKyufQ+lisaYaWMWDu8A14DtxIRDEOZBs7gkpnPnwZzPZN/n9CSQj?= =?us-ascii?Q?er2J1ntbELEuIv3SVjXAnrSS3/yVGT3/dIx35Q3mm17jjDRoI2fqNXzmHn/6?= =?us-ascii?Q?ERXkO7pvzxvZtvnpEp1Acn2VceN3b9N2e/N47wgL4XkvHCHpNQLLJCR5lzxr?= =?us-ascii?Q?KSx7+rKa3+bFumFcO71NlE07XcVEwFBVREys9mUCPsogXzSEQMWujIYjCKKa?= =?us-ascii?Q?Gn8FcW31S4iBNVcXeNeVPM76hVslFyj8uHFT4qxRsR+fBzQXARf3B2E0GXNw?= =?us-ascii?Q?18KF+yIoIi79GAuaZY4lQBgCd4r+ncNPk6u+q5KP4YMurqLKTTUClrqRY41H?= =?us-ascii?Q?/7PVihJwE7uP1pv08uPSy4kNh0o7aPN/Dq6ldRnIlJHe7Dsuv4gvwi33R4sf?= =?us-ascii?Q?vjr/iPXSiGKpIOvx33rKNf7AXASyjJ+Di+SoS3BDxho8tOw3jjWq61O44P8Q?= =?us-ascii?Q?ErhepuOF6WtlGQlpHasPa5ssw6PuiaOLLPdg0/gqiqO4yfZ1W8LDEmMOoI8P?= =?us-ascii?Q?Fj0r66zqRG7aZ2NHF2Cah5jBqJOKrkk2siPk5kh+JtSrq9pEPttibLZyQA6M?= =?us-ascii?Q?HSVVbrbIBuyYzJDB4B5XtfSkavKHIByph5aLQhxbgdvotH61yiP39ClFsbzL?= =?us-ascii?Q?NSErK6eB1Qp5NpUp8E1yRsdJ92H/DyEJD1pzQWlgjWWMosocwywywgxrLheh?= =?us-ascii?Q?85h4MTfu95hCBxj0dbkuikq7?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff2eec20-09b7-46ec-91f0-08d8e95208cd X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:21.9654 (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: ZupNhdj5CJHtxkebi/iTFn9HG6SSuLa7k1YFucfE1mXEZjnHQTv18VH9SN78GzR9KMvRQmo72slCw1xP0bMD5fh+HVmGYdwUtHK6P+g8dK0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1650 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.1.137; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-HE1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" Rewrite bdrv_check_perm(), bdrv_abort_perm_update() and bdrv_set_perm() to update nodes in topological sort order instead of simple DFS. With topologically sorted nodes, we update a node only when all its parents already updated. With DFS it's not so. Consider the following example: A -+ | | | v | B | | v | C<-+ A is parent for B and C, B is parent for C. Obviously, to update permissions, we should go in order A B C, so, when we update C, all parent permissions already updated. But with current approach (simple recursion) we can update in sequence A C B C (C is updated twice). On first update of C, we consider old B permissions, so doing wrong thing. If it succeed, all is OK, on second C update we will finish with correct graph. But if the wrong thing failed, we break the whole process for no reason (it's possible that updated B permission will be less strict, but we will never check it). Also new approach gives a way to simultaneously and correctly update several nodes, we just need to run bdrv_topological_dfs() several times to add all nodes and their subtrees into one topologically sorted list (next patch will update bdrv_replace_node() in this manner). Test test_parallel_perm_update() is now passing, so move it out of debugging "if". We also need to support ignore_children in bdrv_parent_perms_conflict() For test 283 order of conflicting parents check is changed. Note also that in bdrv_check_perm() we don't check for parents conflict at root bs, as we may be in the middle of permission update in bdrv_reopen_multiple(). bdrv_reopen_multiple() will be updated soon. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block.c | 116 +++++++++++++++++++++++++------ tests/unit/test-bdrv-graph-mod.c | 4 +- tests/qemu-iotests/283.out | 2 +- 3 files changed, 99 insertions(+), 23 deletions(-) diff --git a/block.c b/block.c index 29fec1ffc0..14363dc550 100644 --- a/block.c +++ b/block.c @@ -2020,7 +2020,9 @@ static bool bdrv_a_allow_b(BdrvChild *a, BdrvChild *b= , Error **errp) return false; } =20 -static bool bdrv_parent_perms_conflict(BlockDriverState *bs, Error **errp) +static bool bdrv_parent_perms_conflict(BlockDriverState *bs, + GSList *ignore_children, + Error **errp) { BdrvChild *a, *b; =20 @@ -2030,8 +2032,12 @@ static bool bdrv_parent_perms_conflict(BlockDriverSt= ate *bs, Error **errp) * directions. */ QLIST_FOREACH(a, &bs->parents, next_parent) { + if (g_slist_find(ignore_children, a)) { + continue; + } + QLIST_FOREACH(b, &bs->parents, next_parent) { - if (a =3D=3D b) { + if (a =3D=3D b || g_slist_find(ignore_children, b)) { continue; } =20 @@ -2060,6 +2066,40 @@ static void bdrv_child_perm(BlockDriverState *bs, Bl= ockDriverState *child_bs, } } =20 +/* + * Adds the whole subtree of @bs (including @bs itself) to the @list (exce= pt for + * nodes that are already in the @list, of course) so that final list is + * topologically sorted. Return the result (GSList @list object is updated= , so + * don't use old reference after function call). + * + * On function start @list must be already topologically sorted and for an= y node + * in the @list the whole subtree of the node must be in the @list as well= . The + * simplest way to satisfy this criteria: use only result of + * bdrv_topological_dfs() or NULL as @list parameter. + */ +static GSList *bdrv_topological_dfs(GSList *list, GHashTable *found, + BlockDriverState *bs) +{ + BdrvChild *child; + g_autoptr(GHashTable) local_found =3D NULL; + + if (!found) { + assert(!list); + found =3D local_found =3D g_hash_table_new(NULL, NULL); + } + + if (g_hash_table_contains(found, bs)) { + return list; + } + g_hash_table_add(found, bs); + + QLIST_FOREACH(child, &bs->children, next) { + list =3D bdrv_topological_dfs(list, found, child->bs); + } + + return g_slist_prepend(list, bs); +} + static void bdrv_child_set_perm_commit(void *opaque) { BdrvChild *c =3D opaque; @@ -2124,10 +2164,10 @@ static void bdrv_child_set_perm_safe(BdrvChild *c, = uint64_t perm, * A call to this function must always be followed by a call to bdrv_set_p= erm() * or bdrv_abort_perm_update(). */ -static int bdrv_check_perm(BlockDriverState *bs, BlockReopenQueue *q, - uint64_t cumulative_perms, - uint64_t cumulative_shared_perms, - GSList *ignore_children, Error **errp) +static int bdrv_node_check_perm(BlockDriverState *bs, BlockReopenQueue *q, + uint64_t cumulative_perms, + uint64_t cumulative_shared_perms, + GSList *ignore_children, Error **errp) { BlockDriver *drv =3D bs->drv; BdrvChild *c; @@ -2192,21 +2232,43 @@ static int bdrv_check_perm(BlockDriverState *bs, Bl= ockReopenQueue *q, /* Check all children */ QLIST_FOREACH(c, &bs->children, next) { uint64_t cur_perm, cur_shared; - GSList *cur_ignore_children; =20 bdrv_child_perm(bs, c->bs, c, c->role, q, cumulative_perms, cumulative_shared_perms, &cur_perm, &cur_shared); + bdrv_child_set_perm_safe(c, cur_perm, cur_shared, NULL); + } + + return 0; +} + +static int bdrv_check_perm(BlockDriverState *bs, BlockReopenQueue *q, + uint64_t cumulative_perms, + uint64_t cumulative_shared_perms, + GSList *ignore_children, Error **errp) +{ + int ret; + BlockDriverState *root =3D bs; + g_autoptr(GSList) list =3D bdrv_topological_dfs(NULL, NULL, root); =20 - cur_ignore_children =3D g_slist_prepend(g_slist_copy(ignore_childr= en), c); - ret =3D bdrv_check_update_perm(c->bs, q, cur_perm, cur_shared, - cur_ignore_children, errp); - g_slist_free(cur_ignore_children); + for ( ; list; list =3D list->next) { + bs =3D list->data; + + if (bs !=3D root) { + if (bdrv_parent_perms_conflict(bs, ignore_children, errp)) { + return -EINVAL; + } + + bdrv_get_cumulative_perm(bs, &cumulative_perms, + &cumulative_shared_perms); + } + + ret =3D bdrv_node_check_perm(bs, q, cumulative_perms, + cumulative_shared_perms, + ignore_children, errp); if (ret < 0) { return ret; } - - bdrv_child_set_perm_safe(c, cur_perm, cur_shared, NULL); } =20 return 0; @@ -2216,10 +2278,8 @@ static int bdrv_check_perm(BlockDriverState *bs, Blo= ckReopenQueue *q, * Notifies drivers that after a previous bdrv_check_perm() call, the * permission update is not performed and any preparations made for it (e.= g. * taken file locks) need to be undone. - * - * This function recursively notifies all child nodes. */ -static void bdrv_abort_perm_update(BlockDriverState *bs) +static void bdrv_node_abort_perm_update(BlockDriverState *bs) { BlockDriver *drv =3D bs->drv; BdrvChild *c; @@ -2234,11 +2294,19 @@ static void bdrv_abort_perm_update(BlockDriverState= *bs) =20 QLIST_FOREACH(c, &bs->children, next) { bdrv_child_set_perm_abort(c); - bdrv_abort_perm_update(c->bs); } } =20 -static void bdrv_set_perm(BlockDriverState *bs) +static void bdrv_abort_perm_update(BlockDriverState *bs) +{ + g_autoptr(GSList) list =3D bdrv_topological_dfs(NULL, NULL, bs); + + for ( ; list; list =3D list->next) { + bdrv_node_abort_perm_update((BlockDriverState *)list->data); + } +} + +static void bdrv_node_set_perm(BlockDriverState *bs) { uint64_t cumulative_perms, cumulative_shared_perms; BlockDriver *drv =3D bs->drv; @@ -2264,7 +2332,15 @@ static void bdrv_set_perm(BlockDriverState *bs) /* Update all children */ QLIST_FOREACH(c, &bs->children, next) { bdrv_child_set_perm_commit(c); - bdrv_set_perm(c->bs); + } +} + +static void bdrv_set_perm(BlockDriverState *bs) +{ + g_autoptr(GSList) list =3D bdrv_topological_dfs(NULL, NULL, bs); + + for ( ; list; list =3D list->next) { + bdrv_node_set_perm((BlockDriverState *)list->data); } } =20 @@ -2377,7 +2453,7 @@ static int bdrv_refresh_perms(BlockDriverState *bs, E= rror **errp) int ret; uint64_t perm, shared_perm; =20 - if (bdrv_parent_perms_conflict(bs, errp)) { + if (bdrv_parent_perms_conflict(bs, NULL, errp)) { return -EPERM; } bdrv_get_cumulative_perm(bs, &perm, &shared_perm); diff --git a/tests/unit/test-bdrv-graph-mod.c b/tests/unit/test-bdrv-graph-= mod.c index 8188ddd84c..a98100ddfd 100644 --- a/tests/unit/test-bdrv-graph-mod.c +++ b/tests/unit/test-bdrv-graph-mod.c @@ -405,12 +405,12 @@ int main(int argc, char *argv[]) g_test_add_func("/bdrv-graph-mod/update-perm-tree", test_update_perm_t= ree); g_test_add_func("/bdrv-graph-mod/should-update-child", test_should_update_child); + g_test_add_func("/bdrv-graph-mod/parallel-perm-update", + test_parallel_perm_update); =20 if (debug) { g_test_add_func("/bdrv-graph-mod/parallel-exclusive-write", test_parallel_exclusive_write); - g_test_add_func("/bdrv-graph-mod/parallel-perm-update", - test_parallel_perm_update); g_test_add_func("/bdrv-graph-mod/append-greedy-filter", test_append_greedy_filter); } diff --git a/tests/qemu-iotests/283.out b/tests/qemu-iotests/283.out index 37c35058ae..73eb75102f 100644 --- a/tests/qemu-iotests/283.out +++ b/tests/qemu-iotests/283.out @@ -5,7 +5,7 @@ {"execute": "blockdev-add", "arguments": {"driver": "blkdebug", "image": "= base", "node-name": "other", "take-child-perms": ["write"]}} {"return": {}} {"execute": "blockdev-backup", "arguments": {"device": "source", "sync": "= full", "target": "target"}} -{"error": {"class": "GenericError", "desc": "Cannot set permissions for ba= ckup-top filter: Conflicts with use by other as 'image', which uses 'write'= on base"}} +{"error": {"class": "GenericError", "desc": "Cannot set permissions for ba= ckup-top filter: Conflicts with use by source as 'image', which does not al= low 'write' on base"}} =20 =3D=3D=3D backup-top should be gone after job-finalize =3D=3D=3D =20 --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615992909; cv=pass; d=zohomail.com; s=zohoarc; b=YpTMTSVpNPCzgJjygbgLnHI2stnGLe8ABdYI945pP2VRh9OMH3nuWGgyWB259D27d/9RS8MHhacYfz2gz1mlerud2qcJ6uLmKFzWDjX7/oAtAr5hsK1JsdCRi+rCBNvTl20do0CWePu83oU/mCpGKCu1hkhJ+0rnjamO0azgmiM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615992909; 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=i5XINqXI0m8IfRRoWav02IEV/fJDZufvrklOwknbNDU=; b=KBUiBykwhDNgATfQ63EGW5BdEpKFiVqWXPSOHleDE0JabPpqGeP/tJOD5xHd7ZWQHUK0TBfqTF+CANrxpJ67O10jRFDscGqx7Z6WqvQmTsWjaYvH+tA9v6t38kmTToqHOxxMh3G/HqyS/ChEbbt/K8+kZnjo6Gte7q+kYKeHuIw= 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 1615992909955259.1307750237273; Wed, 17 Mar 2021 07:55:09 -0700 (PDT) Received: from localhost ([::1]:55918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXZk-0008N3-Rp for importer@patchew.org; Wed, 17 Mar 2021 10:55:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34792) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXI3-0004ra-9G; Wed, 17 Mar 2021 10:36:51 -0400 Received: from mail-eopbgr10137.outbound.protection.outlook.com ([40.107.1.137]:61154 helo=EUR02-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 1lMXHw-0006nM-8N; Wed, 17 Mar 2021 10:36:51 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1650.eurprd08.prod.outlook.com (2603:10a6:203:2f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:23 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:23 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:22 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iNVnpoCoNm7vPZYIYgW+VVgWVnYruT0L2V4z7YmiVOYcITjUu4KLFv0PGLAPRtI8fr5eKMsgZjbNuv3Gope2ju0Z3Tw7gLXph7BrdzlKdi1ZuNjc7UE6csjyQ5R/FlYFtf38QI/8MlLscausKu4coZGdB7axf3UCgwvFHaWDgQBXex6KlMTQjkGHOQwDefi5Ql/fhKGQYve0CvdQx34txGhmcnD9ofBQXXh/FZQCpOIhItfIMD4+8XjpnANdrUB4zMLBfRY6p+j2Hp5IUpjYAzvrJ8xZ7AELBpYPl+UyO8tK/ueARlHGB8EK4IzEkxUPn9XOoiToqVTp02hxxvuFsw== 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=i5XINqXI0m8IfRRoWav02IEV/fJDZufvrklOwknbNDU=; b=kxP8faNO66UUCp0OskMkJPoIJILjLrzlCod2JyfMK1ZipaxuXIJR+Bnxib3ZIeqtTzbx5coSJ5OzERaXbLC77pa4suZFBkX8H3s7/Rs7UtUb+ro93I4EG/Oz718lSAftVmgNFicCmlmvfh5FHuN0PlYzE+5fwx5YKm6U6oK3k8/HsxDtFtQURLPVXeN5MEy1FfEjV/O3hxlFts9aQzTHzmCROZL6pjBQJSfHLuRDQNv+9zfgNtCcqcuxT8eVXYzyLFssDXJnsoxmYIbEtGYbGGcKsiJmwjSwlw6Xa2477qINoS0Fz6rpVHZ4WUAFHhYnqLsULoRyCJxtoEM4f9d0+w== 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=i5XINqXI0m8IfRRoWav02IEV/fJDZufvrklOwknbNDU=; b=nX6RdGWX1m/fXC8Ckw4LUiylwccuTbxYuyNH2ruIowRcigsONI8THMQ2Ibt5/yfKiO/FnubWp54a5KyqrzWy4IvCDQk6OqI8Ncet1ftt0qXG89SOZgfHaFIr/M9A9mSVLXOJ4MoKNWX96Wp7wuLLUJ5CPxV1MpCGhwLl2qpGxuk= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 14/36] block: add bdrv_drv_set_perm transaction action Date: Wed, 17 Mar 2021 17:35:07 +0300 Message-Id: <20210317143529.615584-15-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: 53421a98-1ed7-498b-c45e-08d8e95209aa X-MS-TrafficTypeDiagnostic: AM5PR0801MB1650: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:175; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZKd47m5Lz/3f1mCfsKZhuXLSIfj4+udtH9hmKsroOQtul/aYODGL9N2vg1f8CyqPyQf6rp99iyetzVKM0Z2BcR5ez1YuVz0chdkuJt1TmImpab4GNWSBQ2mxqFzuQ5EGps42ofgIldjyk8LPRZcw6N/eT+/iStnvaxfrgOvWA4a9rChsaLlumZKUM3O/PAUFgMwoDNou5rTWNIDj5lXqKOIqvQIm32QRct/P40LXpIorXBe64gyh0IEGLcyijd9zeGLM2wTN1qzRa0FX0C9/hIU/Z0xPQj+5u/qo0ZyLKrgF8FhPRsba35gpSqXabh+SNHIBIFIGfKT/HfJqoRwzmX8hS0sZBaaMQF5nx3DAF0Q8Yiz06644cV4d8imtaBjMd2D5CUbC9Fcjp04k+xGXrOH+VSChflHpJSI88GWCW8lhvtHKIjYehVAPhk00CWNQ0nDcfLOd0l+YG5cDY+XCfsDEjqc+WT0kaYelp7cpbEV2qqjyBPIOIRVPcPXRK5XfliNDaIaLtwZ5oM+95IS140ETFT264JhmQW5nEouGD5DQYolCe6W4SpYOnAUChjlOuV+c7zEOICYY2Y6BdAB4t6bAzQvDEtx42e7FjmhaoYfce6/IKkar0AhqQ5FOuBPx 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)(346002)(39840400004)(396003)(376002)(136003)(366004)(316002)(1076003)(956004)(6916009)(6506007)(69590400012)(66556008)(66476007)(6512007)(26005)(4326008)(5660300002)(83380400001)(8676002)(52116002)(2616005)(66946007)(6486002)(6666004)(186003)(36756003)(16526019)(2906002)(86362001)(8936002)(478600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?KRyEOteaS9f6sUwh8+ZXmbCo6/iTwbWKM6/ZYjAnaXNGqtzMri8Snuyml8CC?= =?us-ascii?Q?PFAWfk/+Pum9+reddsQ1NFQ1t2VH+l28RIswi8dXuDtOqPuJOmR+QBXggqlj?= =?us-ascii?Q?oPDhiejcX0/Jzpr1IxCcu1+0Hc5pkbenhgT55oVywarG4mxY2dUgJwWhPtci?= =?us-ascii?Q?NgNTOG3As47Vpipy5Lh+M9ASL3lByJiL3wrX/5ivAeDzW0foqKNIPeQSTLV1?= =?us-ascii?Q?eW+9js0OMBVG7J3dr+O/Hkx1IWqY5lmXmvPtX7NqzqcmQxiy4xPhCGRUawXL?= =?us-ascii?Q?HTCP3CaO6MYEw8RqPIST+fiFPEfbutKV+Nv8WGteaq2PuBcLyIiGGjaQkAA5?= =?us-ascii?Q?OzzIR5JRa0N/PYo2S3VgpGDDqx3JOwm8uYIvX4IzliOlA8Pt/PWq6M75JqFt?= =?us-ascii?Q?t361mhmWNHefQWfY27hl0i2Cybr661ecoczUcFMmxPqqt/pZRGLaZovGxJUv?= =?us-ascii?Q?3b2gwp2s1qm+JVLtVb5FptQq4LzHtQSjCCT8EPoRi28HptXjkYybFjWehQFY?= =?us-ascii?Q?gUvvykRZMECz/tlicJG0kFtSPBVPd+3WNiyXjPtLV4Rl4yb8mNSyOkuE+moH?= =?us-ascii?Q?v0plVrWufnc/Zo59djtA4CEVyrRMQsRBte1DF8ilC2v/dXsYFYOC3Tmbydyt?= =?us-ascii?Q?sCS86N8X7KWnoD089A8T93W1Z9q9pPO/p+eVHm+pVVKeqDpmUU6YGQaMK4ND?= =?us-ascii?Q?gAghZsOEznt30iKwj2GqJi30KG9pUbGfzc66JF4AITZpVjd2rvy2V8IcjI4b?= =?us-ascii?Q?NfUB6LF6jPoVurYHtOUIahoLghPH4vTogwNLByBy+Mw1BSAhsjESSzUo8iL3?= =?us-ascii?Q?TjubNiauBpJA5uLUnWeRV7GIbqs65TXRYDfxICSH0DqSKWMJZPPmVTSz5fnj?= =?us-ascii?Q?BlGs16ysby8bEVxJGKCwB6S6aeMIhSxsUgp8nH2/L6Cmb5VgE/sCVve5vjHP?= =?us-ascii?Q?i5r7uZ1C5VmIjoj2YLCOJ8y0xueffbt9aHJpzM7Vl8K8Z/qDKK9g73i9AYui?= =?us-ascii?Q?x9Zn/3TJQgCIFBBllp5j86i86YXkDEvWQdCgseaUWiP5ixq+wdZbc4OFKAxy?= =?us-ascii?Q?vsabAVq3wHuQuOz1Zc54qxcexHCtoqVJZjhZVwpFhuDLLlHuxAPWfch9wdkJ?= =?us-ascii?Q?Y7lpk1eEqC/7jyWUQfTNetOoXphPjbjX4f+BsgfY/yZyljQ2gDOtWLuglQFq?= =?us-ascii?Q?59H0TbfGOmYjAXDhFW/D51BcHB08XtcSjn9hN4GedeOc2ceIvi8JoTSMs8Mj?= =?us-ascii?Q?5/bq8bTlgOCiHoVfIIkpcYZn/PNjprXlICN9xTpFIXkRstBvpKYBQwJ808Z+?= =?us-ascii?Q?/QN9rsy6XaBu7fbWJfr3zR5M?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53421a98-1ed7-498b-c45e-08d8e95209aa X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:23.4917 (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: MjzktO6d1VOGVJlg+7zklZvEpPT7LcLwt3NNZ6JekxOJk7Z0uXpPmHM1CxqdZk58tcnNwJI4NAmPNapbToaVTjM6voVPra3iPZxCIT5A09Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1650 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.1.137; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-HE1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" Refactor calling driver callbacks to a separate transaction action to be used later. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block.c | 70 ++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 54 insertions(+), 16 deletions(-) diff --git a/block.c b/block.c index 14363dc550..337b515034 100644 --- a/block.c +++ b/block.c @@ -2155,6 +2155,54 @@ static void bdrv_child_set_perm_safe(BdrvChild *c, u= int64_t perm, } } =20 +static void bdrv_drv_set_perm_commit(void *opaque) +{ + BlockDriverState *bs =3D opaque; + uint64_t cumulative_perms, cumulative_shared_perms; + + if (bs->drv->bdrv_set_perm) { + bdrv_get_cumulative_perm(bs, &cumulative_perms, + &cumulative_shared_perms); + bs->drv->bdrv_set_perm(bs, cumulative_perms, cumulative_shared_per= ms); + } +} + +static void bdrv_drv_set_perm_abort(void *opaque) +{ + BlockDriverState *bs =3D opaque; + + if (bs->drv->bdrv_abort_perm_update) { + bs->drv->bdrv_abort_perm_update(bs); + } +} + +TransactionActionDrv bdrv_drv_set_perm_drv =3D { + .abort =3D bdrv_drv_set_perm_abort, + .commit =3D bdrv_drv_set_perm_commit, +}; + +static int bdrv_drv_set_perm(BlockDriverState *bs, uint64_t perm, + uint64_t shared_perm, Transaction *tran, + Error **errp) +{ + if (!bs->drv) { + return 0; + } + + if (bs->drv->bdrv_check_perm) { + int ret =3D bs->drv->bdrv_check_perm(bs, perm, shared_perm, errp); + if (ret < 0) { + return ret; + } + } + + if (tran) { + tran_add(tran, &bdrv_drv_set_perm_drv, bs); + } + + return 0; +} + /* * Check whether permissions on this node can be changed in a way that * @cumulative_perms and @cumulative_shared_perms are the new cumulative @@ -2215,12 +2263,10 @@ static int bdrv_node_check_perm(BlockDriverState *b= s, BlockReopenQueue *q, return 0; } =20 - if (drv->bdrv_check_perm) { - ret =3D drv->bdrv_check_perm(bs, cumulative_perms, - cumulative_shared_perms, errp); - if (ret < 0) { - return ret; - } + ret =3D bdrv_drv_set_perm(bs, cumulative_perms, cumulative_shared_perm= s, NULL, + errp); + if (ret < 0) { + return ret; } =20 /* Drivers that never have children can omit .bdrv_child_perm() */ @@ -2288,9 +2334,7 @@ static void bdrv_node_abort_perm_update(BlockDriverSt= ate *bs) return; } =20 - if (drv->bdrv_abort_perm_update) { - drv->bdrv_abort_perm_update(bs); - } + bdrv_drv_set_perm_abort(bs); =20 QLIST_FOREACH(c, &bs->children, next) { bdrv_child_set_perm_abort(c); @@ -2308,7 +2352,6 @@ static void bdrv_abort_perm_update(BlockDriverState *= bs) =20 static void bdrv_node_set_perm(BlockDriverState *bs) { - uint64_t cumulative_perms, cumulative_shared_perms; BlockDriver *drv =3D bs->drv; BdrvChild *c; =20 @@ -2316,12 +2359,7 @@ static void bdrv_node_set_perm(BlockDriverState *bs) return; } =20 - bdrv_get_cumulative_perm(bs, &cumulative_perms, &cumulative_shared_per= ms); - - /* Update this node */ - if (drv->bdrv_set_perm) { - drv->bdrv_set_perm(bs, cumulative_perms, cumulative_shared_perms); - } + bdrv_drv_set_perm_commit(bs); =20 /* Drivers that never have children can omit .bdrv_child_perm() */ if (!drv->bdrv_child_perm) { --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615993629; cv=pass; d=zohomail.com; s=zohoarc; b=GObOJMW6nqCiOERNQ/ErPwanBrVEbe5GgL8JjTpTOcj4bjFab/XVkizYzzzUcWI6W3CgLIR1uSZ4zFz8Wi/1JjhecrbXuxKv8hjqHqaF0eP934tORu4lrlcAsd8TP/eWmQ0RalOsZd7IYtyVONTd4CN3sT/j8CET/hEnRFCifDE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615993629; 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=sgOTkDm7vxV0ldJFl7lvkhfEgy5mIdY8S6HcGDtnfq4=; b=YJEE+bqbUBbbPZkP7vRo7CqG/xWY07ggggpEETIXUm0RxTFFyRsg/EulbtlZv4ngQ0eXCgxZTCqEyyQ9agLGcmoizUYYBB+VbNaHAyL5Yr+wrA/M2z36gMaW+TPN1qSR+gplJo1YXP1IMsLP0i8oaF2LdgizkmHM1a7zz71qC+o= 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 1615993629352872.5467745058116; Wed, 17 Mar 2021 08:07:09 -0700 (PDT) Received: from localhost ([::1]:55784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXlM-000410-5k for importer@patchew.org; Wed, 17 Mar 2021 11:07:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXIF-0005EN-FM; Wed, 17 Mar 2021 10:37:03 -0400 Received: from mail-eopbgr10137.outbound.protection.outlook.com ([40.107.1.137]:61154 helo=EUR02-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 1lMXI4-0006nM-9P; Wed, 17 Mar 2021 10:37:03 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1650.eurprd08.prod.outlook.com (2603:10a6:203:2f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:25 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:25 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:23 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C2IX+o/84RPoI278synmcrMBWmUFq5PENe7wjowrTBFA4/aWACytmmhtUbJwDXDCDqlnTuFgGq17qIH+EeleTny9Rj6nd/ryAgRUj4m9z+YhKdCL2gKcWCkaIETBmH88XaKfYCEEESzT2wGMmt3nifuXoQRiS+a3468nX1tJPdae+G6f6ZD48pgAOk64L2OFIpDonVmc6aL9HzV/J4SJo01j0sLM93prbknq7ivd6bSNFpPBHm5cwleciZPqXR8mz/I63avKtYe5tqbK9byF0b/pP83xBNtFCbqneoapIPmwqpYQmb+JnhtJ22qQb1x4GdndJrggBE5XPRFd0qDNmA== 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=sgOTkDm7vxV0ldJFl7lvkhfEgy5mIdY8S6HcGDtnfq4=; b=RFZWzvGQenrkfpdH+pZFJ1YVfw+UDxVnSa7NzedZL4MXJ+uGbbTLLcTyZm2ZLB38QfdAI/u92jLsgqH2lUFg0vSocT3d+dalf7upW5fZm0olbyQvp3vxEqTCI9HCVpdrAujjyap8eRTneQmP6caVfxKZmdGSah2G0ZpFXDNHW8I7Nqb1vmqnrZZcfJsX6NPBaf2qCj/Si7hBTbDkU4rgDN7rfIbGxAUNwpLY19+0zlizArAApopS4HWuTDzM5nJyDoJx106ZQ/arTNweibJb/he9/Yif4xfxdaLXJbVCaTtrlilvO+XXBHg28G/tSH2dX0AxMe/OK4d/Lk05cbLY9w== 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=sgOTkDm7vxV0ldJFl7lvkhfEgy5mIdY8S6HcGDtnfq4=; b=WrCf2ssl1wYirQaTTLVBHWJ9dQ0WclJlUdtAQuKODZmXplJEzki5dJKcygKNdTvRsk6aAxooG8gu508wnFbIMjGd4LniG1XPFMxJs1ue83YQnQwy0Pd2bOT7En5cU/5QmOSbfsXq7wCi1XRXm45Q+eUB9yMfbwBZxdxEOA1L1k8= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 15/36] block: add bdrv_list_* permission update functions Date: Wed, 17 Mar 2021 17:35:08 +0300 Message-Id: <20210317143529.615584-16-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: 091d4b33-6a1c-48f8-fe15-08d8e9520a9d X-MS-TrafficTypeDiagnostic: AM5PR0801MB1650: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:334; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dYlK+riRDHvUmnk9o3xeXYGQIfCy/3x4vkAj3U7lyT5cBRMvbGclGStrBefJksqK385gbq60MAHR5DKy+W6JJayaEDkMoN+c5Z0ultHCxx7midRcSWXe0Hf7KTgyN/xVbmqASghrfx2N+r3rVkWVejHWWoIKxiPqvGelZpxFDrl3YxqVe6DPE99hf8b4SViFv4VWMCTTndmsOB9vbqKKtg8HLo4DPFLq52OkR53EMheUd+tjagfEHQ+mmzJpSD6yyD6e44CK34XXDtQMfQqhIUbQmEikkGSLeHzdtZrien0zIZDrFvP0EDf8l1SIYhn6ZBfP4P0SN/z+WJG3eGBNXMt6qH28qYAYX7S3YXwyRoDCfqBJZ8YWt7t2xhYMoqy2Ki4JZstNtxf2S3ub7+g6EbmmebUUkSmqruyNNtAJ6tP1ei+ihL5Os06sTw6lH07HybmW71GcaFPtjh2sAjEsljbu7OkjshdW6laTx08T/LXuLUfhtUTiE7W7T789OURtPUs9OHm8/oQptsN4weqkIiSWcwsHSFnLrvZlDzrhj9yT6+WzQT9nknYxNLgIkcsn+57LmdX2Q79f6mFm03U02lEGAXhV4krJcKsHgx1TRzE= 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)(346002)(39840400004)(396003)(376002)(136003)(366004)(316002)(1076003)(956004)(6916009)(6506007)(69590400012)(66556008)(66476007)(6512007)(26005)(4326008)(5660300002)(83380400001)(8676002)(52116002)(2616005)(66946007)(6486002)(6666004)(186003)(36756003)(16526019)(2906002)(86362001)(8936002)(15650500001)(478600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?cahQYcavwsBytr9+k+kolMzj9048OF1fJ3MZKIxixK7XheawQDT227I/su1J?= =?us-ascii?Q?nmvFElAg1yGLlWaK+khCnsB+mB78gRRYwMbQGlCfkll+MYr8+uTR5RBiLiLs?= =?us-ascii?Q?/tcszRvOYSNC0OINBc1DsPCP/904HRSInUq/EJ9vseltwea2O67vy5uQPgOI?= =?us-ascii?Q?KJZ5RAglOAEzkPqiS5UOJPemiXPdTxBKbhNmmMEFaEk/X9PeIjHE7m5NcrCY?= =?us-ascii?Q?Fts2LarSE2JNX0D7Ia5T8kLqkV8gZ8LrsbJFbVZf4y/lCAAd1DMdDxHH9A9W?= =?us-ascii?Q?j/yiBilqTy37QrXNzCE5v4RKdeOBk9LrzkQCZOx+DqH4C2CAqo4h3wPa0Oce?= =?us-ascii?Q?Dmxln0RjQooswDSObTy+e8hJKZeolvCVSWBj+lt1sObiKZDYOhuoc2k+IJ5I?= =?us-ascii?Q?+cGEbH6KSNoG3cxsRTYafLh/oNJfMaREhihKlWbCRaHqXTxa1gf2lDe0L0ns?= =?us-ascii?Q?luJuapQ7kMNp6e9iOJIpUuGTNPKkvcYU/slCJht9lfKQdnNc/jfSkEQ+1DIu?= =?us-ascii?Q?Cuoitb+S83xDDL2kribVgKvf3ZT1b5HEfE24JmCEogaKwzwl6OzUhSjGd1hc?= =?us-ascii?Q?Lh5PpBH8ejn8IVXOtOdRvJly6VS9bfehZc/bVqMrj5KgHPSZzlbr3yjgaoxP?= =?us-ascii?Q?/XETOjVS/atTJjbKQHHgqGEfMR9A9pYHDIPRaW++TNPJAj5Wn0dLPIBjPW0I?= =?us-ascii?Q?9qOTGHky/37PqGJn3S5BBkpC0qiGKnGdXG0sYBBAN3FkPgttAnQrwRy2HzLL?= =?us-ascii?Q?Q1FGypf20IhMxrDSQ2ZYEoHsC6elih08AVLQuDV46d1n3oi7otAvadDw9+ob?= =?us-ascii?Q?CiwuR+Bc0gPgoASlFLo/v1uZyoaHj8orwsGEoNJTkIdbDMxiLPTE23vMGP5Y?= =?us-ascii?Q?il7YPjH+dSOFSCjukTUOsTe8WQbkudnEAi4MkdSBoOpntmk2bTXQlD1gHrpW?= =?us-ascii?Q?CF88WFGaDb1IeFrJD9kpFy+nSv5ymPM9SlfunUzu81aFlrYUPd+lrM8KSoeO?= =?us-ascii?Q?F85rQxkzEMsvOlTjy1NjyQrtNCUQG7PE2LpBChlKQCG+8svf9DN1YNywCifU?= =?us-ascii?Q?te/5hLQgb5F/AsgIDs7gSoYyZkmIAFbOYnNf8FpEOkIrwcVZch8ofaiI/fWH?= =?us-ascii?Q?FFZOAPXcMXdPU/pS7O6OJZ+8MLFtr6Sc2ukhYmKxyRA/egM6UWIWBG4Jgcr+?= =?us-ascii?Q?6c+zo9IgOGe2cG/cC+a7R6xDWWAxbXO1PCWOrZGhhewAxx5hQ8+Mv5dIFjzw?= =?us-ascii?Q?i7eRPE4bOUUf+Q8InHS0x0p9ua+451aS9p+2lktFd/Xa/zrIFSNDPdRqfg3r?= =?us-ascii?Q?tdCl9n8NNibSMEwVT6SwVspL?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 091d4b33-6a1c-48f8-fe15-08d8e9520a9d X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:24.9513 (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: 3KsDuSLcHO11qoymLal6pxMbdFWNvTzzvN3XSRGTX50JpXHbh2gnQybIJ2FMxIvGVPRGGeeRAQk/FYcIAIABW2VVDbjoEQG2AQ+tb21+zPA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1650 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.1.137; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-HE1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" Add new interface, allowing use of existing node list. It will be used to fix bdrv_replace_node() in the further commit. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block.c | 106 +++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 71 insertions(+), 35 deletions(-) diff --git a/block.c b/block.c index 337b515034..31a4e4fa5c 100644 --- a/block.c +++ b/block.c @@ -2215,7 +2215,8 @@ static int bdrv_drv_set_perm(BlockDriverState *bs, ui= nt64_t perm, static int bdrv_node_check_perm(BlockDriverState *bs, BlockReopenQueue *q, uint64_t cumulative_perms, uint64_t cumulative_shared_perms, - GSList *ignore_children, Error **errp) + GSList *ignore_children, + Transaction *tran, Error **errp) { BlockDriver *drv =3D bs->drv; BdrvChild *c; @@ -2263,7 +2264,7 @@ static int bdrv_node_check_perm(BlockDriverState *bs,= BlockReopenQueue *q, return 0; } =20 - ret =3D bdrv_drv_set_perm(bs, cumulative_perms, cumulative_shared_perm= s, NULL, + ret =3D bdrv_drv_set_perm(bs, cumulative_perms, cumulative_shared_perm= s, tran, errp); if (ret < 0) { return ret; @@ -2282,36 +2283,53 @@ static int bdrv_node_check_perm(BlockDriverState *b= s, BlockReopenQueue *q, bdrv_child_perm(bs, c->bs, c, c->role, q, cumulative_perms, cumulative_shared_perms, &cur_perm, &cur_shared); - bdrv_child_set_perm_safe(c, cur_perm, cur_shared, NULL); + bdrv_child_set_perm_safe(c, cur_perm, cur_shared, tran); } =20 return 0; } =20 -static int bdrv_check_perm(BlockDriverState *bs, BlockReopenQueue *q, - uint64_t cumulative_perms, - uint64_t cumulative_shared_perms, - GSList *ignore_children, Error **errp) +/* + * If use_cumulative_perms is true, use cumulative_perms and + * cumulative_shared_perms for first element of the list. Otherwise just r= efresh + * all permissions. + */ +static int bdrv_check_perm_common(GSList *list, BlockReopenQueue *q, + bool use_cumulative_perms, + uint64_t cumulative_perms, + uint64_t cumulative_shared_perms, + GSList *ignore_children, + Transaction *tran, Error **errp) { int ret; - BlockDriverState *root =3D bs; - g_autoptr(GSList) list =3D bdrv_topological_dfs(NULL, NULL, root); + BlockDriverState *bs; =20 - for ( ; list; list =3D list->next) { + if (use_cumulative_perms) { bs =3D list->data; =20 - if (bs !=3D root) { - if (bdrv_parent_perms_conflict(bs, ignore_children, errp)) { - return -EINVAL; - } + ret =3D bdrv_node_check_perm(bs, q, cumulative_perms, + cumulative_shared_perms, + ignore_children, tran, errp); + if (ret < 0) { + return ret; + } =20 - bdrv_get_cumulative_perm(bs, &cumulative_perms, - &cumulative_shared_perms); + list =3D list->next; + } + + for ( ; list; list =3D list->next) { + bs =3D list->data; + + if (bdrv_parent_perms_conflict(bs, ignore_children, errp)) { + return -EINVAL; } =20 + bdrv_get_cumulative_perm(bs, &cumulative_perms, + &cumulative_shared_perms); + ret =3D bdrv_node_check_perm(bs, q, cumulative_perms, cumulative_shared_perms, - ignore_children, errp); + ignore_children, tran, errp); if (ret < 0) { return ret; } @@ -2320,6 +2338,23 @@ static int bdrv_check_perm(BlockDriverState *bs, Blo= ckReopenQueue *q, return 0; } =20 +static int bdrv_check_perm(BlockDriverState *bs, BlockReopenQueue *q, + uint64_t cumulative_perms, + uint64_t cumulative_shared_perms, + GSList *ignore_children, Error **errp) +{ + g_autoptr(GSList) list =3D bdrv_topological_dfs(NULL, NULL, bs); + return bdrv_check_perm_common(list, q, true, cumulative_perms, + cumulative_shared_perms, ignore_children, + NULL, errp); +} + +static int bdrv_list_refresh_perms(GSList *list, BlockReopenQueue *q, + Transaction *tran, Error **errp) +{ + return bdrv_check_perm_common(list, q, false, 0, 0, NULL, tran, errp); +} + /* * Notifies drivers that after a previous bdrv_check_perm() call, the * permission update is not performed and any preparations made for it (e.= g. @@ -2341,15 +2376,19 @@ static void bdrv_node_abort_perm_update(BlockDriver= State *bs) } } =20 -static void bdrv_abort_perm_update(BlockDriverState *bs) +static void bdrv_list_abort_perm_update(GSList *list) { - g_autoptr(GSList) list =3D bdrv_topological_dfs(NULL, NULL, bs); - for ( ; list; list =3D list->next) { bdrv_node_abort_perm_update((BlockDriverState *)list->data); } } =20 +static void bdrv_abort_perm_update(BlockDriverState *bs) +{ + g_autoptr(GSList) list =3D bdrv_topological_dfs(NULL, NULL, bs); + return bdrv_list_abort_perm_update(list); +} + static void bdrv_node_set_perm(BlockDriverState *bs) { BlockDriver *drv =3D bs->drv; @@ -2373,15 +2412,19 @@ static void bdrv_node_set_perm(BlockDriverState *bs) } } =20 -static void bdrv_set_perm(BlockDriverState *bs) +static void bdrv_list_set_perm(GSList *list) { - g_autoptr(GSList) list =3D bdrv_topological_dfs(NULL, NULL, bs); - for ( ; list; list =3D list->next) { bdrv_node_set_perm((BlockDriverState *)list->data); } } =20 +static void bdrv_set_perm(BlockDriverState *bs) +{ + g_autoptr(GSList) list =3D bdrv_topological_dfs(NULL, NULL, bs); + return bdrv_list_set_perm(list); +} + void bdrv_get_cumulative_perm(BlockDriverState *bs, uint64_t *perm, uint64_t *shared_perm) { @@ -2489,20 +2532,13 @@ static int bdrv_check_update_perm(BlockDriverState = *bs, BlockReopenQueue *q, static int bdrv_refresh_perms(BlockDriverState *bs, Error **errp) { int ret; - uint64_t perm, shared_perm; + Transaction *tran =3D tran_new(); + g_autoptr(GSList) list =3D bdrv_topological_dfs(NULL, NULL, bs); =20 - if (bdrv_parent_perms_conflict(bs, NULL, errp)) { - return -EPERM; - } - bdrv_get_cumulative_perm(bs, &perm, &shared_perm); - ret =3D bdrv_check_perm(bs, NULL, perm, shared_perm, NULL, errp); - if (ret < 0) { - bdrv_abort_perm_update(bs); - return ret; - } - bdrv_set_perm(bs); + ret =3D bdrv_list_refresh_perms(list, NULL, tran, errp); + tran_finalize(tran, ret); =20 - return 0; + return ret; } =20 int bdrv_child_try_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared, --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615993753; cv=pass; d=zohomail.com; s=zohoarc; b=FBHTHq5fWIXCpnXBzuKmhykzGyG6I0fPSUjKdirQr31rqpHeiV3HreHDNzt5f6Br770OX6wKKh1lb5BmahEgqdPzRsl+cHPEJeEvcgYh4+nhPqdtGBiNcuYfNOMxgi8CHx+unAr7h6XSL5TsTUQIIEsOC3PgFJ2dw2tIY2tXD3I= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615993753; 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=YfBN9zlcEJiO23kCGmefPkHek9TaUiKpEyCluBpdysk=; b=LlhWMupbYdVmMiuDsMeBw2/he+DuR9N91nk+LvG6leHXpPX2WXDPgY/caD5BXwTZOT5FfpzdtzoNlk6NGKNI/tSdjZxg3x+mhr8MsBBlyoV8QnqT6LE/VOjofJX2qVdsHUvNAofKjWbaSMV0p6m5uiFJewu5WHXvA96UvgZwrHg= 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 1615993753347403.43502237441794; Wed, 17 Mar 2021 08:09:13 -0700 (PDT) Received: from localhost ([::1]:33082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXnL-0006XA-V0 for importer@patchew.org; Wed, 17 Mar 2021 11:09:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXII-0005Kr-5a; Wed, 17 Mar 2021 10:37:06 -0400 Received: from mail-eopbgr10137.outbound.protection.outlook.com ([40.107.1.137]:61154 helo=EUR02-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 1lMXIG-0006nM-9d; Wed, 17 Mar 2021 10:37:05 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1650.eurprd08.prod.outlook.com (2603:10a6:203:2f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:26 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:26 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:25 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A0r2I5l6r8YmZZ2XjhqSz+qldZAdLi91qAbPBklwhAWNxso7Yw1nFqBFg9du1G2W2V1F7Eenv82RzyAoh/TfO6UTJVBr+QaE0jvg9D2TwFMsI8JPplyN97zNhv2DwBq2W5z26Sa4Eu1lHEBLr8YOJMn1W8ywUXYeQ2lHtgH9f/qhsodYQ3otKkSbZO+mENdCOIj2FRcLEpL87Y0cUxzFzzgSy6MaieHUM9DHBHCG5a+DHDotDvdxDpeCpGx7kfaSkvwcDOuz13BVwoCIlC5IOnoTrySvVAkGAPCJENrFoZCrY90l8GxQ8cKohFdhlU2RkGhsbSluhmOc7nJooL1zng== 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=YfBN9zlcEJiO23kCGmefPkHek9TaUiKpEyCluBpdysk=; b=fKHEQBpgTh/6cKY9MeRt55dyD16nxW9TP4YL3gHX5AAy7bFLHN7jCtinoz1Ed3RxZtIcBeyKUG39G/bvGumpK8NCTUL0pmw4AlNu1XVcWONebQsFEOzbuVC4pCBZQPQ+Gn7XDC3lue0Pk1+K4xiLLrDcOYnF3XB1ia4lLRdOcfe6CZdWJzq1rJWgXHWrPzxxm+WMQEFQ/4gbDbSEL+HACcnn7I07AH8KF67NvMl/m1yD2mXGGY2ptAOPFBvBEAkTydDl+oUl3fUIj6NBILKOAHNNXavZPE1KhZr5//SJyJ8WpLFVXDNOCL2wDMuDFif0+uwyGojPMff1AGZQuGbjoQ== 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=YfBN9zlcEJiO23kCGmefPkHek9TaUiKpEyCluBpdysk=; b=m5FOG0LL/lRCiNZgdLVN5iMCH5NiNVqbhN5TJgLc7lgfTBBUaXmuTYdPwUifHPH2oV08CU7D4KrTLsMdAMJjzUTXotNubouli6jOiyZMGIlvh2mxU3SLi0wukJR8/MVsX5BBDYPbcbkbXHaYIBrPlywJyxZgbCyuwDiatMWPUkM= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 16/36] block: add bdrv_replace_child_safe() transaction action Date: Wed, 17 Mar 2021 17:35:09 +0300 Message-Id: <20210317143529.615584-17-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: eaa3d4c9-d3e8-41b2-cc01-08d8e9520b7b X-MS-TrafficTypeDiagnostic: AM5PR0801MB1650: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:159; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Wk1c3GYnkJFrj2fHypDG5nHaBl/zNEs5U/jRyp83GeDjdvzR2gKohR3rbn4QWariCfz+Uq0pelXQUPqRJcEmrJhkwi474SfX4q7XZUEETaYPOeX517Mn70Gt52X9TQpUy2ZCYp2p09+RV7bjaWX98htqKuyuZhcw3eTjjMgw2X4z+75Kq/rjqfG5FTBHel86Sgg/jYEaqZ27LixaWyMx0/iFroheJ6F4r58TAZy6drrkx0mMH8YhiejdhENWwiqjpUyf26lCWvqOpvcMcEImJMRlRtnw3ZFLMwhi7bqZ0sv5dKfCBOsbIz7XyfcpZTJ+iGBM2bKWX0WaU/N75bblPBxtrFm/TR2k4HRQf13sCOVOCEwyxxwcVRgA+vCSZJo6vUZrV07hKpkVpc1Pk7l4n2o9f4qsCuVMYBcP0oVpoe5EOGKzMu4kxGLsY4NFxfBCkTkU6q23S0UwqGz7EwRcnK4mp8HGiXdLo8koeoQidL5N5dB5Qkuxoan+Z2bmRRvCZzJskCCJaFpXlx8FPbVpXm+7ilBGCOZWY18rOkWqDt5dAx6WprvkAXTRr3fCFqLNmtA/2N4Ke6MC5K366L1QdgMF34k0oIm009ohE4ZQyN4qzOtcVcYpTXFosz0ne9AT 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)(346002)(39840400004)(396003)(376002)(136003)(366004)(316002)(1076003)(956004)(6916009)(6506007)(69590400012)(66556008)(66476007)(6512007)(26005)(4326008)(5660300002)(83380400001)(8676002)(52116002)(2616005)(66946007)(6486002)(6666004)(186003)(36756003)(16526019)(2906002)(86362001)(8936002)(478600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?63pYaRU18+aZLI4ZNSlr1GdM0de0dUv/wuKzMSKOLD+Sjw23SlxymTZ7Bvc+?= =?us-ascii?Q?bNlkyrTzRTRUe9TnYMw4jWhM+uUg4ywchUNa/S7MNmlx4P+/LWfejG9k2xY/?= =?us-ascii?Q?UGZ4hhqUtye31KncoHPlMitwrIm4E3A5wtg+rVZQfX7waoXFFbQh2ckHLBE8?= =?us-ascii?Q?lCDi3KlTeuvuExGpTfgrizpElAJm9vuat7NixFybInOw9xBVwDNqIHgbxVQk?= =?us-ascii?Q?KtBUMoyW6YUtj2hn+n+l100NiEjKLY/JPNxAb2wKEqI3fgzZfbXUQ9p6Mhxh?= =?us-ascii?Q?r2SaM87ULj0ViTrSeanIJfaXBPG3AChGWE9/Ww3zi0q8abUB4+cEPu3fX6w5?= =?us-ascii?Q?HbnSV6fKCyDIO3OoacxSLFcZQWpvpXmhIoQk0MaRexo4mJgZDMzR3uMAjWYl?= =?us-ascii?Q?nPakzJat6nCT5lawhkbyzEz+MQvkDy4SYrsLqHmRf3g4xAcTYkIsDe9ZOAX1?= =?us-ascii?Q?hPrA9HsbobECQDYWOecbryWb60NTiactiEs19SVeaNDTiTNhKmudpyxnODB/?= =?us-ascii?Q?QHjGD+4G8WX+MVuBMjuBHYoMkrjaqWpBJ5SgHlvlPvR4pXPu3jtFQadbGLYD?= =?us-ascii?Q?1HyrM4ivnZsB1SU98byWzDTxS98M91zOZwKos/dA9VR2l6EdAs3TvOzNj29l?= =?us-ascii?Q?tSoZjoEgumespHfXSEpA80HK11DVLUJKRQ5jhy4DQu3BnJboRTbiR//Yd2dp?= =?us-ascii?Q?/4eImVVQRNkOE1Jluhd+a6IQm0ypWIxI5Xo9wJb9328ydodiIqRZFZisdXEW?= =?us-ascii?Q?2v18AMvlpfz7EnjNkmJKSisKExo3wewZBgtcDyjuLSmp64LkwZC53nlrROdX?= =?us-ascii?Q?G6wUPJhSYQptx5ZcKrB3mluYl2UiEUP7uBDucnh6gCj0wzkVxigW8wYWie8x?= =?us-ascii?Q?B39zaThbE2J5Lr0FAJJOb3DggWQlHp0drND7AI+XVJoZI/OqHEnygUZJ4vzt?= =?us-ascii?Q?QakEzhZ/xKjDJnXqWXuIdp3jq94DcyFDcFwX6oXUVDoSUWXK72J3PEmtOBWo?= =?us-ascii?Q?QZQoPpDVuDZ/ji8F6M/NYZsDp1VoNSSCrVAvtvhbubhyFtDx04jN8GbBsHyj?= =?us-ascii?Q?Xo7WCzfoUKfjC5eyJICg6760rrLqxTW7YoaJO6ldcMkXUqwuLk0LK4teRTNm?= =?us-ascii?Q?HaOyt7DDP5VuWckYLOtI0dvgdBf6akuZotrrye+cvDCDrlsgcIg1jgJjFSmS?= =?us-ascii?Q?MLIYHjksqXVc3Pd9NPCo8QkIGfw8pgzBkCHY/b9uyFSNJbzHSYJAoQNb9hnw?= =?us-ascii?Q?Bxdf/xtL7N3qbs7WuuCId2G0VtsHfCReGIb3atzE0NRqO0hhh71bH1IgdkeO?= =?us-ascii?Q?VGZv3wxZGUzCXNiYMF/XvfeA?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: eaa3d4c9-d3e8-41b2-cc01-08d8e9520b7b X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:26.4567 (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: Z0Ltekhu8rcdXTf2q6OzIlmyDufC2O8G27g2sUb+LHkEmSqf18jovYy9K44WFSIf54dvX2eTQA42tPSv0h/jk7rAgvTqy5CSI+CwgvCQuwU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1650 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.1.137; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-HE1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" To be used in the following commit. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/block.c b/block.c index 31a4e4fa5c..4f9d67a6a2 100644 --- a/block.c +++ b/block.c @@ -83,6 +83,9 @@ static BlockDriverState *bdrv_open_inherit(const char *fi= lename, BdrvChildRole child_role, Error **errp); =20 +static void bdrv_replace_child_noperm(BdrvChild *child, + BlockDriverState *new_bs); + static int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQ= ueue *queue, Error **errp); static void bdrv_reopen_commit(BDRVReopenState *reopen_state); @@ -2203,6 +2206,57 @@ static int bdrv_drv_set_perm(BlockDriverState *bs, u= int64_t perm, return 0; } =20 +typedef struct BdrvReplaceChildState { + BdrvChild *child; + BlockDriverState *old_bs; +} BdrvReplaceChildState; + +static void bdrv_replace_child_commit(void *opaque) +{ + BdrvReplaceChildState *s =3D opaque; + + bdrv_unref(s->old_bs); +} + +static void bdrv_replace_child_abort(void *opaque) +{ + BdrvReplaceChildState *s =3D opaque; + BlockDriverState *new_bs =3D s->child->bs; + + /* old_bs reference is transparently moved from @s to @s->child */ + bdrv_replace_child_noperm(s->child, s->old_bs); + bdrv_unref(new_bs); +} + +static TransactionActionDrv bdrv_replace_child_drv =3D { + .commit =3D bdrv_replace_child_commit, + .abort =3D bdrv_replace_child_abort, + .clean =3D g_free, +}; + +/* + * bdrv_replace_child_safe + * + * Note: real unref of old_bs is done only on commit. + */ +__attribute__((unused)) +static void bdrv_replace_child_safe(BdrvChild *child, BlockDriverState *ne= w_bs, + Transaction *tran) +{ + BdrvReplaceChildState *s =3D g_new(BdrvReplaceChildState, 1); + *s =3D (BdrvReplaceChildState) { + .child =3D child, + .old_bs =3D child->bs, + }; + tran_add(tran, &bdrv_replace_child_drv, s); + + if (new_bs) { + bdrv_ref(new_bs); + } + bdrv_replace_child_noperm(child, new_bs); + /* old_bs reference is transparently moved from @child to @s */ +} + /* * Check whether permissions on this node can be changed in a way that * @cumulative_perms and @cumulative_shared_perms are the new cumulative --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615992631; cv=pass; d=zohomail.com; s=zohoarc; b=BprP+7UgPI8QMzCisSCDScf8aEiHwmtXyUdihI185LUATta7Ki3vRXl9av+YxFo6nixe6GgPyzfrJqUA00dObWLYyVV0/QNco4ek6tRwypNcj4ry6ueqrf4ZSsoNMKpVAZQ1EHggPvCY//pvy6fyYj/dpBMf4wxsSVQPkLxtnzk= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615992631; 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=OYcqiy4ihjujf/Jn0LG1ss8aPGVx9JfNETGztUANNPQ=; b=SCnkz83DXgkK5b5w0zPZQ+HBJ0Bh+6569jQ6rKT7bgeEDpjwDRuB+Shgi33eGiuH0uldcKp3WD1y7G03jQ+9MEdfMDG79foL9/aNbTTrN14zbEvw40JGOcyUlPt3VX4zWzkfGkkCw1Y3lrc1HIyzLDuWpTe+SFyK7B+WW+57lfw= 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 1615992631648631.915368122409; Wed, 17 Mar 2021 07:50:31 -0700 (PDT) Received: from localhost ([::1]:42568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXVG-0002uT-Fn for importer@patchew.org; Wed, 17 Mar 2021 10:50:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXHj-0004kl-Lb; Wed, 17 Mar 2021 10:36:31 -0400 Received: from mail-eopbgr60091.outbound.protection.outlook.com ([40.107.6.91]:41454 helo=EUR04-DB3-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 1lMXHh-0006rZ-Jd; Wed, 17 Mar 2021 10:36:31 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3544.eurprd08.prod.outlook.com (2603:10a6:20b:4e::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:27 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:27 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NZcBTwkzatDJBZrGTemJVbmiR+4EEaoP5I6I/lKO7WZ8ub9qdutVKKPbMa6Atgw27iAw3RjrGgezGANJCAdgfNLH0NGMLlnHeLD6AED1hzOfDJ8g64pUrgHkypTUrGNML3PO7srSmsTGN/r5OD/4q/scujA3cOvwWyknsilW/PAf+cpUhqI/GonAtz0KvHU0Bs9KG8g/YX4xDYGuQDajEGEewBXGZFtPvLtJWQhi2CDVbBXf4F5CnqrxwvIq6gW1wCAg6ONYpQD+hhwBAmaBZIiy/p034r5IPVBwowy5FSTe5uVZv9hwTEYjbPlSmSv/5l63wyYcA9XNRw7qeLn0yw== 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=OYcqiy4ihjujf/Jn0LG1ss8aPGVx9JfNETGztUANNPQ=; b=CgcJxe23w0fdKmq4WE3/FGJFPS/eV3Zhw28uBeljFGfNwWk22ZeqvIoCxzH83YUnISDyObbQuI2Rc/V1Ms1G08idQmrvglGKZOpINXqpcAOMr8RXf36TidYWYaeuMENgn/2EQF2yMJ1PAWok8OjoqN27ALxNvnIAuq9IqpNOWz8lF+OaWlyfmaaJ5S+J0yhKnkOCm2NBzeM7t5Do7zRO9ZtxGpdViQkOtzSHBkdYzAhAZgh+8p0IzEin4OkX0TFOmoyrm5+4Z8v04CgigtAsnQOY+gWFf8ODXZxTXCTMo6J7P3qjLUtsUB1WD4ZptnO7Uf4uWHh8wxw2uWQdoAf50A== 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=OYcqiy4ihjujf/Jn0LG1ss8aPGVx9JfNETGztUANNPQ=; b=ETpckUQYlhp/w3idYWOKzex2rfuskGfoHpqxcoOSBSl1wzKVzE5yvemoyqx/tAFaLveGGGDDvDx7JYcgTpRnKzlE6R0X03KfiQ2rCwDLTRCSpOfa10X9GwDBmVzj395/0ZFUNn6rYn7isP6CVLJ0xs3RLzSAHSyaH1yt139ImEw= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 17/36] block: fix bdrv_replace_node_common Date: Wed, 17 Mar 2021 17:35:10 +0300 Message-Id: <20210317143529.615584-18-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: 110ef3fc-be4d-4a0b-7fe9-08d8e9520c55 X-MS-TrafficTypeDiagnostic: AM6PR08MB3544: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2399; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M0VvXPd2NRNEUpvW0GBK5qZc3UZ/qXWAbKH/KTu6hEWLjqtzVl6nOVwSaLBOBlzl7pnxOZN4/gtnzfvusg5NDMjGjJp0AXfLFNbE0HVUDsSfFXnbUnTvxXYfS7uEdBCTsQQ0hHKMJuYxBeInV0AOprdAsowBMk00KP+72szGFAgSu/ltO86XJUQRfOM2bHcGn79kgQbhLdKlbArWfHgxJl9L3eI3vfkrI00zNQdc3y+vDyUH+Ml6RODeuaEU6bVdPPPucZu5emlU/WffBUpQ1Wv6ez5OGlxD5awdR6u37FZgJxXf6rC626ynd2aIKKQrIeFsY59JIbZef8CmHvSjZgFZ8eJNUFZjYR+aEcGxvkN8vgmMdYdHR0VAeQWH88yQlmGHw8zvMErwxE/hZlToDx25MF3Jc4UwHMycCnsPuw0g8qs6+NmDwDlh2ZPmqB4pVaGP/mP3jMmftJExjz/s7fnUQZM3TEVUkKTyPBnnZ9YjY7qJYzvcPvMpuELtuE6vzVBAPDIfzD57hkZuYWQe/JtAziPnjnMtq7KnqaHo8p4d2sVL/8cZNk0G2ONCHgIEqG8TWY+qrCEtq849njeSdIGOs9yfALo4E7w56388nw7nITFh1wBY5V6wlzeXKa6I 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)(346002)(366004)(376002)(39840400004)(136003)(396003)(186003)(8676002)(16526019)(26005)(86362001)(1076003)(52116002)(36756003)(6916009)(66476007)(6506007)(4326008)(6486002)(2616005)(5660300002)(8936002)(66556008)(66946007)(83380400001)(2906002)(478600001)(956004)(6666004)(69590400012)(6512007)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?2tX5RKI8vWDGnBQhdiudIziFCsEkrGAhn4D58JZSF5CN9xizn47CISb/zqgm?= =?us-ascii?Q?TeF2kHn92Y6HxYFPutWJ13ujTRuzO17+K4Qaby3ViAOWM7LF5SXo4ko5wBzT?= =?us-ascii?Q?fmyGL++qD1uo7gGWPCUwZrkGiewK0qYUCluBiZIj4jRkgdgv6hhdrvYOx1wO?= =?us-ascii?Q?yHPGtWGR7bgWaAIZ3sZz3wKpezYHChWiiQjQ/6EL6F7QEg9z4YyWvk2IjD6C?= =?us-ascii?Q?Km3wQjCk3cVanMU9q14bj7UWPcjBlowDYzEsEXsY9DMBF+RT9zcKDywe38yY?= =?us-ascii?Q?3ii6QDhilbwuIavFq+qZi+VZVwiq/ujSrbfs0vr04atP4eS2VNuCnskV0iRi?= =?us-ascii?Q?lOnjMK36jTxXi9KcRFHcWTCCDxmCcrpunXYwxY7necwX6K4yoKt2lZr2T6jd?= =?us-ascii?Q?8vo7QUWqGiS78OvqpVffBHpl/8IJHLd1TaILKJ+bLosdHWSbExKxs9hNMFBk?= =?us-ascii?Q?+xXcbr4ZgHYGTP4wL0YXhoLPmBsZFbnFldaB/ktPAGIFPi57TIijZfC93HKJ?= =?us-ascii?Q?93fWXPH3ZrE4dE23sJ/28ZYZENReq6Z8PGosnNnieTqgMFey5ozhABR/TSiy?= =?us-ascii?Q?B2d2F55R6XjigrjbtcQaqOVDYF46NtJdiqzNZLgQsvVSs4OaibCcB4U79vUn?= =?us-ascii?Q?EhfopoJnxvmkUpguTUiRTpc0SKV7Db199ZiYw0bFNij6V1iVJjqH0AIb3hbP?= =?us-ascii?Q?QlqdmrMfs9255HZsfZ7rd6Idj1SvrTjF1l79CWqHv3O1Vuciv+RbtxiCDUiP?= =?us-ascii?Q?P0JUrHAGhG409DNq20rayZjkvB2MRz90HDcvjgCsguUsLaIqMd70m31XHLQa?= =?us-ascii?Q?XJHISVMuhlC31N60B+IOJQs7SFm5HVN2obLAU1tNuhJJlmQH1qqZRPWzxULX?= =?us-ascii?Q?71aYW6LZeOl61UmbcysSiD7DGeqtqV/p0MioE22ZOQ4drRYWawM6PLayBbCJ?= =?us-ascii?Q?S1UCMKB355wUKBhuZccbh1cbkZ0j7sM6EHw7YwuHDyCK44Bn8avPQKkYoyX2?= =?us-ascii?Q?n5toJmGFb1X5yekGjEDCrUOPLIiSeSPJd9HYKmVUjcD7ihwLj9+Zq+zCLH9w?= =?us-ascii?Q?EReBtISILAsoIdeZR063i8K2yoBsjJqJfS33cMFvG/eYo4OlemZkOS89ithq?= =?us-ascii?Q?l4G6x85O4kOcV4+dbZUvY0rGwg1DLhDhr9Z7AwyUrGO199z/i9sS1Lm5VQ1p?= =?us-ascii?Q?pDddej+pbUoCbJ/nxZaFHhdZy30N7gPUZ1fuQui77397X/yzSIy/dhsO/zWF?= =?us-ascii?Q?TMsuRynTZcbbq+C++qJC4KZRrP8dQ6PaEFqjgmSGGpsS/Q1vW/0xVoRQD1O1?= =?us-ascii?Q?UKczl65ZdDCfq5+pBDH/Ga4/?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 110ef3fc-be4d-4a0b-7fe9-08d8e9520c55 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:27.8048 (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: H+vxiaIgVRFvCdwOlrEoHhVWiWhlmTZbaiLv6t8nggmNFwQ7gEFi11vcuRLrXcdKu3bgcOn9BMiC06Y2b9l7mlmeNQ9ckDsStz+hJ9qyGKQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3544 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.6.91; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-DB3-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" inore_children thing doesn't help to track all propagated permissions of children we want to ignore. The simplest way to correctly update permissions is update graph first and then do permission update. In this case we just referesh permissions for the whole subgraph (in topological-sort defined order) and everything is correctly calculated automatically without any ignore_children. So, refactor bdrv_replace_node_common to first do graph update and then refresh the permissions. Test test_parallel_exclusive_write() now pass, so move it out of debugging "if". Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block.c | 43 +++++++++++++------------------- tests/unit/test-bdrv-graph-mod.c | 4 +-- 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/block.c b/block.c index 4f9d67a6a2..98ff44dbf7 100644 --- a/block.c +++ b/block.c @@ -2239,7 +2239,6 @@ static TransactionActionDrv bdrv_replace_child_drv = =3D { * * Note: real unref of old_bs is done only on commit. */ -__attribute__((unused)) static void bdrv_replace_child_safe(BdrvChild *child, BlockDriverState *ne= w_bs, Transaction *tran) { @@ -4843,8 +4842,9 @@ static int bdrv_replace_node_common(BlockDriverState = *from, bool auto_skip, Error **errp) { BdrvChild *c, *next; - GSList *list =3D NULL, *p; - uint64_t perm =3D 0, shared =3D BLK_PERM_ALL; + Transaction *tran =3D tran_new(); + g_autoptr(GHashTable) found =3D NULL; + g_autoptr(GSList) refresh_list =3D NULL; int ret; =20 /* Make sure that @from doesn't go away until we have successfully att= ached @@ -4855,7 +4855,12 @@ static int bdrv_replace_node_common(BlockDriverState= *from, assert(bdrv_get_aio_context(from) =3D=3D bdrv_get_aio_context(to)); bdrv_drained_begin(from); =20 - /* Put all parents into @list and calculate their cumulative permissio= ns */ + /* + * Do the replacement without permission update. + * Replacement may influence the permissions, we should calculate new + * permissions based on new graph. If we fail, we'll roll-back the + * replacement. + */ QLIST_FOREACH_SAFE(c, &from->parents, next_parent, next) { assert(c->bs =3D=3D from); if (!should_update_child(c, to)) { @@ -4873,36 +4878,24 @@ static int bdrv_replace_node_common(BlockDriverStat= e *from, c->name, from->node_name); goto out; } - list =3D g_slist_prepend(list, c); - perm |=3D c->perm; - shared &=3D c->shared_perm; + bdrv_replace_child_safe(c, to, tran); } =20 - /* Check whether the required permissions can be granted on @to, ignor= ing - * all BdrvChild in @list so that they can't block themselves. */ - ret =3D bdrv_check_update_perm(to, NULL, perm, shared, list, errp); - if (ret < 0) { - bdrv_abort_perm_update(to); - goto out; - } + found =3D g_hash_table_new(NULL, NULL); =20 - /* Now actually perform the change. We performed the permission check = for - * all elements of @list at once, so set the permissions all at once a= t the - * very end. */ - for (p =3D list; p !=3D NULL; p =3D p->next) { - c =3D p->data; + refresh_list =3D bdrv_topological_dfs(refresh_list, found, to); + refresh_list =3D bdrv_topological_dfs(refresh_list, found, from); =20 - bdrv_ref(to); - bdrv_replace_child_noperm(c, to); - bdrv_unref(from); + ret =3D bdrv_list_refresh_perms(refresh_list, NULL, tran, errp); + if (ret < 0) { + goto out; } =20 - bdrv_set_perm(to); - ret =3D 0; =20 out: - g_slist_free(list); + tran_finalize(tran, ret); + bdrv_drained_end(from); bdrv_unref(from); =20 diff --git a/tests/unit/test-bdrv-graph-mod.c b/tests/unit/test-bdrv-graph-= mod.c index a98100ddfd..b81787487a 100644 --- a/tests/unit/test-bdrv-graph-mod.c +++ b/tests/unit/test-bdrv-graph-mod.c @@ -407,10 +407,10 @@ int main(int argc, char *argv[]) test_should_update_child); g_test_add_func("/bdrv-graph-mod/parallel-perm-update", test_parallel_perm_update); + g_test_add_func("/bdrv-graph-mod/parallel-exclusive-write", + test_parallel_exclusive_write); =20 if (debug) { - g_test_add_func("/bdrv-graph-mod/parallel-exclusive-write", - test_parallel_exclusive_write); g_test_add_func("/bdrv-graph-mod/append-greedy-filter", test_append_greedy_filter); } --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615992319; cv=pass; d=zohomail.com; s=zohoarc; b=YXjHd2TniUnEjxyRvPRrftBjOSA/jsy0l+G5OpxnDz0ihCNqxuhd/Psc3779ycFC661hnwC8dTHIRC9A5A8oSPbnfnNEH39aXEI7U2cmWeVAZr82uH509pLP8NUvlt0gA6NGT99ZwJR7//sEAX/nFo8Cj3+hCWxqllDPtEQtSaw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615992319; 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=MXC+/hmi+ww7Erz97Y5eGx8It1Q77eahxTXng/xnr9k=; b=AakKuAYzAS+uQGH6HELdDCEhOZW9SWa8WMgYEQDtjtdF/L/O0llZewNiptN/Y0iE8ykV5o7VJ9qW95qVoLXiXSm6mC2/ec37oO14nZw9s0wmef5vLl+wYXUH1m+T34mW6aEqm8Our+qEn+J1vCkXb8Qos9rGd5gDYj3ckKu+J3M= 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 1615992319734439.8570117802385; Wed, 17 Mar 2021 07:45:19 -0700 (PDT) Received: from localhost ([::1]:55192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXQE-0004pw-H7 for importer@patchew.org; Wed, 17 Mar 2021 10:45:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXHv-0004qB-UA; Wed, 17 Mar 2021 10:36:47 -0400 Received: from mail-eopbgr60123.outbound.protection.outlook.com ([40.107.6.123]:28737 helo=EUR04-DB3-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 1lMXHj-0006ux-MJ; Wed, 17 Mar 2021 10:36:43 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3544.eurprd08.prod.outlook.com (2603:10a6:20b:4e::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:29 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:29 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fmu+beG7TOPQ4oSeLl3iPrBlrdNDO9j/9u6mSq0zo0wlAKcOBQBYJ5Z5/DOWmwiaF1FKopfHZQiM5T2fEHOY8Nryl6mwgHiZVoNqVY/jb8fii8ysRi8JLNkuYgpjQKVm6YbW89FmNBh/QWOi+fBmeh8wuVWhiW0WtuDWrxsnvigcT27EdWuWomUlVkFqpaw88qY54Xzh5VGd18BPnS85CmceUgPlFMVji4oOTpzUJ13dl4cn/GD32m80/XMH0ZuwhewDbW5U9Pzz9f4j0wfn3r6oFJv52uh3pOz+DnbJlxysRvd9OrPqu4+fPfXpcdVbMGvVQXqPT+irTdoaEwtURw== 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=MXC+/hmi+ww7Erz97Y5eGx8It1Q77eahxTXng/xnr9k=; b=arR8iH/3GJrdaUFAVvsu0TRDpOki7EM5fsWPDbFAphcSdQvr7CVDT1Wv9KJ/oVjmXm74JEKVTWW4eTp/bjU3diVGGTL3oOZufSc0eR5lmp/j9Pd3g+/g8AwB60sF4jnp+ynxda02Th6/GC1qwgT4FvVGFmt/5pvfuufWNCB5UqsDgQSXFtYHHOLGjQQMDkqE02u0KhxYuBZpUAURmJnYsa2i/oDABR6TLR/T+lgJsOMeJBXuP9vz8ZUpmn09gl3gqMd5iH4bNqm2YWKDjd2anfEh8NOk0GGyxxhzn85bBkDnxM8Rx8NXsuGycSl0stIJNCnxYUSQt8gVexKj23L1LA== 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=MXC+/hmi+ww7Erz97Y5eGx8It1Q77eahxTXng/xnr9k=; b=VMNWqQliffb6CDtbQi+MX93Ci+czBMPpkJySA/XeMHLI1qGBBg9hl9Y/1fJH0bxQevZYobRywVk2RfYLBRANbFiWKGwKb8o56YuONHdUB5xv9igR4bXi06VtZhARbCvNfboSeh9Pr+U9eNdjY+LxhUufjuctq3VYFiPa/6WmOv0= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 18/36] block: add bdrv_attach_child_common() transaction action Date: Wed, 17 Mar 2021 17:35:11 +0300 Message-Id: <20210317143529.615584-19-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: 80d36711-7d4b-4f37-7ac0-08d8e9520d25 X-MS-TrafficTypeDiagnostic: AM6PR08MB3544: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2887; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UN4ydbJuA20jOPeHZXvCA/tejjPfFfX7GXpBvgtNA+ZBv2O8CjKrbwtSjrTEYi5qeOzMPRlUHBh0rwaJ1FGEE8xRvconAZxuzM0N4qXSfFQV+yvnP6VUYDsI5VI4AWalavzsN4zXDdyi2H395AlKcr+ruT6hP8WEeZ0yUXuxc3TYQpVGQW1RZBXPywwJhcQx91eUlquEyMPglrDmCpR0+tgrdFlBvEa55UYz3VRy34qXdiatCHMEvGbttDwBCoA16ssozzuqPZGsaqA2M2cA1myqhBXx89IMCa6Myas2hb7Q+t7NZhORi/iBW9EHfGyBpiZqtm7mgCJnnFV7ymRUi090CV+NaE5n1TRj2cIT4Ug1zZjLTdDLNuNG6Hg1J2+8JWwRqeXjdZk7SHaSD3IlP+vAyV94NrFb+kwxNQRLTeDwoVdT7luhNidefVtuGWsc/Lz3vmcvvdIrK+6K422wM9DUxjGYjat4J8g6mkHzMh0ln7mBAVr7Ounu1MMzLU7gFFW7ZMoOjEh3suiS+z2MnG5wE3E5u00oKoBGjrEFPchPxdIMVfDyTRfgOV5lCenstbcZo/E6hYxWGD4934SEaalo7JTUj3S/TlvTTkqCJEyXyqBIHWEJHfxVCEuBjJ3L 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)(346002)(366004)(376002)(39840400004)(136003)(396003)(186003)(8676002)(16526019)(26005)(86362001)(1076003)(52116002)(36756003)(6916009)(66476007)(6506007)(4326008)(6486002)(2616005)(5660300002)(8936002)(66556008)(66946007)(83380400001)(2906002)(478600001)(956004)(6666004)(69590400012)(6512007)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?LNtCHs7Cb8puVERmxDoVQWGCfPtPIgm8U8VhD+4p6JYNP1JUPPHYB0Dmw2w8?= =?us-ascii?Q?8AXzNtCzoy3bYplsgL3aPGYXn6bfZDfF5RT+Plx1rudiLdqf4+b0J7P8mJ84?= =?us-ascii?Q?k3khdDpwiHiN2GCaD43usI96dPUQtW2K/JEBPrQpgtzBQa0m2FbUvCx68nmO?= =?us-ascii?Q?ihZ6UAv72wk8dPtbXGjpyM0uNEnanYJo1rd1LTV8rTK2YG5cnF5RAuavKVW2?= =?us-ascii?Q?pxvkbFdCUOxClDjAdDOe4oGelqluODNmKRcZzCOGWTG6S8t4VSG5dO9Vt8Fk?= =?us-ascii?Q?EaWRIu7uP0dW0+bsGGbeA8o1ACnbbsxqmfAaZbtiekqbYJMxJp3xrL+6FjUK?= =?us-ascii?Q?b6i6wsv3MC3Be5Zq7AruDcxmK5e7m4M0kVHPnNIabbMlPFaaygjNnlX0B4y4?= =?us-ascii?Q?PgIfyUPF60eBytiFNHFK6emnY1xbP4STev4QzUrbE3fnj+wAVlF56B1tAwcZ?= =?us-ascii?Q?9+xMIEveDXsb432Et268svzFY60dyHSWFbDAqf9ZT4TXhvXdJIQMHKvpCaj+?= =?us-ascii?Q?m7qQgjxMyOkfIuwqcv50Anh/MEXfMOfU64Jm+TQkS15T9Eoap3PpejiJbdRH?= =?us-ascii?Q?xCKUZQSIlvA4pfefyPXtjXJkVlplPbIIQg/iJTAZuSb6NKUhUxjlyuccMSDs?= =?us-ascii?Q?YSvnnewMHAivvL2rhxrZSbUasISVIhXPb3RjtjiOgn4Ki0lHSVBnR9VKbPej?= =?us-ascii?Q?+9XB2SoczG03hybwlGXxIVbawpCKNGoxP+cdb192VPQARkBL6GEZLMFqu6cx?= =?us-ascii?Q?/BgF6FQ4bCcEr0q9hMt3SkE321OOLR8aYe8r1hSN9HxvDiKyVdyUG+07mIZ5?= =?us-ascii?Q?eh62I9FWRz41wZPxzX35IVxu03nUtJ5chXPpDIBJUb6AlF83vsPv1/Fo3DqG?= =?us-ascii?Q?xGwhzCgDXjxie6vQ2zDNZ72v1KRIZZrSRy9sRHsFyd/Lled+G28TMCfcLbPS?= =?us-ascii?Q?azPvsDAAdb0RyEeaYKU3vhgEKMmfv+N9HsnaRNdLsVKW29X42v+VEYhTU+Ep?= =?us-ascii?Q?6QYRhzxJRwLUgiDBQbHpVF8ynHDBIDGlXi1hvFQwcMvpX2XRGUg8lLIzhKcv?= =?us-ascii?Q?Mj5yep3O+AQ3Mfgs3v6QgjgH9fDl7Prye/LSb8KXgCxYNLA4DNW8LJ8jywUS?= =?us-ascii?Q?p53EGoBVwp1tZXZTUtqcs/X4Wxe66iO/dE8w+EQw9KsYA31Xy+nTACkBjc0o?= =?us-ascii?Q?uhL5++h8G8Xc5m/OU3aowG1zTePN+8MqEdfrMh5lX2+j3uYhftRpRHxx6DVj?= =?us-ascii?Q?iQ9Jr/3foJvOEfbUIz/2A6MBbkeboLxX7/477RU4rZHoRgM1jBRjz3oEGtyS?= =?us-ascii?Q?evsPIfN+/UxJST/dw4j0w0kr?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80d36711-7d4b-4f37-7ac0-08d8e9520d25 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:29.2006 (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: w4eps9+o4I/nhevI6jB+dfb2hPBsVDft02dRXfZ1z1D3WnIcxLoJmiZAhbqkn2ePhxCCtPt5EzJ2IgfMMAOgfMryJ1m/NKnSZJPFtKEBjAE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3544 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.6.123; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-DB3-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , 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" Split out no-perm part of bdrv_root_attach_child() into separate transaction action. bdrv_root_attach_child() now moves to new permission update paradigm: first update graph relations then update permissions. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block.c | 189 ++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 135 insertions(+), 54 deletions(-) diff --git a/block.c b/block.c index 98ff44dbf7..b6bdc534d2 100644 --- a/block.c +++ b/block.c @@ -2921,37 +2921,73 @@ static void bdrv_replace_child(BdrvChild *child, Bl= ockDriverState *new_bs) } } =20 -/* - * This function steals the reference to child_bs from the caller. - * That reference is later dropped by bdrv_root_unref_child(). - * - * On failure NULL is returned, errp is set and the reference to - * child_bs is also dropped. - * - * The caller must hold the AioContext lock @child_bs, but not that of @ctx - * (unless @child_bs is already in @ctx). - */ -BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs, - const char *child_name, - const BdrvChildClass *child_class, - BdrvChildRole child_role, - uint64_t perm, uint64_t shared_perm, - void *opaque, Error **errp) +static void bdrv_remove_empty_child(BdrvChild *child) { - BdrvChild *child; - Error *local_err =3D NULL; - int ret; - AioContext *ctx; + assert(!child->bs); + QLIST_SAFE_REMOVE(child, next); + g_free(child->name); + g_free(child); +} =20 - ret =3D bdrv_check_update_perm(child_bs, NULL, perm, shared_perm, NULL= , errp); - if (ret < 0) { - bdrv_abort_perm_update(child_bs); - bdrv_unref(child_bs); - return NULL; +typedef struct BdrvAttachChildCommonState { + BdrvChild **child; + AioContext *old_parent_ctx; + AioContext *old_child_ctx; +} BdrvAttachChildCommonState; + +static void bdrv_attach_child_common_abort(void *opaque) +{ + BdrvAttachChildCommonState *s =3D opaque; + BdrvChild *child =3D *s->child; + BlockDriverState *bs =3D child->bs; + + bdrv_replace_child_noperm(child, NULL); + + if (bdrv_get_aio_context(bs) !=3D s->old_child_ctx) { + bdrv_try_set_aio_context(bs, s->old_child_ctx, &error_abort); } =20 - child =3D g_new(BdrvChild, 1); - *child =3D (BdrvChild) { + if (bdrv_child_get_parent_aio_context(child) !=3D s->old_parent_ctx) { + GSList *ignore =3D g_slist_prepend(NULL, child); + + child->klass->can_set_aio_ctx(child, s->old_parent_ctx, &ignore, + &error_abort); + g_slist_free(ignore); + ignore =3D g_slist_prepend(NULL, child); + child->klass->set_aio_ctx(child, s->old_parent_ctx, &ignore); + + g_slist_free(ignore); + } + + bdrv_unref(bs); + bdrv_remove_empty_child(child); + *s->child =3D NULL; +} + +static TransactionActionDrv bdrv_attach_child_common_drv =3D { + .abort =3D bdrv_attach_child_common_abort, +}; + +/* + * Common part of attoching bdrv child to bs or to blk or to job + */ +static int bdrv_attach_child_common(BlockDriverState *child_bs, + const char *child_name, + const BdrvChildClass *child_class, + BdrvChildRole child_role, + uint64_t perm, uint64_t shared_perm, + void *opaque, BdrvChild **child, + Transaction *tran, Error **errp) +{ + BdrvChild *new_child; + AioContext *parent_ctx; + AioContext *child_ctx =3D bdrv_get_aio_context(child_bs); + + assert(child); + assert(*child =3D=3D NULL); + + new_child =3D g_new(BdrvChild, 1); + *new_child =3D (BdrvChild) { .bs =3D NULL, .name =3D g_strdup(child_name), .klass =3D child_class, @@ -2961,37 +2997,92 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState = *child_bs, .opaque =3D opaque, }; =20 - ctx =3D bdrv_child_get_parent_aio_context(child); - - /* If the AioContexts don't match, first try to move the subtree of + /* + * If the AioContexts don't match, first try to move the subtree of * child_bs into the AioContext of the new parent. If this doesn't wor= k, - * try moving the parent into the AioContext of child_bs instead. */ - if (bdrv_get_aio_context(child_bs) !=3D ctx) { - ret =3D bdrv_try_set_aio_context(child_bs, ctx, &local_err); + * try moving the parent into the AioContext of child_bs instead. + */ + parent_ctx =3D bdrv_child_get_parent_aio_context(new_child); + if (child_ctx !=3D parent_ctx) { + Error *local_err =3D NULL; + int ret =3D bdrv_try_set_aio_context(child_bs, parent_ctx, &local_= err); + if (ret < 0 && child_class->can_set_aio_ctx) { - GSList *ignore =3D g_slist_prepend(NULL, child); - ctx =3D bdrv_get_aio_context(child_bs); - if (child_class->can_set_aio_ctx(child, ctx, &ignore, NULL)) { + GSList *ignore =3D g_slist_prepend(NULL, new_child); + if (child_class->can_set_aio_ctx(new_child, child_ctx, &ignore, + NULL)) + { error_free(local_err); ret =3D 0; g_slist_free(ignore); - ignore =3D g_slist_prepend(NULL, child); - child_class->set_aio_ctx(child, ctx, &ignore); + ignore =3D g_slist_prepend(NULL, new_child); + child_class->set_aio_ctx(new_child, child_ctx, &ignore); } g_slist_free(ignore); } + if (ret < 0) { error_propagate(errp, local_err); - g_free(child); - bdrv_abort_perm_update(child_bs); - bdrv_unref(child_bs); - return NULL; + bdrv_remove_empty_child(new_child); + return ret; } } =20 - /* This performs the matching bdrv_set_perm() for the above check. */ - bdrv_replace_child(child, child_bs); + bdrv_ref(child_bs); + bdrv_replace_child_noperm(new_child, child_bs); + + *child =3D new_child; =20 + BdrvAttachChildCommonState *s =3D g_new(BdrvAttachChildCommonState, 1); + *s =3D (BdrvAttachChildCommonState) { + .child =3D child, + .old_parent_ctx =3D parent_ctx, + .old_child_ctx =3D child_ctx, + }; + tran_add(tran, &bdrv_attach_child_common_drv, s); + + return 0; +} + +static void bdrv_detach_child(BdrvChild *child) +{ + bdrv_replace_child(child, NULL); + bdrv_remove_empty_child(child); +} + +/* + * This function steals the reference to child_bs from the caller. + * That reference is later dropped by bdrv_root_unref_child(). + * + * On failure NULL is returned, errp is set and the reference to + * child_bs is also dropped. + * + * The caller must hold the AioContext lock @child_bs, but not that of @ctx + * (unless @child_bs is already in @ctx). + */ +BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs, + const char *child_name, + const BdrvChildClass *child_class, + BdrvChildRole child_role, + uint64_t perm, uint64_t shared_perm, + void *opaque, Error **errp) +{ + int ret; + BdrvChild *child =3D NULL; + Transaction *tran =3D tran_new(); + + ret =3D bdrv_attach_child_common(child_bs, child_name, child_class, + child_role, perm, shared_perm, opaque, + &child, tran, errp); + if (ret < 0) { + bdrv_unref(child_bs); + return NULL; + } + + ret =3D bdrv_refresh_perms(child_bs, errp); + tran_finalize(tran, ret); + + bdrv_unref(child_bs); return child; } =20 @@ -3033,16 +3124,6 @@ BdrvChild *bdrv_attach_child(BlockDriverState *paren= t_bs, return child; } =20 -static void bdrv_detach_child(BdrvChild *child) -{ - QLIST_SAFE_REMOVE(child, next); - - bdrv_replace_child(child, NULL); - - g_free(child->name); - g_free(child); -} - /* Callers must ensure that child->frozen is false. */ void bdrv_root_unref_child(BdrvChild *child) { --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615992824; cv=pass; d=zohomail.com; s=zohoarc; b=fmiqmHloN318gbkU8rKKIspPdz1WbcJIr2zSCA9+nFDxl1L1uENLB4SgTx5aLNyRuGmD3Z1BVsC1psl48/K42pmVnbhWtCXQ42xGaK1zbVoiKZJ3GZ3OdH+qgS4cUDwwowCWttKH+ci5+JzgMTQW77l2xPT+3Aghx+rkVJiUcyM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615992824; 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=GewYM4sInAfDMBRFy9lpG6jxNuxss/XPzy7M68ezJfk=; b=YjidZ8MOMfsRS/Z9eyvWFhgC3oSNUy+JWgHoH1WtBMJsKmB5RpTg2PEVkCRJCZmvD0I9r82b/V3vT5hLZgMrly+o0qEcXX8BJzJeP+tkb4j8r25pT9daa8fTf8dX2+4TEfbuzU7zNSHxEFwgE29SNblqUtd/ch5XvRqp0NldNuY= 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 161599282475194.81060388400624; Wed, 17 Mar 2021 07:53:44 -0700 (PDT) Received: from localhost ([::1]:52046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXYN-0006pX-KL for importer@patchew.org; Wed, 17 Mar 2021 10:53:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXHr-0004oR-Hh; Wed, 17 Mar 2021 10:36:39 -0400 Received: from mail-eopbgr60091.outbound.protection.outlook.com ([40.107.6.91]:41454 helo=EUR04-DB3-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 1lMXHo-0006rZ-65; Wed, 17 Mar 2021 10:36:39 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3544.eurprd08.prod.outlook.com (2603:10a6:20b:4e::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:30 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:30 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:29 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UbmO1tQky85fglB66Y4qUr2y6iJOpoEN7v45mh1ybCeae7geDy4iYB/sre0zpb0YpzMRjARdxwlJZwVf9r82KCps2ZJynBOwdF8/FkZD5PZvXMEAXyMWBPoTetZfxVF/W6ViXm7Py0oLXHK8SZh8d3D2vevfYgX8EJW+R+u5Gevh0tS9fguu5lCqirEENyqpciy/W8HIQSBIuIIQRbyyGSS/+hWorqYSUVw324h0tVrsWbWOvo0OnohPhIE8FzlHMmgnvDsEYEP0Bcq/zCw+bt5XEOsCXuvNcfyzZSuNoXPV+3/2VP4sjrDpKSGTRWaBAdPTon2T4rka9P9Uyonteg== 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=GewYM4sInAfDMBRFy9lpG6jxNuxss/XPzy7M68ezJfk=; b=IpN3yTbuiMpeMbwAPWwWoeKFSGx/FAejsjsR+RO3pSF0bMujAwUaXBHMIWrfGr1SUTvVO8mZ6eco+gbIMmI9WUYb7tnSjULT0u/rkdIao4wKv25U8g8E+ce7evyAaU8pL+Json53Yxv110XaGM0PRC1l4iDmsrA3ZUpU/hNSFcjU/PB9EaEehtrKF+vUyeFBOM6/wFNDKCSbqIC6s4zVvAzlcuAuYILVUToGAPuriZKyKuHKDe5qaO6iyorYNKD+brhsa+ew2+joJhLowXe26FHGIrMio9QalAG0WlCwcjTdMqFw5VkApk6DIR4dE4eFskvWl9B2SpbAWIp6BfUhTw== 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=GewYM4sInAfDMBRFy9lpG6jxNuxss/XPzy7M68ezJfk=; b=HgaCZcPEGLKtGXSJSDIyqpRmr5j4rjcNO/rSlt+Suidb76gvrI1p1GUCH87t0GswfjCy7IWYmQhdH2O9a9CAahZHY+qX2jW4Fwa+YPoNuWRzX8KAH5hCC8nH/6wqmpcUUpAmQj6vetqW99Enxq72lKGI17+7+PTmEH0yQn4AoG4= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 19/36] block: add bdrv_attach_child_noperm() transaction action Date: Wed, 17 Mar 2021 17:35:12 +0300 Message-Id: <20210317143529.615584-20-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: 354f7a49-b4ae-43cf-5bec-08d8e9520dfd X-MS-TrafficTypeDiagnostic: AM6PR08MB3544: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2512; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /E0jvTsdtwqZqQ9AVGjKQhvneoL3zGC+hFWFsAQsyspchXJCyjE002TOHkaoz59YICg4o5huPd8k4Z7TC9mKeFwv4t1nC9nITKtxG5xmZtOnVezTpef9XBTg8kD+T+YHJGAk9yp4Otnhp27bA6jrt1rRV19KPHqnRIQKDXZM7Ad+pCHH9lpKxm2guBh8Z17VuviQe4EbhLiiRzkErPLeF6C7/C2+r5JZw88fQ9Oj7azef//5tekmApE3LfsmdL1uQem3TJ3bZDpocKFT+FJcIPn0ScQjeG2yWg6sKKO0Jsnh6oWAgu1iRwpQRhIi0XHlfgTo7qJIhb1xtAHlykutzAwFJ91TAqZQL9HqzSzCfD/YBd8sQDS6qz/MBDPg9wnbTX/xZEZPtBTqxZmhnKleX9GVk0JPCeEVmfp4TX+RM1Jqh2Xm+VJKw2L9lKznorjzXgoNG60rpC0aq4GwUncr5D7JneAlkvFV65kJMetD7jeCE3zjjUpsWUzUiFwocEHd8z/Flz7iW3x0nUHb5kdgiYkiry/2rS1ggMv9ESSl0/hzsSsLF81GZ+7T/3kPRKcfevJw7uaZpobwFU97U37VCLi5CnJnQyVCz62kdGCux5vWRyD3crlLrzi99wyeu2TG 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)(346002)(366004)(376002)(39840400004)(136003)(396003)(186003)(8676002)(16526019)(26005)(86362001)(1076003)(52116002)(36756003)(6916009)(66476007)(6506007)(4326008)(6486002)(2616005)(5660300002)(8936002)(66556008)(66946007)(83380400001)(2906002)(478600001)(956004)(6666004)(69590400012)(6512007)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?FsnDgu5fDAzBU0VLe/Kun7EYHWDt7TX/GbJy2ijE2NLMwsBN5SVwAbRN81AO?= =?us-ascii?Q?dYclcsAFnKRUrrLo7nhnWWvm869We0HPegC3aVGzwaYhMu64HKDgfgAVRExI?= =?us-ascii?Q?gIVw5F4piVJaCjlGCOsQ3RKgYrIRkfznCSjSzpHvzXQrXy8WjnW3XgLhi13L?= =?us-ascii?Q?TgVn26B26IOMtbB08pkyPwqKMorMj03pvtM6pfQiZIm+kzxCGyq6IEVKGzQC?= =?us-ascii?Q?bNUMn3Ccz+JqRx3VZjMuWvAcmNgd3mVDFo4TVugm0ojT2ePpJXBVRRsmWelI?= =?us-ascii?Q?8FwVaoevsRN3pzstxYE9lFdNVj7lYLZihMvFEEoVYeCgy0VokTeH3FwfrXCM?= =?us-ascii?Q?4a52FEb+YYEcicJ4ZLGqqlQWKxpd5w0ezAzG8Dqm4IywFUz3yhf5o4C2mgrb?= =?us-ascii?Q?8gNo3PEb+d4hDMAj2XZ1PFA7A/PW/UIo3XPlUz6yeIb9+PCszljCci5c6z8T?= =?us-ascii?Q?IspUUOL/+bAefa3kxCJku2X385ynJr4dWW+6N1V+pezdPeE5ZZbXY58M+Xgq?= =?us-ascii?Q?sLxBon3xnAQK3MEQ4rSKHhmq/rwX/XSjnB1F4El7olgCX1v/B/OUsRr7pfE+?= =?us-ascii?Q?SY387q266sjV1Ikg6X8qs3bDvp95XzEA06pGFVGBbt2IUfo/z9bXuvTqwW4Q?= =?us-ascii?Q?p7Bf035FX+Lw8k+FD1YKlXyEK9WIm53od2Kn0HijxN27SN1cfWT3PHmNYm2h?= =?us-ascii?Q?mdfGl2OC7RYfOFBqWht/UWcR9MW3fxbxiTc6zLnxlRlvcZgeQpKihQR8O4b4?= =?us-ascii?Q?/sHQ90TW/aRHuse4hWUMlzpJJ0Gu+y1TiVjD74PBNx7gMUTL7JU9WYpiOMib?= =?us-ascii?Q?yCjPtgwDcr3juya8kWHbNf9kyfcU0chGKaYBCq5gQpmGqs5azQenbTn+Jxoo?= =?us-ascii?Q?2r6h4cjH1Mw7DplbmLmT0MsB/q15/rmea57OPP+z/OgvgiIg76tgcpdqRhOm?= =?us-ascii?Q?9b/07BBm336vqZqLAS7WOod3lKjV2HxhAhC2iZwkp4lzxKdRxAOsI58kDioG?= =?us-ascii?Q?megnajdTJf1lTg35fnwO8xL2OZGrJtMhdeAgNNTnw6ALpeGqSq9g7cJT7UjQ?= =?us-ascii?Q?cxzEFnqjLz5aBQEmg8Vx5GqF2ef/llmk5AOOId4mg6KdpY1o0SjTI803q8vJ?= =?us-ascii?Q?ipT7pGtxiCd+ENUD3wO4p6ftYrInbyatyRTE4RfXvUJ0QCO5S4H2Hjq8XHMQ?= =?us-ascii?Q?cGVsstnt4bxxUiMkX0yRMzS5dGoAaVVfxVDBpr0CYxb9M5N1Q4xpPUyogrZm?= =?us-ascii?Q?BfKSgvITRejEld1ENDwFYgFu6nNob5840VeMl+VHL/PtzbWYKOBMAB4A/cih?= =?us-ascii?Q?ZlKbIoE1O4OKR1xpJle2RcB7?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 354f7a49-b4ae-43cf-5bec-08d8e9520dfd X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:30.5756 (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: VD/QfRlPpGfCrSNKertN41bmdG0baNH4F44qYKmdNdYZavy0YYCdRwyelc4kErAoz9dMIKH7dEvoPtlAYwDtkmK/F1+ZWo+rA/6ntxyFXcg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3544 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.6.91; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-DB3-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" Split no-perm part of bdrv_attach_child as separate transaction action. It will be used in later commits. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 13 deletions(-) diff --git a/block.c b/block.c index b6bdc534d2..d810915684 100644 --- a/block.c +++ b/block.c @@ -85,6 +85,14 @@ static BlockDriverState *bdrv_open_inherit(const char *f= ilename, =20 static void bdrv_replace_child_noperm(BdrvChild *child, BlockDriverState *new_bs); +static int bdrv_attach_child_noperm(BlockDriverState *parent_bs, + BlockDriverState *child_bs, + const char *child_name, + const BdrvChildClass *child_class, + BdrvChildRole child_role, + BdrvChild **child, + Transaction *tran, + Error **errp); =20 static int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQ= ueue *queue, Error **errp); @@ -3044,6 +3052,40 @@ static int bdrv_attach_child_common(BlockDriverState= *child_bs, return 0; } =20 +static int bdrv_attach_child_noperm(BlockDriverState *parent_bs, + BlockDriverState *child_bs, + const char *child_name, + const BdrvChildClass *child_class, + BdrvChildRole child_role, + BdrvChild **child, + Transaction *tran, + Error **errp) +{ + int ret; + uint64_t perm, shared_perm; + + assert(parent_bs->drv); + + bdrv_get_cumulative_perm(parent_bs, &perm, &shared_perm); + bdrv_child_perm(parent_bs, child_bs, NULL, child_role, NULL, + perm, shared_perm, &perm, &shared_perm); + + ret =3D bdrv_attach_child_common(child_bs, child_name, child_class, + child_role, perm, shared_perm, parent_b= s, + child, tran, errp); + if (ret < 0) { + return ret; + } + + QLIST_INSERT_HEAD(&parent_bs->children, *child, next); + /* + * child is removed in bdrv_attach_child_common_abort(), so don't care= to + * abort this change separately. + */ + + return 0; +} + static void bdrv_detach_child(BdrvChild *child) { bdrv_replace_child(child, NULL); @@ -3104,23 +3146,26 @@ BdrvChild *bdrv_attach_child(BlockDriverState *pare= nt_bs, BdrvChildRole child_role, Error **errp) { - BdrvChild *child; - uint64_t perm, shared_perm; - - bdrv_get_cumulative_perm(parent_bs, &perm, &shared_perm); + int ret; + BdrvChild *child =3D NULL; + Transaction *tran =3D tran_new(); =20 - assert(parent_bs->drv); - bdrv_child_perm(parent_bs, child_bs, NULL, child_role, NULL, - perm, shared_perm, &perm, &shared_perm); + ret =3D bdrv_attach_child_noperm(parent_bs, child_bs, child_name, chil= d_class, + child_role, &child, tran, errp); + if (ret < 0) { + goto out; + } =20 - child =3D bdrv_root_attach_child(child_bs, child_name, child_class, - child_role, perm, shared_perm, parent_b= s, - errp); - if (child =3D=3D NULL) { - return NULL; + ret =3D bdrv_refresh_perms(parent_bs, errp); + if (ret < 0) { + goto out; } =20 - QLIST_INSERT_HEAD(&parent_bs->children, child, next); +out: + tran_finalize(tran, ret); + + bdrv_unref(child_bs); + return child; } =20 --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615992852; cv=pass; d=zohomail.com; s=zohoarc; b=ZlvbeEs62+fyZOkCUtdW5z+Cm36VMPAEiXio64D4lzBjyyRZpAbYgfTBJfoUkmCNTMKjep4BGhpa24Hi8dcveKp6MzOVDN8YOc1Sd2X7RINrYWa5Uxk/NvwDVtKRnGwjrq7SkvU8ZjSGiMPkbTWp+8GlpdRqwzjpiYc5eavC6ZA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615992852; 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=I4Fs1WuSS4BueqdtQrH1FaySCtsWpZsegFxdtZdJCj4=; b=Qzf9/FbRHGZcGzQZxbqamf+eiOeRABrKGB7YhM0zulRDem+c3aUlbzsCYV8zZczYtqSbvoAQjgC0kILjjnHDDGf9+kfBJhPx7JrAvqCRJiJpRBC05aX86o/+T1li8EMIEk4J0rcyjOCCvbxae0hqoducpb3EKQv+M2taTHSqXWw= 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 161599285214480.66526723648235; Wed, 17 Mar 2021 07:54:12 -0700 (PDT) Received: from localhost ([::1]:54232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXYp-0007gg-1k for importer@patchew.org; Wed, 17 Mar 2021 10:54:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXI0-0004qV-2S; Wed, 17 Mar 2021 10:36:48 -0400 Received: from mail-eopbgr60091.outbound.protection.outlook.com ([40.107.6.91]:41454 helo=EUR04-DB3-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 1lMXHs-0006rZ-91; Wed, 17 Mar 2021 10:36:47 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3544.eurprd08.prod.outlook.com (2603:10a6:20b:4e::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:32 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:32 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:30 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NidSdjwQe3XwCzbc+ECvM1WRNBJJW06q+oQ7QsS9NaIjlyfHN0/ro+p5NInL75g7Kh44grxsZQluK5Cil33R/LlZQ2yICE2ZH3gxO4pSCTyvDjwIyUCgYVvqgS1X503SfvCtufDu9qSqTMC7Hmf7vt4KZ1dGetuYQk/6Mdu+eJuRHrwRteeHdFJ8c+4pJO480aHiz6WKQbyrus92kfsYTJjl96lnJIrvqucUMRGkgYrQi0FINtqEOYc5Ey04l0cMh+ZLklQqM+qLJ34Dk46OcQ2/IAZeGcq5Q+RwYcCHvLCBlHTF3bJ/HQwqqkFHTR1EqiY+TuU435GTWGhFpEDj/w== 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=I4Fs1WuSS4BueqdtQrH1FaySCtsWpZsegFxdtZdJCj4=; b=JV01A9Z+UK3r3lHvP7/lUNEIoAHgdUfs6tULgEA3d+eBsXTsBOFLDPWJfniTFKJvNJ+5TS3moGh2OsrdrRwnolMGpcJ0u0mRrR2rPosY3eKvZpveHMhc7KIE9xrnilPPcHk+/odoEfimvtCKnFOMMI+vgQp+X38PPUqhnSgdaL9rUF200YN+aD18gqfR9zLIDcPG1Gs2r4TaukhvL1laGxc5TwKsfo3AZoxVRqdK/1vonSkLSfTI7CHiDTbKtyFoO9NiBKSzTXAlUE8Xf3UKb26zTRMEenibI8//AS6vb2AoJreh1sqEq7TY6J5D9wl5nu0F5OSbfNzxb4Qp4B74kg== 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=I4Fs1WuSS4BueqdtQrH1FaySCtsWpZsegFxdtZdJCj4=; b=cBfgy467q691c1pTpknnFcMMklQNUy3pTQiC5g8X/8M3dyVyd72/8A0OOtOZhxZsOSe/0RbxOddHKOo/FONiVGvdsPHbVxtdkdJPL96Goe2bV4M61lehi2clm90petCFIVugZfi/XqGMM75ZY8wlRc8+kF68Sv8ISV32QHMsWcs= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 20/36] block: split out bdrv_replace_node_noperm() Date: Wed, 17 Mar 2021 17:35:13 +0300 Message-Id: <20210317143529.615584-21-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: 4882080e-21e6-44c4-6388-08d8e9520ec9 X-MS-TrafficTypeDiagnostic: AM6PR08MB3544: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:175; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gL6uNR51ddtxDGPewYO6wH52OS1qT217pKpoKkGkn1/miTw1xy1jIkISx1xD4RpX+Y2qcpy8qXvrjQ7T9814Nbnw0gXyR0Qu7pKu7Pvk+A/AihAZUuZy4AJvQ2QJCjr78RK1YqH9dAC4D5uqjntaOsHKHztDh7ejEwRwmx+td1pWvKl026QPEB/LVq6kBneehN62TQv/VbAAQWaYPtuXzM5Sb4zUn7kXhfpobPklEggSjGz7djTGn8OCxwv3goynIBRQOfAC9zX+/6UsTeHkblCG0XTLO4wQqOoQVywItSaQGJ1SK4TYsqEMaGorXQfcOjY3s0jTq5oBGmM8pufyzXxiCHW+Wgf6O2ZmIk0MbeTfsEK065tr1SbrQBXPp+N3tt/Z8JSTf04c0zWDxpB5MLyeS0AsFsjXftSTSzWmPxmFJyGdoZccKs5mE3Ju6Efz2VG4QF1wEYZ8f8wGgMQgKgxV7XO946cjgWkAfTro670wBdbc285TtNrwl4oSPvyYcZU6TEX8wlhas0fIWFOcTfDa4exwOpCShLOz9Ne9nzcrYmj9FNw3aT0uZfxYFpfoqkNVLQ4nyJKYaZWPcy9QXz482251JZCUG5eN4DwPpLCOU3cbwqQ+q4ordR/VmVbq 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)(346002)(366004)(376002)(39840400004)(136003)(396003)(186003)(8676002)(16526019)(26005)(86362001)(1076003)(52116002)(36756003)(6916009)(66476007)(6506007)(4326008)(6486002)(2616005)(5660300002)(8936002)(66556008)(66946007)(83380400001)(2906002)(478600001)(956004)(6666004)(69590400012)(6512007)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?O/NnEd+GzwA++Mnq2f7nfydxeGuAdamUf+fSuuo3+nX01tJSSUaxUa1J9r76?= =?us-ascii?Q?nSe5C+VhUizE49wHl9eGSNgRJ4w39WDEeFchxleRwlvxIjU96L70YNxy/BGU?= =?us-ascii?Q?x5zTYG53DSAQnytbrk+W8bdmVl1RrkZsNbyvT+muvvPWWV8SZPexPf8TDLLo?= =?us-ascii?Q?M3GFLf7N+8LTo5sZBp6UGYkYyyNygLKSyjukf5k64tj2LbCe7Wk7QGoBcHvM?= =?us-ascii?Q?Gz+DJOeZMol2npCAkQgL5wQiCoJ0l+aGJ/XmfQSpoUR3VC0J+VEERGrzK3Ft?= =?us-ascii?Q?LgKvA/0hUDXddlZYubdcqumUOyM5mYhpPCmR4evNbN+bqU5zys7wZOT9ItVv?= =?us-ascii?Q?0FHVtJwWnx5VvfBQIe/KwSKtJmnKoipPVppfHH1yNW+7aGxUZrlPPeCarb3Y?= =?us-ascii?Q?h/eZre5N4NEcZyv5xlPye3lBSU2yYx/1MgP99pU5sMnyqlh2gznpCJelHUzI?= =?us-ascii?Q?9MmzdW5lcZdJO4HQeJfwMOzRpNes0Il4HAnNPmRLNl5cV0fcN+6cSS3NOscW?= =?us-ascii?Q?vpVe1cvTxsl61inFrtKpfEbRtfjfA88jShAuR96tuA0fqNKyAjhbqKuU6D1F?= =?us-ascii?Q?wXidZeo/oXHhB7VLc50/9BMPQm0FaOaFIVCx77hMB1YtNY/FTABrPD29Agup?= =?us-ascii?Q?OyCviEicGZw467Gw4jO34N6Hs0WC8ys+qdNRFzAFzSkyNrX7/kvDXRfD4Myj?= =?us-ascii?Q?IhI9aVdGl6Sd7aA1DlyQHDej+U1rX5O50fsmF/CVl9RiTRB3boqXzuZ0KfeX?= =?us-ascii?Q?diGE8EWb4YLhKQRGtnwWiACkXl9Rsar9cCaFG6Be0d/Os0cKDLQSjUEvYKGv?= =?us-ascii?Q?KowZcVoJDyeB1V5cYy0UpaG3ENg/4bJM/w+f6CJnUpM4XSL1Pbm9ucirBJP9?= =?us-ascii?Q?JFB2jbBN0BIp60p71+FC362W3rVvPxqHD5O5o2yPNKC+yzHV1R4k59441Pz2?= =?us-ascii?Q?QUFrDYMyu/lenlVYDK5E9MUCZEKyEzHWmFMUAuaxnyNolo/Bx5VSh+IFJPTn?= =?us-ascii?Q?O5ktJzvTOO6aqLkBVzYsUMwSgdmO1/fY9tr+q83Uj27dNzNS5DNhB9RlGl9x?= =?us-ascii?Q?anxDYkmJsVYvHFwbVBgWe0QHL16o910JGWJF+44EI0tfR/t0qzd6hxfmvRiL?= =?us-ascii?Q?6gTr5vlHZPNa+dBTybVloeVfj5Aa+N/P7ZRsnivzxCnDL3E7JSjeGGcEBBM8?= =?us-ascii?Q?GJEKJtoLvSgEpp5dBj3aFn0dO8ioc/l7HhY+4rnwhBCJwVy6sTPn0yyG0/4f?= =?us-ascii?Q?25ft1AE4DSWieOj9e838iB0wg5XNwVd365fStkC7wUzCHmvUohNnnm4162vS?= =?us-ascii?Q?dvY9nvi2NfOqBduzh/Ni6pdS?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4882080e-21e6-44c4-6388-08d8e9520ec9 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:31.9267 (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: m5i+w/KVhnMZtikRN0SXxmD7lhJU69f+fx9XMicQ6PJHSOnXzvW7GcVGkPQ2IubxpJu/9NgiUC5R7Bu9Fu1r656s6sD9gUCY/umPW1d3I3Y= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3544 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.6.91; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-DB3-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" Split part of bdrv_replace_node_common() to be used separately. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block.c | 50 +++++++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/block.c b/block.c index d810915684..433cae1181 100644 --- a/block.c +++ b/block.c @@ -4956,6 +4956,34 @@ static bool should_update_child(BdrvChild *c, BlockD= riverState *to) return ret; } =20 +static int bdrv_replace_node_noperm(BlockDriverState *from, + BlockDriverState *to, + bool auto_skip, Transaction *tran, + Error **errp) +{ + BdrvChild *c, *next; + + QLIST_FOREACH_SAFE(c, &from->parents, next_parent, next) { + assert(c->bs =3D=3D from); + if (!should_update_child(c, to)) { + if (auto_skip) { + continue; + } + error_setg(errp, "Should not change '%s' link to '%s'", + c->name, from->node_name); + return -EINVAL; + } + if (c->frozen) { + error_setg(errp, "Cannot change '%s' link to '%s'", + c->name, from->node_name); + return -EPERM; + } + bdrv_replace_child_safe(c, to, tran); + } + + return 0; +} + /* * With auto_skip=3Dtrue bdrv_replace_node_common skips updating from pare= nts * if it creates a parent-child relation loop or if parent is block-job. @@ -4967,7 +4995,6 @@ static int bdrv_replace_node_common(BlockDriverState = *from, BlockDriverState *to, bool auto_skip, Error **errp) { - BdrvChild *c, *next; Transaction *tran =3D tran_new(); g_autoptr(GHashTable) found =3D NULL; g_autoptr(GSList) refresh_list =3D NULL; @@ -4987,24 +5014,9 @@ static int bdrv_replace_node_common(BlockDriverState= *from, * permissions based on new graph. If we fail, we'll roll-back the * replacement. */ - QLIST_FOREACH_SAFE(c, &from->parents, next_parent, next) { - assert(c->bs =3D=3D from); - if (!should_update_child(c, to)) { - if (auto_skip) { - continue; - } - ret =3D -EINVAL; - error_setg(errp, "Should not change '%s' link to '%s'", - c->name, from->node_name); - goto out; - } - if (c->frozen) { - ret =3D -EPERM; - error_setg(errp, "Cannot change '%s' link to '%s'", - c->name, from->node_name); - goto out; - } - bdrv_replace_child_safe(c, to, tran); + ret =3D bdrv_replace_node_noperm(from, to, auto_skip, tran, errp); + if (ret < 0) { + goto out; } =20 found =3D g_hash_table_new(NULL, NULL); --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615992792; cv=pass; d=zohomail.com; s=zohoarc; b=A6i9OtfJjClKfFgCs260cat2OljAacWQMmQ+VVwLJ6Vkla4WZeCKZmGJGyLCF4Nbl4/ldvoIKxG4Jn2rMI3kSq41uCj7bKv3qTXNNJOPMBgQN5dDxOQj5M0wwlo/Rt2Lu1CBED+7DKWfdE2xJ0EFo59BhoADKD2mzOB/Q5HuGA4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615992792; 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=YQj38eq72Rl4/prL4WT3enALcp0Vq8uBTX2fXo+O54Y=; b=J77y+QhW+YD4hj11YmbS0nyF9HRp+ONEqAUHKKnUkZo/ir+ZryhAsXmvGX8wQ1oCCvO5CI0OcwlRVtoXAXFeeU4Z93N40iUUr8gnw7A0XveCViXvmE8/ESW9BEu2/yS60STIBtelvrjotJmCsUni3FdudXq9xEZyGj4PnOqO5W4= 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 1615992792712253.055867641359; Wed, 17 Mar 2021 07:53:12 -0700 (PDT) Received: from localhost ([::1]:49526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXXr-0005nq-KG for importer@patchew.org; Wed, 17 Mar 2021 10:53:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXHw-0004qJ-0H; Wed, 17 Mar 2021 10:36:47 -0400 Received: from mail-vi1eur05on2119.outbound.protection.outlook.com ([40.107.21.119]:8481 helo=EUR05-VI1-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 1lMXHo-00075m-Nc; Wed, 17 Mar 2021 10:36:43 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6038.eurprd08.prod.outlook.com (2603:10a6:20b:23f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:33 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:33 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=En4KmiYLhSyToeFi8BXqlT2bmEGp7YxO5yiQ3P55TIj2pZeQc2CP5w7baYVOsNmtfnaosqGvvSeQh+t301sWEcdJknS+VrO2/Z76FQOHSEfk+J3XJ5Be30lAhaofvr3zpquZoQZwQgzmeJQouGvjOhU14Eb+p55qsEXLs/Smq8Xlz8n0yUvAS7nG9FkQ2rXtBgo+R3bgXnF+XS5lKW+lvPP5PeMvjaSX5y3/4tAGBecoCVoocufhgJgiVnk4+lmiTi1DXFtChwvEnvn3viKG0noim0Jo5wGdhuKeOd8BvVwUZNp2ftGD2BkPdkOAdFxH8Jp3/eJDk6j7vA6JmZiZ3g== 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=YQj38eq72Rl4/prL4WT3enALcp0Vq8uBTX2fXo+O54Y=; b=C3QiK/rfTxcFQqd6JDKd0P+GADfjn1njAxoLcToCEktq07q+6kkAQD8M3EKkf0USs9tGeAxBh+tTUU3Sk4nDYdqF3o/eeO5cGs++iUthUUPMLIkKcDnboYfXMxRnjYcMcdX3WUjkMkXCN60iWDLS0jalhxdTQJ8HbjWbDZXSqqnzx4vrnk8tYgfKD0nYhpExdfLYOlZJgqJlD7xu5CWa7gRhblcuodXnD5CQwaPi2M5mnBIxgLDj4SGYEYG58qR+Fnz/YI8t2XmRYylCisu6GdFBBpgFnu8deQqJiy6xOC/F1SZpM6eguNefmyUsSeQtKGs0lLw1h+yNee9c8JbUYw== 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=YQj38eq72Rl4/prL4WT3enALcp0Vq8uBTX2fXo+O54Y=; b=Y9GfXZO99j7upndAScbbUaFgt7BZ607vn6Mea/6y+eJ51MdQuJ8R1IEkxPEK9M32C8/G5nQ6vo88rgtoUXOWp0g8RGONEBCZj2zQg0NrbcYItY20bVuJh7x3eHkA+WP1O0xbZO30lyC0LvMAtENxY+JcK8VdFjiEbmvuOoDZsL8= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 21/36] block: adapt bdrv_append() for inserting filters Date: Wed, 17 Mar 2021 17:35:14 +0300 Message-Id: <20210317143529.615584-22-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: f9a1b2bb-1a59-4582-b601-08d8e9520f9c X-MS-TrafficTypeDiagnostic: AS8PR08MB6038: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MmO3nnm7MCeV7rf/spIIJU6H9XZv2yQaIqWmqcTh9VWRR7YqIgaJ5+4hoKIkBY+x+FdHGHBMudN+579GdYkI4DOKNq/kaBOnATi8PDknRClFsad17yge1va9DJIqjdlfCzUNzis0xInqKkwlpl/8wtQvRVex7Wsrp8/TTu6cd+9PfzkeMGJSjkrnOeAiBo2HmoRha2taPmwyJV/YB/u1YstEuWQa5REvC4Z9TGFFI/dkJBqDfKdDVUXVQ/eLK9/7TXSu8JtN4Gfk0bv6YE7OgeBIpQc5cXBsC1pBxXfG/CWxRItAIe6MTJhIrXZpJtAy1g9wWFgR03ALlpZehZcYGeFdcwFe/cQxtVXKUGUjCXhFYMMCnWgrsoVJfqoDorn9X9aS53LoSeXhoVLN22lMqCcGyeW9QFtFnRfZ4NkHJTcxiBsVDEG6oNNsrXSHuNorX6rDHexB2+oyYn8MLSYChepzMMJ/7xtjUHBbtgOddqLrQYRp1/ufvENRfZbETbyqlMCwTxVjV6LRLKv3xjk2JNNEH2oN0pSvZa892xC7KzePp4Pkz6wno1Gpw4VeDo3iN+Ryc5JNC8OHaVsgoIV6yLtvjdnR6Db/r46qlo+4t8ioHcli9gDE72J9qCyHX+md 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)(39840400004)(396003)(136003)(376002)(346002)(366004)(2616005)(4326008)(6916009)(478600001)(6506007)(36756003)(8676002)(8936002)(66476007)(83380400001)(316002)(66556008)(5660300002)(66946007)(6486002)(26005)(2906002)(186003)(1076003)(6512007)(956004)(16526019)(52116002)(69590400012)(86362001)(6666004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?VJ4aAyX761DbsJSbkagt6KBqlNIpFGTqQrQaxCL3A40afXuOTqeIDH1ii4gE?= =?us-ascii?Q?uZHyXzhD67x5wagSmto93rYr3YRT7ET+OaPJFHwvz1fx/mkZeMgPu9VNCL2M?= =?us-ascii?Q?7Zy7qgItg5cOM+UhJqGsV04sK2tZKNAKc3n1Q51ukmZYHbn/ZrTkGhIb2VC3?= =?us-ascii?Q?ynxH2Y13CS9KOG8NQ4pF0iOs0+Kxa0VnaL9/NLNIjmtRzLhPInnDKehV9Mzj?= =?us-ascii?Q?Zp1QssoS8kXIg0sejaS+siFT8bnaCVyXulXMHRTaK4PHcfeeaOh0g3eiU1We?= =?us-ascii?Q?0yd3ODJ45O6uCLfDB4PJVQHknQ9lLM4THzhWgej4vU63OzlRvNhqo40H4lhQ?= =?us-ascii?Q?fogQhsAAGpkhILtDgIUNkftqqk+y3cK6v0DkY/3QE394z5pHFfkeSbCjLWx+?= =?us-ascii?Q?6YzAgPSNEaOJfJxMgA//HGKUQYtXXUFa5dOMeaueOmbvjfZnpPtjkbUeHyOH?= =?us-ascii?Q?ZVUrvcaTuZq+qJQHOR5I/VuH9x6Pw9cD3KFKOKuSUIeSNo4YLfFIAAIVYCSC?= =?us-ascii?Q?UkweJes+BENKtbjgEGmtEYWu43HFw4ck9bTJHYF6wZBbptoyRnd66VYV3qX8?= =?us-ascii?Q?TBEN1ZDEcmmgumbsjrP/sEuafgGyQCngfpoquet7Aiuo97xgfGIks+z4noms?= =?us-ascii?Q?rFU7YUcHegw2NlIugoq38zXR5oSsngNIw0R+m3qcg5Yr7Cb+TV3neMACWUrD?= =?us-ascii?Q?wKP/8glOy/X1zX23ieVVBF03iU4LnOhh+xv0r3Tb7WBV6HPELG0BCnKkFLiH?= =?us-ascii?Q?REpYeFQv0ETdsoQN8xm/SCPO0DxWpeOyD/k/VCix9HlNER2c30Wg+7hi1Kbw?= =?us-ascii?Q?KmqIcEuKqxNsZU9Fmv37Sed7KFff5Wtc9J81pSz2y5Wl2UQm9OXDHpEFO6tE?= =?us-ascii?Q?35bUs33i4dQHD7l1LZfWyDoo6t5VuVYdocRlQNLSv6s+p9n19QATxckRMPA5?= =?us-ascii?Q?AdDKts3DeEua4hiaCOCJs8IYje2vYpkH3pxBOMZ6o0miq7LolRKMWcV5VLMw?= =?us-ascii?Q?L9oqNfGS0pI0vaac1vYOjEmKSuVb4VLAy9b2X5iLl4XENzt7DcvGMd50Rueg?= =?us-ascii?Q?cU3jr6cFcdf6H/iSYjyR8uTH6Guj1Qqb0Hl8mV5cLYdVgkU2sZgdvyXlfN04?= =?us-ascii?Q?lJWRPdcXmWFIBqx6jnnCkelfMPhiBHaQpA5+Pbvbz5JYyZS30eSUyVD9xBXJ?= =?us-ascii?Q?SEFSFf9Wy+7mQJnAsq4ccSoEQD8NRkC/geIqImrxatgq3H0da4kmkEAgMBjo?= =?us-ascii?Q?SssxUTZGGfsCyW/yHviamOwHbV7gTT8ARgseljndWMbiJnjQS0/umBIRy5Ua?= =?us-ascii?Q?+oyNjdhLT2c5qU0YryOxdezK?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9a1b2bb-1a59-4582-b601-08d8e9520f9c X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:33.3036 (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: E2OZjWYXi3jw59FjwolOVKW4Ss4guwaD/VUMzOjLIFfFxA4qOWM1eiN8KoE/yEpvkqorrEwb+xUnxt/LEe36dzhe7G/M4j5mL7E6AozH/xg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6038 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.21.119; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com 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" bdrv_append is not very good for inserting filters: it does extra permission update as part of bdrv_set_backing_hd(). During this update filter may conflict with other parents of top_bs. Instead, let's first do all graph modifications and after it update permissions. append-greedy-filter test-case in test-bdrv-graph-mod is now works, so move it out of debug option. Note: bdrv_append() is still only works for backing-child based filters. It's something to improve later. Note2: we use the fact that bdrv_append() is used to append new nodes, without backing child, so we don't need frozen check and inherits_from logic from bdrv_set_backing_hd(). Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block.c | 27 ++++++++++++++++++++------- tests/unit/test-bdrv-graph-mod.c | 17 ++--------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/block.c b/block.c index 433cae1181..11f7ad0818 100644 --- a/block.c +++ b/block.c @@ -5053,25 +5053,38 @@ int bdrv_replace_node(BlockDriverState *from, Block= DriverState *to, * This will modify the BlockDriverState fields, and swap contents * between bs_new and bs_top. Both bs_new and bs_top are modified. * - * bs_new must not be attached to a BlockBackend. + * bs_new must not be attached to a BlockBackend and must not have backing + * child. * * This function does not create any image files. */ int bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top, Error **errp) { - int ret =3D bdrv_set_backing_hd(bs_new, bs_top, errp); + int ret; + Transaction *tran =3D tran_new(); + + assert(!bs_new->backing); + + ret =3D bdrv_attach_child_noperm(bs_new, bs_top, "backing", + &child_of_bds, bdrv_backing_role(bs_new= ), + &bs_new->backing, tran, errp); if (ret < 0) { - return ret; + goto out; } =20 - ret =3D bdrv_replace_node(bs_top, bs_new, errp); + ret =3D bdrv_replace_node_noperm(bs_top, bs_new, true, tran, errp); if (ret < 0) { - bdrv_set_backing_hd(bs_new, NULL, &error_abort); - return ret; + goto out; } =20 - return 0; + ret =3D bdrv_refresh_perms(bs_new, errp); +out: + tran_finalize(tran, ret); + + bdrv_refresh_limits(bs_top, NULL); + + return ret; } =20 static void bdrv_delete(BlockDriverState *bs) diff --git a/tests/unit/test-bdrv-graph-mod.c b/tests/unit/test-bdrv-graph-= mod.c index b81787487a..f6077a6525 100644 --- a/tests/unit/test-bdrv-graph-mod.c +++ b/tests/unit/test-bdrv-graph-mod.c @@ -387,16 +387,6 @@ static void test_append_greedy_filter(void) =20 int main(int argc, char *argv[]) { - int i; - bool debug =3D false; - - for (i =3D 1; i < argc; i++) { - if (!strcmp(argv[i], "-d")) { - debug =3D true; - break; - } - } - bdrv_init(); qemu_init_main_loop(&error_abort); =20 @@ -409,11 +399,8 @@ int main(int argc, char *argv[]) test_parallel_perm_update); g_test_add_func("/bdrv-graph-mod/parallel-exclusive-write", test_parallel_exclusive_write); - - if (debug) { - g_test_add_func("/bdrv-graph-mod/append-greedy-filter", - test_append_greedy_filter); - } + g_test_add_func("/bdrv-graph-mod/append-greedy-filter", + test_append_greedy_filter); =20 return g_test_run(); } --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615993021; cv=pass; d=zohomail.com; s=zohoarc; b=UpQIOuyZ+LrrbN0iWgBcQdX8iCjk64umeIfR1MaPfjARpj2PElaGzwBDdpeOrs0xhcQCyR6b/RwQlxD5H/3gshPS4ZKwCkhMMyKU3LymbAfUAviz2g4u4W4AVvFSUMhIGg0lKNeZbHqECC3Id9KzOYKyk8YnhK08eCh0lYkbC/Q= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615993021; 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=F4o44sMPVdk7/3XW0nSEZeUWV5lTGMB1JcARlZftjrA=; b=R9R1JDFG18eJsSztGzgxnv4lEspxKonH5YfxAgGK65oJs1npcobBhDBOxT5mSzVtyC2Qv/qooe4Zu+d5q2KhJOI1Nj+xtY4hsSUHitmRW4F5kFzcH1eosnR5vcWe9ut9QAwUSuOgKarobBC+Nu/KUsIJwFUCucMbnPk6RP4ZSPo= 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 1615993021685668.5075195621811; Wed, 17 Mar 2021 07:57: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 1lMXbY-0001kC-JK for importer@patchew.org; Wed, 17 Mar 2021 10:57:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXI2-0004rY-Jo; Wed, 17 Mar 2021 10:36:51 -0400 Received: from mail-vi1eur05on2119.outbound.protection.outlook.com ([40.107.21.119]:8481 helo=EUR05-VI1-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 1lMXI0-00075m-9W; Wed, 17 Mar 2021 10:36:50 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6038.eurprd08.prod.outlook.com (2603:10a6:20b:23f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:34 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:34 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T7A0gC3e/Wdwew5BpvDh/X9MrMu2kHL3Ad+5cH2V8deUFhBSINnLoWTS7gZrg0bv3ROSWLiJ04A1IZZ7WRinLPx9VmhoUQEWFW5NSjXmD3mEC9kRYqUlegYQxfzF8YvRvnKVgbfizMoTIRp2xGNHYtp+4M9CqLCAya3NRFUXTSzmbhpHgTCtbv9hV8rMSlpoNaiOhDklhYLAeWt1REb5pSf1dPEJ/DKACQk6EWvkrKlUDeXE6ch76W+7lIkBJfR08F0zzDUdla9OlIyA/Wd2yTWEoEwHVgJlRShffKP9QND5yrWovg5MxFir5EkhERFTEsBVqeOjMATwGl9Zhyq1Hg== 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=F4o44sMPVdk7/3XW0nSEZeUWV5lTGMB1JcARlZftjrA=; b=F1iWd5RcjxZtzkAHCseYh6fDC8J9moEyOJlpxP8sbCyhiyqgJ4MCc3b6fN7lC9085NXc6yQzgmgNEoczFZ5SZL5xAkZQt6ufhHmIvjcFhE2HDQFn/34eGnOnxJRE52i31r6qkgwCSKWEtAp2QToh3iSB60Jl9wbw40in03moWydnuYZN73SbgWW4bk9vUtZWStK4xg3mbSh+IgWI8PTYkiszOAJ6IS6h9/S00jr2oTb1pOquLuT/AsRSeXaxBCz3ULUyy+O+yNwRMWKfGAHRjuQTfmH5VFEiR5oY85Ij4muIR25or7eBHmb8SE26ggqogDxgChm9obco95ZXSTd6vg== 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=F4o44sMPVdk7/3XW0nSEZeUWV5lTGMB1JcARlZftjrA=; b=jlgXvecTf6xW671dJ2fCRQNraqKIVEl3nt8NqtPGQ4+0uMb0nzgToqqTQp6AuvBv2bBxTYpUbv8dUJsEQRvmx6VfRKUrXUFItRL9Bq4o3gzl++uAtfiryJfXG3SyapX7BO716lRe/GL09JfZ35lbaD0qdktls9cSiVkdE33LdkM= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 22/36] block: add bdrv_remove_filter_or_cow transaction action Date: Wed, 17 Mar 2021 17:35:15 +0300 Message-Id: <20210317143529.615584-23-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: 2468b123-72b6-4878-c110-08d8e952106d X-MS-TrafficTypeDiagnostic: AS8PR08MB6038: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:47; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PrmXX/5jo+45Wsau2qbPnsHpOHfeD0YFO4BpumfdccVR6xUFT3HbHI4bJ9h7sWN3SD4BpdUAYApvjenQuj7KzHXnIke1yxmqxWjzIirb8Zs88ErNiQTMZug5t56+pHcHt0lAxcQHqGsTPzDzAppaM+6vV2OosYMdlJqsxRtfco53oKTfycTi6NLPFxv6MZ68V5kmuPtImeXLx3r2IOPepjkB3IbZgmuO6DJiD/lEUBqTPvnz2jc6ZtUI4eNaGj1YZ4PWk/XxjlWNbHlCmyfKsYEfOlT1+ctp6wozFda2QXyC0PrUZa71aMKDFuVF1aOmxEsbylhnrf5p2RdpA8X8YdXQGqj9jmp6iObi35bEFtsFHigY+1HkwcOPN5Kx7g9FRVZIxt++TrXRXQfj+DauMU7er9G8sQtSqGCQ2bnXOxt/WbUQqZrJUC4rKEpNpeewJIu7EbBZJS30owSkbol0ZJNf4qiq8k7UFpvWP1p4NsoyxA8s4qADcl/xnVWdeGD9l3d44p+bQiN4izly6+qxYQ/sl5l2yNLuZlIFfThsMPvbfiffOm7ichvmPPIXxP9AU0YITXU2pEEanwJNQv2GbPmayFxkFN4qfXJ/kpDAVCSijfWy6l5RkatnUloAWUJp 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)(39840400004)(396003)(136003)(376002)(346002)(366004)(2616005)(4326008)(6916009)(478600001)(6506007)(36756003)(8676002)(8936002)(66476007)(83380400001)(316002)(66556008)(5660300002)(66946007)(6486002)(26005)(2906002)(186003)(1076003)(6512007)(956004)(16526019)(52116002)(69590400012)(86362001)(6666004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?Ol6cLRa8RGWVoLDYnx3Lo6NZoRPUgYOSpLEm2n5vRMnzhOzZAZt5/YL6MoWA?= =?us-ascii?Q?k6wYymOeFAw4+KYX8LMKK4hIlgAcUmQumxGdTVL5kAObFMQqZaStA59OCYUd?= =?us-ascii?Q?8i6yIgxogNkcPUDQohSOWMRyDue9gvTqrpuPw5lRH2fAWix42qwUMtp+WdtU?= =?us-ascii?Q?HqQTYxEgVtZP1iiZO86Vq4K3W9jxJpOqGh++dFF427hNbtCug9WyiLx8pkmo?= =?us-ascii?Q?YLBzToPJKZyd3GIAQTKNAomZLwiYrbgvS+xNvmqNWzx9EljfX/wpLEc6AJwE?= =?us-ascii?Q?I7XBnQR3ZFOaAV7YBCO02/OsVdTNw6p4ggu6RAUQQI6CPcGfHA6tNVzpo7/A?= =?us-ascii?Q?fZ1JlgfO9YV8P3DpWnBFp9dp+q9+/aMddWEHOl5EPus8RRqrxkob3geqSDgJ?= =?us-ascii?Q?3QG1kQegku/C6wpO6hpqGsrYKqCFA1XF4LNEtBJvzzX61KWEYqTdZofRctD+?= =?us-ascii?Q?QSPPIUibYCZ4ds2V/PRwJW3eR4sWUMMU86rZh5k+GxobpktXI6QKoUU7RABg?= =?us-ascii?Q?GgK4S3exB1dj/F6efdPCJXRE886Jcx5a7NDi4VRZAzx+vJvb8/Yfq2QKmREm?= =?us-ascii?Q?shkZ/JESMAoSD6fay4BGm/rEG/kjx8Q04cRk1sRGmDR7WaPgFUHrh2AlNLgK?= =?us-ascii?Q?BCqWDWeSingSdvL4XTKMX1UYgH69wJpLm5E3vq7IvQ2KCyhQI5plrda/mi4v?= =?us-ascii?Q?yaMsN5WwaNGekustTM7p6QjbCBLzsY20M8GAbJfUCE+Gejmgiekugo797chT?= =?us-ascii?Q?RmHpwUc+AeYRrhGRoeFfUeLzU7rMfBvEwTOoT5Kbpgq8ZIF51T9w1Bjyw9o+?= =?us-ascii?Q?e1gTL7MS0WfemkYpSeFf5sPRqbBObG2jH5AwHQZfzuFrCOU45bZAJplYmXzU?= =?us-ascii?Q?0FcFCLcle96hhWFNBCfN/WOWGLuKmIHv97nhAg7YjYomqWQ6TewHtoNhwN8/?= =?us-ascii?Q?5gzFLLtEAF/TMQKzPRq6m7r6j0R8i1ycv6mreq9DhTfWGF+e9qxCHsUf5Ff8?= =?us-ascii?Q?ARlKSjGlzVZjLI/Jjy5QkkQdfdQ/KuoxD1qhdQVJ9zt8iffcMVUX6HPZcbCv?= =?us-ascii?Q?NdVToS/M9tc4gbv2SF/5n801ymRO5kH3BsVclCIewAn34ooVYBaGnVavs7VP?= =?us-ascii?Q?KU5qpW6d6K8jRIa+pwkQHitG/nqYuTe24hREOQujXapI17PrTm/gn6WDFjjX?= =?us-ascii?Q?+TqgXq7QhacTkv29Ukiau3sPMGpsk6wBiKHHdKUE3aM383cM1ZPeJm77FPwj?= =?us-ascii?Q?V+8H0hKL3BeKGm4a7Xg8ZiEl+GP3cGiTkpVsaEJhwT9RpBiZjD/FYTAzIHAx?= =?us-ascii?Q?ibSPyPmPt7RgT83w5m9Xlg0j?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2468b123-72b6-4878-c110-08d8e952106d X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:34.7055 (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: p5g29tDORHD+JHP1qwcN7Bx+bt19LizfZxRCKiEgQCsVDbYIANqYwLFzabXv45v/Df85c4S2HrFWMw6rhoQoO6vUv38fxRMpl8t/HPXAXmk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6038 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.21.119; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com 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" Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 11f7ad0818..2fca1f2ad5 100644 --- a/block.c +++ b/block.c @@ -2929,12 +2929,19 @@ static void bdrv_replace_child(BdrvChild *child, Bl= ockDriverState *new_bs) } } =20 +static void bdrv_child_free(void *opaque) +{ + BdrvChild *c =3D opaque; + + g_free(c->name); + g_free(c); +} + static void bdrv_remove_empty_child(BdrvChild *child) { assert(!child->bs); QLIST_SAFE_REMOVE(child, next); - g_free(child->name); - g_free(child); + bdrv_child_free(child); } =20 typedef struct BdrvAttachChildCommonState { @@ -4956,6 +4963,73 @@ static bool should_update_child(BdrvChild *c, BlockD= riverState *to) return ret; } =20 +typedef struct BdrvRemoveFilterOrCowChild { + BdrvChild *child; + bool is_backing; +} BdrvRemoveFilterOrCowChild; + +/* this doesn't restore original child bs, only the child itself */ +static void bdrv_remove_filter_or_cow_child_abort(void *opaque) +{ + BdrvRemoveFilterOrCowChild *s =3D opaque; + BlockDriverState *parent_bs =3D s->child->opaque; + + QLIST_INSERT_HEAD(&parent_bs->children, s->child, next); + if (s->is_backing) { + parent_bs->backing =3D s->child; + } else { + parent_bs->file =3D s->child; + } +} + +static void bdrv_remove_filter_or_cow_child_commit(void *opaque) +{ + BdrvRemoveFilterOrCowChild *s =3D opaque; + + bdrv_child_free(s->child); +} + +static TransactionActionDrv bdrv_remove_filter_or_cow_child_drv =3D { + .abort =3D bdrv_remove_filter_or_cow_child_abort, + .commit =3D bdrv_remove_filter_or_cow_child_commit, + .clean =3D g_free, +}; + +/* + * A function to remove backing-chain child of @bs if exists: cow child for + * format nodes (always .backing) and filter child for filters (may be .fi= le or + * .backing) + */ +__attribute__((unused)) +static void bdrv_remove_filter_or_cow_child(BlockDriverState *bs, + Transaction *tran) +{ + BdrvRemoveFilterOrCowChild *s; + BdrvChild *child =3D bdrv_filter_or_cow_child(bs); + + if (!child) { + return; + } + + if (child->bs) { + bdrv_replace_child_safe(child, NULL, tran); + } + + s =3D g_new(BdrvRemoveFilterOrCowChild, 1); + *s =3D (BdrvRemoveFilterOrCowChild) { + .child =3D child, + .is_backing =3D (child =3D=3D bs->backing), + }; + tran_add(tran, &bdrv_remove_filter_or_cow_child_drv, s); + + QLIST_SAFE_REMOVE(child, next); + if (s->is_backing) { + bs->backing =3D NULL; + } else { + bs->file =3D NULL; + } +} + static int bdrv_replace_node_noperm(BlockDriverState *from, BlockDriverState *to, bool auto_skip, Transaction *tran, --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615993050; cv=pass; d=zohomail.com; s=zohoarc; b=djRFXbJt45et+h1cZXKcTWaIHY1maTZiFUw300ZZ1ixOyrbdZJGEbpqo8WJJtO4kk+ZiU4m1zMPiS6FfC/z4s9RHh/fn+sq4V04gNFBwjEHh+IinRNxdQrL7sdHRkkgOvz8WD7ZOY8Y9fLnO1yUbcfDa/vRD7DeGHUeXkLdFA44= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615993050; 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=565vSySmdqhzBD/V/TDV3F+6cl3Of1SSVJGXLwDLm3o=; b=I/29lrNPuX0posalm7BEYwknzsdQmFN8JHwh8/oB/YzGQz677o1XIm+j9gtnhF9w4omuEzlJzYWZ+klKu6/Q+hdLBaZpwNkYrd2Gj0OLnYPbda1GVV0+ZViW41tPKNMnd3zWuFh9vSy2+Cpud8DGMY6h/OcgkZSdlatLLxWUcjc= 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 1615993050725487.16138424746066; Wed, 17 Mar 2021 07:57:30 -0700 (PDT) Received: from localhost ([::1]:34006 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXc1-0002cW-In for importer@patchew.org; Wed, 17 Mar 2021 10:57:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXI5-0004xe-U2; Wed, 17 Mar 2021 10:36:54 -0400 Received: from mail-vi1eur05on2119.outbound.protection.outlook.com ([40.107.21.119]:8481 helo=EUR05-VI1-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 1lMXI3-00075m-Gd; Wed, 17 Mar 2021 10:36:53 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6038.eurprd08.prod.outlook.com (2603:10a6:20b:23f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:36 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:36 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g64OWDbE88yaLiA5xp55uIIHOERjyt2KTchIL9gXtJlN74kgpJbEx4ABFCGFw5tkk5KsPDSFNscxOO1rhJtN0Wwvx5JNvIZVMD2VRrctEB3f4v4r5EA+dYpKUa2z7+b6k3uNokYAg9oeqOywEkeGb2qlAMghGu/ojrESNDxtswOL6lDii01ZQ1il4XQvR0njrFVIEyX2HCdMnRZR2+yDcrqglOCttBn+1njca9ULSwzfNW6WabP3K9KMYugYmwiO4xWH3L5+mWDZymU8EZXRfF6vq5ik8ccjaS2yVLY1EaZP7C7roG/ZIWoBd5qhANEqvU4v0lcS5LFTPtWLCEmSog== 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=565vSySmdqhzBD/V/TDV3F+6cl3Of1SSVJGXLwDLm3o=; b=fEps2qroROycpxPFLGBKYPh3gXTqyRU8I8r1w0EqeJve9K9mu0rDZeTsM9CPAY1/E3648uGDRbPgXIj8Oac69JPLSY65mZ8jx9fTsTKoAspnaGZW8a4zs3FYG9GzI5smNjbRj1Yd53BlTYHa5DXONLIUioLqL/yU6c/z0vGaGnXL88gkKXX2WZfS72niwdhkhPTQb5vZ1Ok1m/DmVs6D2r1oph7zF7DxKPYhSY+UwVTYDlu0lj2gz5/x9KdAm+jKeSeB/9c7ywBkLNXPRcO3lUTbvDqGXzfikXBv7N+bGepUEygl6rxtny+1gAMj/znznaq8QwwLFlr2zvUB4kfb5w== 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=565vSySmdqhzBD/V/TDV3F+6cl3Of1SSVJGXLwDLm3o=; b=q2CALY3n0ImYWzKgBPY5cSCfE73QpoxeN8nrjNp3UFIUp/drriS4Pn/Rf+C+cTSPoKqJMHpxbNcipxMFOt4o6GJJBtxzzdtwINRIPD92pxQo0spc6HV18PQf+kAfXPuuS0JYhjELQlVkbcmCQTmkfiPgcfY3/YzJKnzWLqmqf2U= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 23/36] block: introduce bdrv_drop_filter() Date: Wed, 17 Mar 2021 17:35:16 +0300 Message-Id: <20210317143529.615584-24-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: e1a077aa-556c-4591-c866-08d8e9521188 X-MS-TrafficTypeDiagnostic: AS8PR08MB6038: 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: ncZjRBnHwFrY40sD+8YyNiZZRen8fY46WlxwKP2X2dJvZEh8O8uQB8JiceNrz8khC9O/iMr7cqat9HSet8NuGwAcW9V6pFZ2ah0411paTudDvy89PwRgm5xOqyLntE45cKZ57nGPrMvxeWcJuheJdKmcPtGKgYz7IIgvaZ4RwGpLEanNy40sAMTC8qHQQ54XaCQJ8nieEfi5d9YYS0kaG/1FMRemlisPC/S38vbFT4SIvccORSkAp4z2Y9tvV25acOwj2hE8mDiOP/0NUYW862suGJ0cjphCWrMrmcsq1C/5I6TYew6uQ/dfq0p931vZAWaNC5Kh4chktcI0/QRqwUtmSJBK6bdGrabj2pvTlmM+0hBPhXXxp2Zhb2piJA80N6wNbo6fhDjngkMOKvRi7U2sWwWtAPRURPBCztMd9E0UHt8F99BsEpYeQAuzb3oU1QVKyRe6T0D7do/bikjYox/rWgJnV3YBbw+5dwQtkyRoKEwG3UBi7Zd2nQDS1Cud3iPpx40lpjS5l36Zwp1NxZpFhBIkS4FbSljjouZS+hdlkyYRk2HHPO64an7h/eMtqG9h/UwVQ1BrPcYkAW7/bSW0zjCum5zaDHwoqB2Phws= 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)(39840400004)(396003)(136003)(376002)(346002)(366004)(2616005)(4326008)(6916009)(478600001)(6506007)(36756003)(8676002)(8936002)(66476007)(83380400001)(316002)(66556008)(5660300002)(66946007)(6486002)(26005)(2906002)(186003)(1076003)(6512007)(956004)(16526019)(52116002)(69590400012)(86362001)(6666004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?pDSXvNampMDCQfhMZpQ42Rff7FaPJ2SO50S+HFD0R0dJ0bKznDGsGutx5iXM?= =?us-ascii?Q?j5Uz9tpjTD8MRNFVtWx3j3Csm5t9CBpmHg1y+awUdRQot41vfv3PNEKBzQG/?= =?us-ascii?Q?zD1L/09Mnw7HhY8mAkKESvVgcjM4Yl4k9Ee881087HKZ0fWrCftFTGg+8SIy?= =?us-ascii?Q?x5nzWbwLBMdJSeBvlm9aKNiyyYYKBpuPb0SWi+du3ab0exoLfKRscZkMrlBy?= =?us-ascii?Q?BdC1ADrLusPm5H4yRHmbXGz4htWEl1SspTkjg1LKTjlakLFIAGiwHpUwZJKl?= =?us-ascii?Q?j7IdIPuon5nJoxyM9FyF9b/1j6CRDAso37zkGCNIixKYs5QgpU+h6bkgNm6O?= =?us-ascii?Q?7+l3oiAo3r47i+kBTwzS1E0Ym7kAw9zWl4gaa8cFpas+mDwfhMigRBln5u4J?= =?us-ascii?Q?4s16Qz4anNrGMbJO6dECXAxtFShiuuqFqBGBVjymlUWETlPZDgUqdYZGr740?= =?us-ascii?Q?WpDAYFY34d5mslscu7o1Z36/M78qPFfXtFxoA8ZhOxIkEOKmkQN/OL5CRKjv?= =?us-ascii?Q?eXrmaFeomgvaRBmbQ+9YKgDaWStYnaCEAqPU52AIsZfjf1Ldi1o4mLL8lxUP?= =?us-ascii?Q?XJDE4zzPQ9ERxMadQImIFxClLD8m0qHwydcbtq7s8ICQmEXFJs+HkJW1Hm9b?= =?us-ascii?Q?YKcW7GG4FBmSbK93iRqU8HQT3QhpPzeEFUP4sBPA43nOuXUoJVEylr8cSB3z?= =?us-ascii?Q?vovQVh6QKzQwZl/BvuYwDwtH5zeivLFIwSVDMeslNjGQM9I3F4/6p+MZJJyf?= =?us-ascii?Q?+CPX9s9O8ZGpr+otf1EkeG3rLjrJa7NjepipKDNIKw0HYopMMGAXmOS1+F/A?= =?us-ascii?Q?IqbMZE6hE8YawlS+UDG2TDFC7bLw0eI07KiWbyjZlnxxRzH0qZsw0m/vgjjG?= =?us-ascii?Q?o9i/pHPalIsw3IBESwxH2oZeBqmI4bsfpuzhxViKaogcUlqTHTTVxaVEFNp2?= =?us-ascii?Q?V0lmPh5m1ZkZ684po6qP5mHwGC/A91nsYGsjB5eTOqWwJun35r+ihuuNTRLJ?= =?us-ascii?Q?BbkwcgFz+iNBdsDvedgHaeF972MN72DcYmBcTcLQJOjCQJI4hYj0e9fUgdao?= =?us-ascii?Q?KmK/n+RfZg8fpVLNpkYBO11Y04G66zmRHWkB4GDKzxSim6HeLX2+kN5THeFK?= =?us-ascii?Q?1mG9wy0gRYQyJa6rsqpxQBg+5tPISrjMMBhzJN2ie4Zx5fEekMHGeE4d+HQa?= =?us-ascii?Q?4V/NmI9ZQ7t57Z/j5BLB0t7vVr2zquRt9xf3Sl5BiokON6IUZTWbm9Dfdh8+?= =?us-ascii?Q?X0AyPSjSihU24WZp+ify2LQ9vrxn5NjHfPKDZGoyYc1lcthgyEEiI1y4n2qo?= =?us-ascii?Q?l2T7OU4O0IfwidhiKKTeoZjx?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1a077aa-556c-4591-c866-08d8e9521188 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:36.6011 (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: 3VGWA2eQRC6YLkosEDQrqJjjP1xldRDeZAoF1CCCrtbBma2aA3BY9QloiXZYQD9fI+YdFHAF1uUAZzNm1gWy1iz/uOEnlKMSkJzEsG0dUyk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6038 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.21.119; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com 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" Using bdrv_replace_node() for removing filter is not good enough: it keeps child reference of the filter, which may conflict with original top node during permission update. Instead let's create new interface, which will do all graph modifications first and then update permissions. Let's modify bdrv_replace_node_common(), allowing it additionally drop backing chain child link pointing to new node. This is quite appropriate for bdrv_drop_intermediate() and makes possible to add new bdrv_drop_filter() as a simple wrapper. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- include/block/block.h | 1 + block.c | 43 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/include/block/block.h b/include/block/block.h index 16e496a5c4..85481a05c6 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -362,6 +362,7 @@ int bdrv_replace_node(BlockDriverState *from, BlockDriv= erState *to, Error **errp); BlockDriverState *bdrv_insert_node(BlockDriverState *bs, QDict *node_optio= ns, int flags, Error **errp); +int bdrv_drop_filter(BlockDriverState *bs, Error **errp); =20 int bdrv_parse_aio(const char *mode, int *flags); int bdrv_parse_cache_mode(const char *mode, int *flags, bool *writethrough= ); diff --git a/block.c b/block.c index 2fca1f2ad5..bf60f1ea2c 100644 --- a/block.c +++ b/block.c @@ -5000,7 +5000,6 @@ static TransactionActionDrv bdrv_remove_filter_or_cow= _child_drv =3D { * format nodes (always .backing) and filter child for filters (may be .fi= le or * .backing) */ -__attribute__((unused)) static void bdrv_remove_filter_or_cow_child(BlockDriverState *bs, Transaction *tran) { @@ -5064,16 +5063,32 @@ static int bdrv_replace_node_noperm(BlockDriverStat= e *from, * * With auto_skip=3Dfalse the error is returned if from has a parent which= should * not be updated. + * + * With @detach_subchain=3Dtrue @to must be in a backing chain of @from. I= n this + * case backing link of the cow-parent of @to is removed. */ static int bdrv_replace_node_common(BlockDriverState *from, BlockDriverState *to, - bool auto_skip, Error **errp) + bool auto_skip, bool detach_subchain, + Error **errp) { Transaction *tran =3D tran_new(); g_autoptr(GHashTable) found =3D NULL; g_autoptr(GSList) refresh_list =3D NULL; + BlockDriverState *to_cow_parent; int ret; =20 + if (detach_subchain) { + assert(bdrv_chain_contains(from, to)); + assert(from !=3D to); + for (to_cow_parent =3D from; + bdrv_filter_or_cow_bs(to_cow_parent) !=3D to; + to_cow_parent =3D bdrv_filter_or_cow_bs(to_cow_parent)) + { + ; + } + } + /* Make sure that @from doesn't go away until we have successfully att= ached * all of its parents to @to. */ bdrv_ref(from); @@ -5093,6 +5108,10 @@ static int bdrv_replace_node_common(BlockDriverState= *from, goto out; } =20 + if (detach_subchain) { + bdrv_remove_filter_or_cow_child(to_cow_parent, tran); + } + found =3D g_hash_table_new(NULL, NULL); =20 refresh_list =3D bdrv_topological_dfs(refresh_list, found, to); @@ -5117,7 +5136,13 @@ out: int bdrv_replace_node(BlockDriverState *from, BlockDriverState *to, Error **errp) { - return bdrv_replace_node_common(from, to, true, errp); + return bdrv_replace_node_common(from, to, true, false, errp); +} + +int bdrv_drop_filter(BlockDriverState *bs, Error **errp) +{ + return bdrv_replace_node_common(bs, bdrv_filter_or_cow_bs(bs), true, t= rue, + errp); } =20 /* @@ -5452,7 +5477,17 @@ int bdrv_drop_intermediate(BlockDriverState *top, Bl= ockDriverState *base, updated_children =3D g_slist_prepend(updated_children, c); } =20 - bdrv_replace_node_common(top, base, false, &local_err); + /* + * It seems correct to pass detach_subchain=3Dtrue here, but it trigge= rs + * one more yet not fixed bug, when due to nested aio_poll loop we swi= tch to + * another drained section, which modify the graph (for example, remov= ing + * the child, which we keep in updated_children list). So, it's a TODO. + * + * Note, bug triggered if pass detach_subchain=3Dtrue here and run + * test-bdrv-drain. test_drop_intermediate_poll() test-case will crash. + * That's a FIXME. + */ + bdrv_replace_node_common(top, base, false, false, &local_err); if (local_err) { error_report_err(local_err); goto exit; --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615993345; cv=pass; d=zohomail.com; s=zohoarc; b=jEOTI+qxBjnskVcOp3cNT94rk18uVWBg7dGuZlBm/WedaddfeufNxDqsd7nXLWz35hreyzV6bjnuFoPMc/T/qtk6O9bJcl7xvK+ocrKT60R4FcufAsqZSA9aH72X3wsmPycfDRnDwPLl/D56tdlB+pikA3OFZDoKNNlpE7yOfnU= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615993345; 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=C1BwOq6cWGxjnaFMpFq0UrrKHm291AB1dwLPVSC2OgA=; b=dZBNJATmPkPa5ppApcEGnxN0lam3tod7YZ4UPR3pL3jVfkg+QzabbuI/bB/foWdVxESriO1hmL2yz//fngE2/tPrWNc50PUexQ0WLE4b6zSraCfDqd61LILrisiFKSTl7fH4+Tzoj1ULqqJnGpeGxPlfZ+XXQ+XRLoJl1DJ+/Tk= 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 1615993345836198.6053603828866; Wed, 17 Mar 2021 08:02:25 -0700 (PDT) Received: from localhost ([::1]:43638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXgk-0006fg-U1 for importer@patchew.org; Wed, 17 Mar 2021 11:02:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXIE-0005Bt-GO; Wed, 17 Mar 2021 10:37:02 -0400 Received: from mail-vi1eur05on2119.outbound.protection.outlook.com ([40.107.21.119]:8481 helo=EUR05-VI1-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 1lMXI6-00075m-Mp; Wed, 17 Mar 2021 10:37:02 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6038.eurprd08.prod.outlook.com (2603:10a6:20b:23f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:38 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:38 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UKnHQNQVRv1DW9kNrP/xMKxlGMGFVXMwqxMH1crPE9M9RJIxNi6lRvpG05PgWk+fl9MRv7pU2M/YrD+naXBHxxld2FcIPqpbSnrO10k/KIqrzRlovYMjtM1KX61JTYEf4zV7x3Jrvo5DUmdkOKyr7x/w2zCSBvxYo+0iVzJztCnHnmeR4Hy/v9T9lWR1y2Zeu/BUKRW4ISEibc9dw5ZVzrGNnpOU6TYLZ37GfQ1iUDuV7EtWnxu6pjnoBQv/jW9P2SWJQot8SRnWjXPlc6qm8Exdfux4upq2GbE9xmDczuFqIrA+o9XhF5Yo3ZV1EYnYXNkQyZ0j2FWsFQesTgikPw== 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=C1BwOq6cWGxjnaFMpFq0UrrKHm291AB1dwLPVSC2OgA=; b=TcqgQQMoNK3NbNPgRnpgjHhOcencbRKHDhE8JRUAYIlS9Hu1IfIbN1AVz7sE+mcbM53jVFYNl4Hyh8GK2TjzJpFMMtUPR2L8ctJ1UT1dxmDLz8ucPFyQBnvJJGSvWfS616EgeKJdNEG1aXfej5T95W2ASIUCmGbneQX0Cdlmvm7P1v8jyWQfGXyylPoz5Jv6EzFyMmfEp/5g5Dh4x8dCSHN62ltTaNxi2jjhzcek4B6BE67HUv78SjCb1SIkkX6iquZAL6e68x3/qhwAD2eSIMAeOEEBoqu6fd8cRNyhgmLLuHr/F+kOYQO3lRQnBty4/AVoZM4P/1cAxxpImGFVFg== 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=C1BwOq6cWGxjnaFMpFq0UrrKHm291AB1dwLPVSC2OgA=; b=gYs73aiN2nPtaVDZiNqUydHDpru+ltIa9EWNVAsScPrRUO2eHVudC9V4ERFitgqFbxqnAOsosvClh86syqGkTrVn//9RHg2XRjg9YXf0fCQHD3cZkc8be/VwtSFtFVyabK3s3U2dBbVQ0eETzPinCp3p9qYvA6Ytrh9Lesa9QvY= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 24/36] block/backup-top: drop .active Date: Wed, 17 Mar 2021 17:35:17 +0300 Message-Id: <20210317143529.615584-25-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: 0eab1c0e-3517-4309-6c83-08d8e952126d X-MS-TrafficTypeDiagnostic: AS8PR08MB6038: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:94; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0eLaqIiikfmyaSxpPCCnp5HAy+/opf2qGQ4n8JgwJdjzkmg4DWT0NrdDToGBmq+mbwCH1Jk9P2gLE7WKwwJTzgwCiWe9jQkM1OpOd3CyckAvV+1RNHD12xdW7wa2HoW87d6TbSMqd7HN7jlprIQkBjMXACrqOPuM5RCW9bZjNMrcEwDpDVJ+ORFHhsS9fXut6O6YboiWuLOquoiGsNsVbO89yIXlPKYYK0/4uzgo9IG3GnW+I89Ck4Rl198vctb/0Z6w7InJF9dXFnr6u2qf7+gxMsmcfK0r4X2igw+c1yqdO1OVJTF4cROed3b3WSKCu8y6thgsVeekxNnORlcLsro+VYvCAVTSQnBCGv8vFeWPwehvGWgsNvTvxWlJes3qP2Ob4anjpccGaENAzTXQiH8AkorrtIqLCifMsQmAWfFqYjWJxSQlhvgSQhklERnSnvduzHTJ9wJLbMprJhCTma2M9ee7E+O0CApd4nyz2C07+ubibfQ9c/eVTcXAOqanCCRkHxxNxhvYJkWvwdvSMle7GiuYK1obt2kNvSlzBctuYVZMXik7aoSlLMM1XUy2Di86Bnto092cOkbH9k4ZS7dH9GqyMe6pN2h7zroRv89J/lY5AEkEkDmRms45frXWiJgbB/1HSqsNXMmxXA4sDg== 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)(39840400004)(396003)(136003)(376002)(346002)(366004)(2616005)(4326008)(6916009)(478600001)(6506007)(36756003)(8676002)(8936002)(66476007)(83380400001)(316002)(66556008)(5660300002)(66946007)(6486002)(26005)(2906002)(186003)(1076003)(6512007)(956004)(16526019)(52116002)(69590400012)(86362001)(6666004)(142923001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?38HRluiq/ffQKGBoUfeEjq1VLRe/+gSuk9BFqITr36yAqltjrobqrkd2lvd+?= =?us-ascii?Q?SfZ0KJTFWCpwpWa0+gNowIyU3N4iyez/zahcTptD/hOV+ouKgFz/v+1eDY7j?= =?us-ascii?Q?ODsEYuyFm7kcQOwfrf8Fw52Z42Q+cPzAS7FfJYp3u7s3+KFB1AdglotnlhP4?= =?us-ascii?Q?c6fApZstsFyOKbUbc9dxuizXc3FoLkSM65N7/T6aeXNj+/S2+jZcZ/sB9o1O?= =?us-ascii?Q?cBqc75m9b25dMQSxjmM0aOrvTa4vM9HuqjgD1EAv0LD1FTnLdUqI0tG0+Qxb?= =?us-ascii?Q?9bpDoI6R1h5f5boopizYr0KkmDK79jMBF1HA4RG60NplYxC0xdnR7UICLect?= =?us-ascii?Q?LX5Wr8km4jZ4wSPSZOURtWY0Raj08Ya+UU6h0FFKojJsv3wHUSZcSOuAksEU?= =?us-ascii?Q?b05cP9skUBsylI+dSAASYTKxuAOpjD8Zo6OYT+BC4y4VbugHR95NKgBz04Fu?= =?us-ascii?Q?EiLHlLxWsAiyLndpKLFoshj5WNoy6f3S0+iSbpB/NyDtsPWx3Hban2TOjmYH?= =?us-ascii?Q?8e3W4bIMm0JYQiitd22gIoNtRDQLcCJDLsjcmh28VKK+4e+p7+bnE5lYPn+6?= =?us-ascii?Q?Jz/iXXT0MNUBdxRcsQlOs/GL0oizTgAcYb86LEuhf5pt84lwwkV5CIa8CTWW?= =?us-ascii?Q?MuSHSvOcaG7l8VUJMz741UPu7rHr8WvgBjo7nyp5MBwXEGow/bAmmOpk3wKB?= =?us-ascii?Q?qRadW91mom/8n7ieH6rk7KF7gIEW//12wp2G8ge6RNVTtMb6BQHcKYsDBryy?= =?us-ascii?Q?5/1iygMIri4Kt5R6BzKjYazidg4BBULfnSyev2F2vm4Q2FJ1/wd8NwfL3nfO?= =?us-ascii?Q?A35KIhCc0LEeIB9oSd0b7cn5lV1BcuUaLOFb2Xu2OumBTwGP2Igebf/Ugkcn?= =?us-ascii?Q?/rG8iociqakUeked8R25mmil5hsEET2lu+EDH7JWLNaEi5GfS0DxZkl1tHA5?= =?us-ascii?Q?IuVG8HRUZiYb3oMva3yRiPxlXo3p/ptv2qXVe16CFqB0IsTadMeGPIqudMA1?= =?us-ascii?Q?rankZbbbZ3N4duhEll01M8iXLrxX3dz7Sk7MKOET600X9mZiTx+cvlZgC57T?= =?us-ascii?Q?ZKZ7p19IO3Bg0x+WvGkitXjUpSWKKQuyY3uSZOqP24Rz3l1nO8MfbcBTLmef?= =?us-ascii?Q?pis97OER7rKej3x5OOVRc+NNUwWXCKsjOVZb3JHMv7Uk5xUrvpCPk/Luy3Hx?= =?us-ascii?Q?Rk074k3SOGoQ52aF2NTAvPfCeA0/EMYmibVF+fGm6UAIUupC3oH7Jf8zrv0g?= =?us-ascii?Q?hzXqKvdEaLuBaa6t8RiiUfnw25VkMs49yA+pA2OZIz3qRUh8gpM+mh50o9b6?= =?us-ascii?Q?CKew8q0xW0TegkgwINz7HohD?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0eab1c0e-3517-4309-6c83-08d8e952126d X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:38.0767 (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: 1v94O/FTT+nfoWrm7wkt0Zd7m+Ii0OuOohsm6d+KqOUzoDMCHvP/+OFfHKnPkN054+O1ATUHYhzCwDmp58OFtkCCiCjzCLmM++SRWyrYDpU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6038 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.21.119; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com 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" We don't need this workaround anymore: bdrv_append is already smart enough and we can use new bdrv_drop_filter(). This commit efficiently reverts also recent 705dde27c6c53b73, which checked .active on io path. Still it said that the problem should be theoretical. And the logic of filter removement is changed anyway. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block/backup-top.c | 47 +------------------------------------- tests/qemu-iotests/283.out | 2 +- 2 files changed, 2 insertions(+), 47 deletions(-) diff --git a/block/backup-top.c b/block/backup-top.c index 62d09f213e..425e3778be 100644 --- a/block/backup-top.c +++ b/block/backup-top.c @@ -37,7 +37,6 @@ typedef struct BDRVBackupTopState { BlockCopyState *bcs; BdrvChild *target; - bool active; int64_t cluster_size; } BDRVBackupTopState; =20 @@ -45,12 +44,6 @@ static coroutine_fn int backup_top_co_preadv( BlockDriverState *bs, uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags) { - BDRVBackupTopState *s =3D bs->opaque; - - if (!s->active) { - return -EIO; - } - return bdrv_co_preadv(bs->backing, offset, bytes, qiov, flags); } =20 @@ -60,10 +53,6 @@ static coroutine_fn int backup_top_cbw(BlockDriverState = *bs, uint64_t offset, BDRVBackupTopState *s =3D bs->opaque; uint64_t off, end; =20 - if (!s->active) { - return -EIO; - } - if (flags & BDRV_REQ_WRITE_UNCHANGED) { return 0; } @@ -137,21 +126,6 @@ static void backup_top_child_perm(BlockDriverState *bs= , BdrvChild *c, uint64_t perm, uint64_t shared, uint64_t *nperm, uint64_t *nshared) { - BDRVBackupTopState *s =3D bs->opaque; - - if (!s->active) { - /* - * The filter node may be in process of bdrv_append(), which first= ly do - * bdrv_set_backing_hd() and then bdrv_replace_node(). This means = that - * we can't unshare BLK_PERM_WRITE during bdrv_append() operation.= So, - * let's require nothing during bdrv_append() and refresh permissi= ons - * after it (see bdrv_backup_top_append()). - */ - *nperm =3D 0; - *nshared =3D BLK_PERM_ALL; - return; - } - if (!(role & BDRV_CHILD_FILTERED)) { /* * Target child @@ -241,17 +215,6 @@ BlockDriverState *bdrv_backup_top_append(BlockDriverSt= ate *source, } appended =3D true; =20 - /* - * bdrv_append() finished successfully, now we can require permissions - * we want. - */ - state->active =3D true; - ret =3D bdrv_child_refresh_perms(top, top->backing, errp); - if (ret < 0) { - error_prepend(errp, "Cannot set permissions for backup-top filter:= "); - goto fail; - } - state->cluster_size =3D cluster_size; state->bcs =3D block_copy_state_new(top->backing, state->target, cluster_size, perf->use_copy_range, @@ -268,7 +231,6 @@ BlockDriverState *bdrv_backup_top_append(BlockDriverSta= te *source, =20 fail: if (appended) { - state->active =3D false; bdrv_backup_top_drop(top); } else { bdrv_unref(top); @@ -283,16 +245,9 @@ void bdrv_backup_top_drop(BlockDriverState *bs) { BDRVBackupTopState *s =3D bs->opaque; =20 - bdrv_drained_begin(bs); + bdrv_drop_filter(bs, &error_abort); =20 block_copy_state_free(s->bcs); =20 - s->active =3D false; - bdrv_child_refresh_perms(bs, bs->backing, &error_abort); - bdrv_replace_node(bs, bs->backing->bs, &error_abort); - bdrv_set_backing_hd(bs, NULL, &error_abort); - - bdrv_drained_end(bs); - bdrv_unref(bs); } diff --git a/tests/qemu-iotests/283.out b/tests/qemu-iotests/283.out index 73eb75102f..97e62a4c94 100644 --- a/tests/qemu-iotests/283.out +++ b/tests/qemu-iotests/283.out @@ -5,7 +5,7 @@ {"execute": "blockdev-add", "arguments": {"driver": "blkdebug", "image": "= base", "node-name": "other", "take-child-perms": ["write"]}} {"return": {}} {"execute": "blockdev-backup", "arguments": {"device": "source", "sync": "= full", "target": "target"}} -{"error": {"class": "GenericError", "desc": "Cannot set permissions for ba= ckup-top filter: Conflicts with use by source as 'image', which does not al= low 'write' on base"}} +{"error": {"class": "GenericError", "desc": "Cannot append backup-top filt= er: Conflicts with use by source as 'image', which does not allow 'write' o= n base"}} =20 =3D=3D=3D backup-top should be gone after job-finalize =3D=3D=3D =20 --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615993120; cv=pass; d=zohomail.com; s=zohoarc; b=f92zKO9cr97t+TjxTF+FzNZGicr3VpgrkUPSp8atPfGOrpjLUmzRZY1w8wJ7C+3EcT2NDLbDL3hVBRc4rv679mXyLGLlsv46Y3Q+y7HZAsCGkz5D6AvvCCt4Sr3+zKQkgGv+wt8rYuz4+xwcO5t9bGVxCZywagKuZEprO3GgeVY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615993120; 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=XORFBJY5zMolbwbZdBmP/EhjYrW7KeOnESZJ8jk6aaw=; b=hF6dblVuzymaL24C/c1K+VbBWhvYpIkfmUu3bxUAQFRVDsJ9XvxwYiEbLS7aCpJSxRkKaHUWIOQnIUAOxrtA0V+9k8CObLm6NenNuLQ78i3c36M1vD5jSLaD2OR0bXhv4YwP1CQ07CIj/MmMzYNoVojBfLTIOe9DyPzUWQSVdAY= 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 1615993120588323.2533919297333; Wed, 17 Mar 2021 07:58:40 -0700 (PDT) Received: from localhost ([::1]:38232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXd9-0004JW-DI for importer@patchew.org; Wed, 17 Mar 2021 10:58:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXI3-0004sP-Nx; Wed, 17 Mar 2021 10:36:51 -0400 Received: from mail-db8eur05on2128.outbound.protection.outlook.com ([40.107.20.128]:5633 helo=EUR05-DB8-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 1lMXHt-00079x-Lp; Wed, 17 Mar 2021 10:36:51 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6216.eurprd08.prod.outlook.com (2603:10a6:20b:29c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:39 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:39 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QLc/v1zBbePelKq1uBozaALF9W3N0M6c8yS26l4xiNBcb3Qd85S3pM9/ulbeVfp3PcyxEYyeGncOpvY7jqUQKijDXHKnVatovbZtkJH+eOYBy5XQ1F2vxkxiLKIjTCdWGHBcWLXVpN/IChEIFFJT8XjKlZwvg8KIQucMy0/tleYGkJsIOezJ+g85TtjFumaaUxEmrOFr+BWhXYVPz9K4GwjqftMYcqoffNuIWqGDP6bfMtVGrJyBZogzH36HnD7mlYxmMkhaXmenSgD/VZ4oscR0T7HS0BBhEOpfWsBqQcr4gkVxv41jvqdZX1yrnfPX4pfqTid8Zej8Fk/UnmvxnQ== 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=XORFBJY5zMolbwbZdBmP/EhjYrW7KeOnESZJ8jk6aaw=; b=TheCh+u8PDXNqdaKqeFfisg2+VbIgkGAvqv1PdQOuTZnjVfuwJGTtc73ynMS00rWu1Ozc3W6hKqjYdFTNB8nVGQlYd0if/sZTC18Kr2an32Ic7dISbZZljoiGKivBq7JV01Ye4zgwpvYTXeAcmBzYbntkOldU8pKoH7EY6k5BoGiv40BhSzYbcyPUWYTjyM1WufE8DnrJk5UJrTVyrURKZZ2NzfcGMbxBmFF66ONMF6iw04xldeLftI00Riv006IEEVKoDmu74wS7rbQR6cje3jP1QO8OESohiMkhaEhYv+EuaVEoG/NizpwM8TwRT0J+xYYeySXw2ExKf0bUozXGA== 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=XORFBJY5zMolbwbZdBmP/EhjYrW7KeOnESZJ8jk6aaw=; b=X9HiERN1+otbQ9rviZ9tpbIo5T2V3Kdkv7eIH/DZX85JCMMws9CoP7RI5CfY4Wl08Xzsh259Sobf8o53ZF2L7wB0PFROD6JEXHwIqYKy669xTlXI2O9vEhjCiymxrqzRJOxipjFgnhYq+3s3KbrUOssKUJdNTPx2qtM91exWSB0= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 25/36] block: drop ignore_children for permission update functions Date: Wed, 17 Mar 2021 17:35:18 +0300 Message-Id: <20210317143529.615584-26-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: 3f8a8c35-aaf2-46ac-43d7-08d8e9521342 X-MS-TrafficTypeDiagnostic: AS8PR08MB6216: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:529; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vGMFwBwi4Wmsm4Yg3jqtRV7f1M6LUNm4R+YCwescTi9yb8MVQco0A/l56/622fnUSehv/OEWpYOY9QCYmSEo7Sf/wq1F4l6B22D7n2Et/KrZ3yQZA0T0qIy78UUdIJZqv5Gb0yEIF7zK0WJdD3zTAMrsXx2K8oEbhcYjpvAII9AHjt7jope4CStNDgGFIEEyk0ir6+Q6Jj9zlCQSCQ+YEaZ5U05OUqjhrIu/2dkmRBMxemQhWHidaI2Up8FwTE7QuTv6tcEG2S0LJGLggixIEyRmzsZskzPZ9lEbFyQIV/q0FaRF6KUmX+qXPIN/0ZmrUOtGKTgcrAe37livitJTNrKNvrky/ROHsZ736iiFaqpgILRpp+VhCGOoMcW1izWsy715J936NvTLo4bww5HEsRLwaH43/7tQ/RgJGMQcUVtzGlmtFs3o4T97WhVa/WEN9/O/cUd5ooBHyLPG/ioXm9LWElDUHhSpwKkUcmVUMlftvpykBClJerBB9cu+h/ceWnAe05+7eu1ceAQyGAMTN3pHGguSFjRvZMtCpnyIiEMQSEoHgc8WTLHPnsA8RpOBWlgUgM1bCysTRNjS5iWmZvsQZPa/r8D+DsLKIDAGGigIPFZHBNGLeNBignryyr6v 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)(366004)(346002)(376002)(39840400004)(136003)(6916009)(83380400001)(316002)(2616005)(66946007)(6512007)(66556008)(8676002)(956004)(26005)(1076003)(16526019)(6486002)(186003)(4326008)(36756003)(8936002)(2906002)(6666004)(5660300002)(478600001)(86362001)(66476007)(6506007)(52116002)(69590400012); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?dREGVIn3v3xEKGuxwp8g06MtiOwhfSVEXZv873Nuqif50bVkUa5JCzjdI/UY?= =?us-ascii?Q?XIZPWIRTc1CeQgwc/Mvjop92y57qux4gFzgvGD+x6YS37ibkn+3uLioq8SA/?= =?us-ascii?Q?Kwnows0go4RZfxGI7ykTr5LJ8Xw6LFeG4FekxtBy9trhtDEyy9NpxDXE1u2y?= =?us-ascii?Q?PHOh0aNFIj36LHkasCYo8QMHMVqPn1Rt39doMgcJfknwZlYNuzv/U3K1QGdI?= =?us-ascii?Q?covKjcamX5e5NT2xtDq1nGIjVN7NXNyhGUlSqQdJYNsbTsEJbCg8tvl2XJg3?= =?us-ascii?Q?OG4SKUeOm5nPVG+1ntL1G/PkAT4WG6C8g9gfjabNipwJ+duTrGYEAVSjEKF9?= =?us-ascii?Q?vyNlyjqc08qdmR6r+iQwUCPzhjLf2Try9kLEA56i+GAG/ezOW3Ez3uPhaay8?= =?us-ascii?Q?qFHeOqO+VF7e5sHUPwTUYsDVwp0skr1LHg1HWJ3Y8PBLSv2rXX+1tzKB7D2v?= =?us-ascii?Q?W/engXIC0xCQiA7PxTJRtmGQfz7tcj3Y+yqMBlzeFNOssXeJX7S4QnEobBUD?= =?us-ascii?Q?hEe+zZEe3mnwT+GaKd+NRfORbim1GftYozSofUsY1YySVrSxCCQMgGGmo4/5?= =?us-ascii?Q?eEHjBFje2kHwcUtl7jF0nLXECefGpNqD0uN7cYzH6OPTMZJN1suc5ZACKwMV?= =?us-ascii?Q?SKjoUl1hYWX+ofUEO7QJ6bTP+7z4WJoYzi496vo973Kk/zRyp9QAWDkP9PaD?= =?us-ascii?Q?DrXPNCgwYt1k2yCXYGR+ayVcxnmZQaLt3ygWIi+ZNKGTTzz1aXyQzHaNVN1x?= =?us-ascii?Q?8lC7OvYB9gP7lUubqCyj5/UPBxanMcgKxV8wGqZa/hPvlj+zx+ayL9b7djSm?= =?us-ascii?Q?vUyAo0vMMjbUqDBfsBRPo/gvJfFIlwCHZoBF486YpE0tKy6AwY7McOTbPf0k?= =?us-ascii?Q?QyxeKl+8L22pwOvqNZoYMNGe9Oa6jpJGBqRM8tYFeWNR3+Z0SGOE+1DCLULJ?= =?us-ascii?Q?BYJx8UchVLA2sLoejxbMVsWPVGlGmDtLXE9KqO4+p1XwP7BWR1JmwPLLd9nx?= =?us-ascii?Q?lza/tuANobmZQR3S8S0Pi3pYLC2SIbQ/r4Pm3oBIpsDNuawXqytFwnGFhi4Z?= =?us-ascii?Q?xtQxVet9zRI0H5Yu92eZkFvG7yg+vaD35uZJPzCyh4cdGoInRawZhtfS6w8r?= =?us-ascii?Q?d73P/wRAzeCxJEi9J/AD0pzlpxQnuQtr/Ig+6Ah75x5g3YI/OvpqIN/5+ue/?= =?us-ascii?Q?FqrMCQzA7vhAGtIBD7id/20gQwapZl4pbSGqiXoMckyxGvooCIKNgoOl4j6s?= =?us-ascii?Q?MNsYYDMifVbNgGeOhwQ79UJ81pf8qvww1A96PmpESchWowF1m1tqALkE1/54?= =?us-ascii?Q?DUNrmqryb4ScLO36/cB2OQG+?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f8a8c35-aaf2-46ac-43d7-08d8e9521342 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:39.4118 (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: N7vsHOO7eW2Kz6DgYAC/DbQ0jcHPfTZJLma7gobduNkc88PaxqK81//gjYHE8ZE02o/PNv5FP/8GOvDSENl8/3hCXKD2KCp9wDae411LqNQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6216 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.20.128; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-obe.outbound.protection.outlook.com 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" This argument is always NULL. Drop it. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block.c | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/block.c b/block.c index bf60f1ea2c..922df82952 100644 --- a/block.c +++ b/block.c @@ -1954,7 +1954,6 @@ static int bdrv_fill_options(QDict **options, const c= har *filename, static int bdrv_check_update_perm(BlockDriverState *bs, BlockReopenQueue *= q, uint64_t new_used_perm, uint64_t new_shared_perm, - GSList *ignore_children, Error **errp); =20 typedef struct BlockReopenQueueEntry { @@ -2031,9 +2030,7 @@ static bool bdrv_a_allow_b(BdrvChild *a, BdrvChild *b= , Error **errp) return false; } =20 -static bool bdrv_parent_perms_conflict(BlockDriverState *bs, - GSList *ignore_children, - Error **errp) +static bool bdrv_parent_perms_conflict(BlockDriverState *bs, Error **errp) { BdrvChild *a, *b; =20 @@ -2043,12 +2040,8 @@ static bool bdrv_parent_perms_conflict(BlockDriverSt= ate *bs, * directions. */ QLIST_FOREACH(a, &bs->parents, next_parent) { - if (g_slist_find(ignore_children, a)) { - continue; - } - QLIST_FOREACH(b, &bs->parents, next_parent) { - if (a =3D=3D b || g_slist_find(ignore_children, b)) { + if (a =3D=3D b) { continue; } =20 @@ -2276,7 +2269,6 @@ static void bdrv_replace_child_safe(BdrvChild *child,= BlockDriverState *new_bs, static int bdrv_node_check_perm(BlockDriverState *bs, BlockReopenQueue *q, uint64_t cumulative_perms, uint64_t cumulative_shared_perms, - GSList *ignore_children, Transaction *tran, Error **errp) { BlockDriver *drv =3D bs->drv; @@ -2359,7 +2351,6 @@ static int bdrv_check_perm_common(GSList *list, Block= ReopenQueue *q, bool use_cumulative_perms, uint64_t cumulative_perms, uint64_t cumulative_shared_perms, - GSList *ignore_children, Transaction *tran, Error **errp) { int ret; @@ -2370,7 +2361,7 @@ static int bdrv_check_perm_common(GSList *list, Block= ReopenQueue *q, =20 ret =3D bdrv_node_check_perm(bs, q, cumulative_perms, cumulative_shared_perms, - ignore_children, tran, errp); + tran, errp); if (ret < 0) { return ret; } @@ -2381,7 +2372,7 @@ static int bdrv_check_perm_common(GSList *list, Block= ReopenQueue *q, for ( ; list; list =3D list->next) { bs =3D list->data; =20 - if (bdrv_parent_perms_conflict(bs, ignore_children, errp)) { + if (bdrv_parent_perms_conflict(bs, errp)) { return -EINVAL; } =20 @@ -2390,7 +2381,7 @@ static int bdrv_check_perm_common(GSList *list, Block= ReopenQueue *q, =20 ret =3D bdrv_node_check_perm(bs, q, cumulative_perms, cumulative_shared_perms, - ignore_children, tran, errp); + tran, errp); if (ret < 0) { return ret; } @@ -2401,19 +2392,17 @@ static int bdrv_check_perm_common(GSList *list, Blo= ckReopenQueue *q, =20 static int bdrv_check_perm(BlockDriverState *bs, BlockReopenQueue *q, uint64_t cumulative_perms, - uint64_t cumulative_shared_perms, - GSList *ignore_children, Error **errp) + uint64_t cumulative_shared_perms, Error **errp) { g_autoptr(GSList) list =3D bdrv_topological_dfs(NULL, NULL, bs); return bdrv_check_perm_common(list, q, true, cumulative_perms, - cumulative_shared_perms, ignore_children, - NULL, errp); + cumulative_shared_perms, NULL, errp); } =20 static int bdrv_list_refresh_perms(GSList *list, BlockReopenQueue *q, Transaction *tran, Error **errp) { - return bdrv_check_perm_common(list, q, false, 0, 0, NULL, tran, errp); + return bdrv_check_perm_common(list, q, false, 0, 0, tran, errp); } =20 /* @@ -2542,7 +2531,6 @@ char *bdrv_perm_names(uint64_t perm) static int bdrv_check_update_perm(BlockDriverState *bs, BlockReopenQueue *= q, uint64_t new_used_perm, uint64_t new_shared_perm, - GSList *ignore_children, Error **errp) { BdrvChild *c; @@ -2554,10 +2542,6 @@ static int bdrv_check_update_perm(BlockDriverState *= bs, BlockReopenQueue *q, assert(new_shared_perm & BLK_PERM_WRITE_UNCHANGED); =20 QLIST_FOREACH(c, &bs->parents, next_parent) { - if (g_slist_find(ignore_children, c)) { - continue; - } - if ((new_used_perm & c->shared_perm) !=3D new_used_perm) { char *user =3D bdrv_child_user_desc(c); char *perm_names =3D bdrv_perm_names(new_used_perm & ~c->share= d_perm); @@ -2587,7 +2571,7 @@ static int bdrv_check_update_perm(BlockDriverState *b= s, BlockReopenQueue *q, } =20 return bdrv_check_perm(bs, q, cumulative_perms, cumulative_shared_perm= s, - ignore_children, errp); + errp); } =20 static int bdrv_refresh_perms(BlockDriverState *bs, Error **errp) @@ -4209,7 +4193,7 @@ int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, = Error **errp) QTAILQ_FOREACH(bs_entry, bs_queue, entry) { BDRVReopenState *state =3D &bs_entry->state; ret =3D bdrv_check_perm(state->bs, bs_queue, state->perm, - state->shared_perm, NULL, errp); + state->shared_perm, errp); if (ret < 0) { goto cleanup_perm; } @@ -4221,7 +4205,7 @@ int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, = Error **errp) bs_queue, state->perm, state->shared_perm, &nperm, &nshared); ret =3D bdrv_check_update_perm(state->new_backing_bs, NULL, - nperm, nshared, NULL, errp); + nperm, nshared, errp); if (ret < 0) { goto cleanup_perm; } --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615993409; cv=pass; d=zohomail.com; s=zohoarc; b=PyEfXZDYUDPCxupYESh9wMyjFV9wiY6rTMmLBXuVSmNTSZ4RLzJQ2l+ngwCZrslNnMIqO20BDzwDDaotPxEwOtA5zHKrxMYSgG5Y3VwxgB+iCuZoDtP+Ysi7YP+hXAAartk6tFD3uYXnoa7dgwjNcb6dsPKRtaECylT4TRfhc8E= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615993409; 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=Khf4uu4m3sGzA1YESu49VBYhoIrICHcfWORP9DnyklE=; b=PEJWJjaxYD3FENcc0UfOETAWl/oB/AcQSlrSOr0sOk79HD8x9hXIDEC+8ZLezLgWozRP/wrAL5XNGxD4XFaarK8+kswAxC6KtAe3q0yyVQiDxNjcqKdFEMz8XovZxgVPkkkUXhAI3QPNDApr+uqPrDkAzoJqinS1LwmvIlLgqo0= 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 1615993409722364.72675943319064; Wed, 17 Mar 2021 08:03:29 -0700 (PDT) Received: from localhost ([::1]:46444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXho-0007xU-OZ for importer@patchew.org; Wed, 17 Mar 2021 11:03:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34908) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXIE-0005AY-0e; Wed, 17 Mar 2021 10:37:02 -0400 Received: from mail-db8eur05on2106.outbound.protection.outlook.com ([40.107.20.106]:39072 helo=EUR05-DB8-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 1lMXI5-0007Ew-MJ; Wed, 17 Mar 2021 10:37:01 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6216.eurprd08.prod.outlook.com (2603:10a6:20b:29c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:40 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:40 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QN4ag6TIGkmTaoaJNm/rLw8rE3s6mD9lu8/SdbsQVo1Gs6qz7c97dOo1EH9s+N9f5wx/wSXBB0/EKrVqOHQELdcsxK30aTQgdEA89oV6cKs8eKJ01smldTz3wEFB/OK7i2AsiA8wsru6NC4r/7EYVe4VZsa3JOC8CnMOLV0WQa5ikzLDOHBwb4+CKJroiaROJouwa9CLtUlkvvEUE4/LZnjAALSz+8k2j888HLE1VqheZtfdW1Edhvh3f4FZPuhmbOYAzPOxP0O6YNkqy3sANlXgewbLqXYeBnzqHu+S2zxzAeWLK42GDDltRX5WawbeSr/bK+5VAL6gU0PBctl3yQ== 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=Khf4uu4m3sGzA1YESu49VBYhoIrICHcfWORP9DnyklE=; b=ndPsrQIKbcR3oKBl/4AVYkItbiTwNRoWJ/0IIRQh4V30PIRy0INudwmUY5a3yDpGsTDtVskMLZPd79YH0oeo5Hts/C4Et3nxblC3O75XgXSJSoS7ECrwVFuFbTHZYFVXagCtZQgBZPwHhvTmv9sB0U68SbdX/G+wyp6r7M5VFQlmQHuVp5gQjk3XwpFF1UqgOeFga5f2XzsOxy0SlbD6AEUyAaqchzE7nt64jQQJSOWrz9iGeKvO2nSVHwORGscDZWzh40JtSJ/cFS2zT0MGM9LyT0oslULysibxSreaucJ0BUYzWyIap8lZ+iLnjtjD5lW4xRqfWuOkCuhLD7MhYg== 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=Khf4uu4m3sGzA1YESu49VBYhoIrICHcfWORP9DnyklE=; b=jLh1YizkCoSoOeh/ssL9+dCyr0/Zg7RBei06DpSKwcxT7LJOcajGyecwsbiccMi6pS8cagdz3ES353DYKgQIkjy2/cywHDe08m8k+Vl1JRH1DXcmJMPa0e/npyozsfXNJhN7f7vebFsQrbvQrgCZltSuSRV0ZQuuiQqYPKYIZWg= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 26/36] block: make bdrv_unset_inherits_from to be a transaction action Date: Wed, 17 Mar 2021 17:35:19 +0300 Message-Id: <20210317143529.615584-27-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: 2c456bd9-d97a-4197-a985-08d8e952140f X-MS-TrafficTypeDiagnostic: AS8PR08MB6216: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:49; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qxVLWjFATSzQpd+QOpBTYa9UpcRsb/kXyYizMVnX+qF41QjM0xhOmFJgJeBGtjjfuQ0rvMp3Ihwxd5hHHO606te6v2huUTsdpY/3PvNI+8TPWqph1sa1aGbIWxbDXmFlqEvT8BI8xVk1yYq/ol7xH5ZGG8Ba/Vt+l6JkenMncWY4erXGwfNxXGB5PJSh3eCQSyjJ0m89VjgGJ9K50IFJXDkntoawqLBs7HimgMq2f6aN8nYY0y4zMDUMQHzeDuJXCoFeiN3ZiMKupqwrufqClVr9Q1c3/22V2MgVvr3HOcMZ3giRuzXSiL/Zr2rrCbi6r6pctAp4CvH4fZ2ptJRuAgQjUQRXiSHnYZiuv18Yjg0OWOgYDx1mfpD+lTSfHoG1JIesHVyNeKc0EJw1YwL3uUfURDTr9tcFa3dXNXp1XcWJt0ua1ZLfuyoTeRkEf+S8W6jsY/89w0stZby6CoI7GzQysfw+YZQItzsovV2AQQgkQaPEfvZlrz+LFMtw/NDDZ6HUrZ5VptPKDpAGOkwV6JrFKf+Rl9h/qp45HcFZqskiFdDK8fTQDsZkMF38ihZUlUL1bS+5er7kFgMWdi2jBaVSlwznbrUNyabpVEAMujptgBqyzd1MjGjtZPvPy7PK 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)(366004)(346002)(376002)(39840400004)(136003)(6916009)(83380400001)(316002)(2616005)(66946007)(6512007)(66556008)(8676002)(956004)(26005)(1076003)(16526019)(6486002)(186003)(4326008)(36756003)(8936002)(2906002)(6666004)(5660300002)(478600001)(86362001)(66476007)(6506007)(52116002)(69590400012); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?X69UvH1Ti6f/XMlgxV6hDTyyx8NEU9U/9JE5yAyT16Y2uS/05vmJdqMzeZsg?= =?us-ascii?Q?Nkqc5tG7UYDe6mmS6h6fLvu4Fl3GMktRzvy/VcMmY2w94qN5nvT9wPNFm0+h?= =?us-ascii?Q?Sf5hbDN/JDBeWnc4/Jeb9qR4MchtIslzMcBZhq/DUxmt7ijS2Sgt74vTOOYg?= =?us-ascii?Q?72Bm4IkTbMF34HjZx59fxwa7MYjH4X0vq68VcjIReDFyoRiFK5xAyIOOlMqQ?= =?us-ascii?Q?0FDoS8iyKFDqvrG/EPbSWSiiHeCComHJQKyYDD34+qLjDBXlIpkD9P9fJKHe?= =?us-ascii?Q?bzLJNPnBe6qIKyC871YGl4uViSCpgPoIrVf8YS2H+qs3KgqGetH32duNr/xM?= =?us-ascii?Q?QT9zflH0GDqJBUPeOZg51e1dQUxI5CHrrFgtMDVDQmFzOL9YWf+PDhIlpef/?= =?us-ascii?Q?96ELBQ8mA/AybE3KmeltlQaYdOsz23OKyXCt+GD+2SQmiQmT9JSYOql1ryeP?= =?us-ascii?Q?kP9d6Xvco/31PENbyUwVX5/X/x1JCCIes6ioW1nS86H7FrG47oB04VUn/s6l?= =?us-ascii?Q?ArV2glTcp7fgOoPiESoiquVC0Eu0bNoqij7Q7AyWs7m3m4J82GW2Qze4IkCI?= =?us-ascii?Q?V6Tg/6HDC/oe1QnWPr8KpTkvEh71bfkntJpXRI9QYb3OnNVDwsMWq4+ZAk2N?= =?us-ascii?Q?f25rNqZMS2X6UptrDSY02TOzsQHn5/Xk6CW/rUye/LFC29SPV8DihHEEKnS6?= =?us-ascii?Q?P4lKLZdjDvuJ6GWHCI540Woxu8yGf5itwKc5cO3igC7jak0jymEh0CTY/Pin?= =?us-ascii?Q?LeP7ZXqkqiVk9hANp8kp0TS0h31i5J4Fiy5tUnVxcG4ROp9sGdGPPUN09saH?= =?us-ascii?Q?DfHPxAkBfUFCM/D2liNj0LwljRyCawOPypy3DPwTueSvRNMUqtMPhC9T9NGt?= =?us-ascii?Q?Lp8RXgNSUvFQPhoTHA3e3AmhQwDH3uCsSVEnh2pUpZH3+Iy5v9qdtb/Gfng+?= =?us-ascii?Q?exFoOwrTT7FFsqzNSXATEqGtH1gn2UVM2my5iaHzbOheK0us/d8R8F5PZ99G?= =?us-ascii?Q?w82unDSX89DYN5fhGytKcT+zaS1XfolP09V0/ya+NuK8JUhW39+MW4whkDZN?= =?us-ascii?Q?+WUivH4yxj3YAjEcGHPRGWv5yl2u0XPUvIrzXyX31DQOIWdFtrLCE2izrY9L?= =?us-ascii?Q?kkihALHULap6YefWKloxatC68BYhceLQA3eOWcf/CB1aCj7ro9FwzYHpFNie?= =?us-ascii?Q?E/RDWsvRfuDJIK2+P0orCiO0YNVrjlT0hTDZit6d3wpxs2LyIjY2O/S5gBuv?= =?us-ascii?Q?vJqm06JriNxXP5gGWCmRT4YnIC9fD+Y2cW69gmPG1bB6/M9KuQGYqtnXOeAv?= =?us-ascii?Q?OkUT9/4+Q8+e7d2JOauN/120?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2c456bd9-d97a-4197-a985-08d8e952140f X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:40.7828 (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: yaGKtw6PU7lNRHkXQZzGrN5X0/GvE2F69Mrkp6xpwrNTx/IC/MifnjPgRyi5MD6Q1xVvERTJZFny50iGi5h6O0XGK9nn0ezLGD1myviUKv4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6216 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.20.106; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" To be used in the further commit. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block.c | 46 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 922df82952..3b9681a738 100644 --- a/block.c +++ b/block.c @@ -3170,11 +3170,49 @@ void bdrv_root_unref_child(BdrvChild *child) bdrv_unref(child_bs); } =20 +typedef struct BdrvSetInheritsFrom { + BlockDriverState *bs; + BlockDriverState *old_inherits_from; +} BdrvSetInheritsFrom; + +static void bdrv_set_inherits_from_abort(void *opaque) +{ + BdrvSetInheritsFrom *s =3D opaque; + + s->bs->inherits_from =3D s->old_inherits_from; +} + +static TransactionActionDrv bdrv_set_inherits_from_drv =3D { + .abort =3D bdrv_set_inherits_from_abort, + .clean =3D g_free, +}; + +/* @tran is allowed to be NULL. In this case no rollback is possible */ +static void bdrv_set_inherits_from(BlockDriverState *bs, + BlockDriverState *new_inherits_from, + Transaction *tran) +{ + if (tran) { + BdrvSetInheritsFrom *s =3D g_new(BdrvSetInheritsFrom, 1); + + *s =3D (BdrvSetInheritsFrom) { + .bs =3D bs, + .old_inherits_from =3D bs->inherits_from, + }; + + tran_add(tran, &bdrv_set_inherits_from_drv, s); + } + + bs->inherits_from =3D new_inherits_from; +} + /** * Clear all inherits_from pointers from children and grandchildren of * @root that point to @root, where necessary. + * @tran is allowed to be NULL. In this case no rollback is possible */ -static void bdrv_unset_inherits_from(BlockDriverState *root, BdrvChild *ch= ild) +static void bdrv_unset_inherits_from(BlockDriverState *root, BdrvChild *ch= ild, + Transaction *tran) { BdrvChild *c; =20 @@ -3189,12 +3227,12 @@ static void bdrv_unset_inherits_from(BlockDriverSta= te *root, BdrvChild *child) } } if (c =3D=3D NULL) { - child->bs->inherits_from =3D NULL; + bdrv_set_inherits_from(child->bs, NULL, tran); } } =20 QLIST_FOREACH(c, &child->bs->children, next) { - bdrv_unset_inherits_from(root, c); + bdrv_unset_inherits_from(root, c, tran); } } =20 @@ -3205,7 +3243,7 @@ void bdrv_unref_child(BlockDriverState *parent, BdrvC= hild *child) return; } =20 - bdrv_unset_inherits_from(parent, child); + bdrv_unset_inherits_from(parent, child, NULL); bdrv_root_unref_child(child); } =20 --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615993101; cv=pass; d=zohomail.com; s=zohoarc; b=c8SPCFQKv8JUxIe5SJMJLL8uQ7IKlaSyO+rqk3LEbOPrgHxUL5rjF9jfDbV2NnujaVBniCL/XYkHJqytFXBE9kBAOluWsV2yk4OoopfYZs7FsfIo8wvnJQkN1muQtmHSI/XdtgYlzG7hZ25xbIqpb8dBY2cXothCSyMY663ZKQM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615993101; 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=m3MXzNqxeJCyhZrks/haO4bm+EYiBFvcPQM/a6hLQ30=; b=fYy4aa2NEsk7PeNC5FSMTxyvAeJFTh6BLRLM/EjUT85bJpL+PK1hbkJrV4QYHB7YaTQEAEdZkLvz+55Ho9XUtfiCWN2EF7GewNt8bJ4z1GpppP0vPBJY+HzyimIGRj3l9k1EIQPRufTB7oXGZoQHreExaM6z7DCf4j6RR1PEnBI= 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 1615993101488181.21193239209708; Wed, 17 Mar 2021 07:58:21 -0700 (PDT) Received: from localhost ([::1]:36744 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXcq-0003io-BR for importer@patchew.org; Wed, 17 Mar 2021 10:58:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXI7-00051B-Ky; Wed, 17 Mar 2021 10:36:55 -0400 Received: from mail-db8eur05on2128.outbound.protection.outlook.com ([40.107.20.128]:5633 helo=EUR05-DB8-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 1lMXI4-00079x-G2; Wed, 17 Mar 2021 10:36:55 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6216.eurprd08.prod.outlook.com (2603:10a6:20b:29c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:42 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:42 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aoUtafF9wBMqGoCNcNnTcZ0/qzVIdlz04v3L0Pnprbzf6qUgJApVNm0lzO10sjNC7Xa03A2TCU1XzpeHNnRmA2+jXjB6Z1VTzVrPA0PRPe7Qm6Q67L1nuSlsG8ev7Il63gem2J0Wycah4r+YSPUghbLN3bRzAuXGOoc01Z6zK86h40aZNC0V54nuFE86mg/NDllzI52bNWVrmiYCrZ3Zbtsd2sWqGWy3gU/e/DFjVxVEioUBvc4CDBV4y1x1bQlN4cFOnp0vCXl8VVi2IsX9V9+epfT9grzHSNv/bRcnWsuhO1EUai7ImfrXDtpPmo/R+fZvghwuVK51k0htvwi3gA== 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=m3MXzNqxeJCyhZrks/haO4bm+EYiBFvcPQM/a6hLQ30=; b=oARym8Iugi9JrqiQsr9M/ZpjkOUJ8gmIZ66gUpmY4fnFQgeEVAXEjXX0cMlnC4m1+G0Zk4a1spN/aKDole7IjhdPTomvIdRfQJb5w+DA1rP/wbpkQkQJNXciZbO4laUAVX/e15HtHyvKuaCNDUsHtYS9/y57rDsE+S3XeYSZ+qpwo4IgEBN2DPdwTSJiIGRIBGMFwz4T1H2sD7aqkbgANJ/wa/bU0n7bv8NGfsurP+/Ip0KkmU76OBVgrfuqJBRl46HGQubsxa93hH3gaM5+R6viRxzYRg1t9B2j8DYaN6QYME1d+rEr0Lo6uyiLb4WiZh6d9WfaAz4P/172JFjI5A== 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=m3MXzNqxeJCyhZrks/haO4bm+EYiBFvcPQM/a6hLQ30=; b=kmqAHTscgyAWoJL954B9K0JnYcka8p3upO9GxdpBatAesUM7Pq/T/96NcHeoVS8roy+wUKQ5YjUTmyyDO+EMRK8s2MQUfx2fW8orsUkQfR7pd7bjGi/cvR0MtLydBoLdPzPn+/9/d99mOd1ecwdseaRL1OVIPpjhSMUQd7PNntw= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 27/36] block: make bdrv_refresh_limits() to be a transaction action Date: Wed, 17 Mar 2021 17:35:20 +0300 Message-Id: <20210317143529.615584-28-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: c9df5a96-9a71-4817-0c2a-08d8e95214e4 X-MS-TrafficTypeDiagnostic: AS8PR08MB6216: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pVFbqQNSqdr07ISsczpbrLgZPWnZKjB/EgGREsHaiP/VRShKIpJWjwh37kZEcKZYX/UTygPU3Q0D9uTDPLTXP4M+46WuuuePdXcaRdm/fte9yFyBm4vIsibaS5lX35ve/Uy6T3l/JMRU9iZnBYYsXayI0BWPFwRuqUxouRVVE0LpgCWZNK9bvcee2zbKyz8oEgK8hNoiwDDQ3z5Y43NZdEtP4FQznvW6Uq1OFPe81kzPhf83u6ysSLgoIO6iVUprmFL89sdbNlDayIWZMtekt8UVTxmFtKQGyfrN7U8CAs3MPnAmyOY0SjE9Rfi7h7B0zQgIb/cD7wWyDF9ZwiXGKGZL/+cCzhcC0GgNtv0bRcdywfBVdo9raDUD64L2PwiNcELMGczFQ1p8Ne1OKgB8LkSfZfWY3RGtDH9np4wWfYGeCeN4HFhBHhMmXREac8224ogTbUDKqWWA7Uq/hqM75F6Y3fA7BcM53oicu7ccJsRj5jxJebG0mqgN5RpZSLaDMXZz9aevQ2PNZLpYWi2JlRKupODVvuobVFYK7SJ4wYd143fqv5zwtQIRrGUInsqqLXbtDRBeCoBEZw8KJ8iHLxiqgsQd7ZDG+v/SWcxoc8TSBxyu8fAadZ6tz8CE23z1 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)(366004)(346002)(376002)(39840400004)(136003)(6916009)(83380400001)(316002)(2616005)(66946007)(6512007)(66556008)(8676002)(956004)(26005)(1076003)(16526019)(6486002)(186003)(4326008)(36756003)(8936002)(2906002)(6666004)(5660300002)(478600001)(86362001)(66476007)(6506007)(52116002)(69590400012); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?7kakRSDuuUlmeNHlB0xYSTGH/VtS3oF+ZVUIV9+NP3pb1u18ulII2ajPKpuF?= =?us-ascii?Q?yt5CVoYjnBOn4VrJGXdh2CZIDmY7ZHanHqGIbIZRHmE8pB1zHl7qi6/a863K?= =?us-ascii?Q?wQ2BftDoZVxwmqUGykpZyJkl3ly93Q3lK2B3rQdZke1bNIboPf+70MZGQ6YL?= =?us-ascii?Q?UFVxZ7zgSHNpqu826KZ+TJtN5SQpBhfoF2hezFX65mYG2wC04FxQZ9Bd4/FA?= =?us-ascii?Q?E5/BqEu3KDXEKr17eSxGrm6q5D8tfvzapVxWPYmZSTrvWUv6ee+coeLeB58m?= =?us-ascii?Q?KgwfbfwEerZF1dXZfB8+2GqFep2IrTuCDoZt+0HwgAWlyziz2nAYOP5MPqAY?= =?us-ascii?Q?W8N1c+HrIRIRH2BmEvgTZ+DweYK4eglfZJ//WV0L111Krl0wOCMfEl9QmJBm?= =?us-ascii?Q?lM3e6u6TNVc89Q7x1+DN3gPzTouAGwX9pePMFe0UmjrC/R2isHPV4/ZEmzG9?= =?us-ascii?Q?i2x2LDHa0eGbZksnxRAavfh5e+tW1H43xkoDjCBRYM5K5TdUA6e6WlTsqDti?= =?us-ascii?Q?i1D6sLXgZ8ZdJzwnqXPwwmIPK44vrn+NVoJ+/Useib1/iHdYkuNzh1KNjpoy?= =?us-ascii?Q?WU2zDwGlrUmS+jZNG6s53CzVvWCBEtTbAEQ3pvnrZjqTw3BUFsVxxxXqlg7M?= =?us-ascii?Q?jBOD+f1ahdHmrKBvNqP9V5SP8KDrHk+in8+mshCgRGyF5KgGLNWFhOoRYJj+?= =?us-ascii?Q?RUBo3I6V3kejegnCbmNq2F8esEV6e1nk+RMyvXfFI/xUtg8gikPXylxcQKHU?= =?us-ascii?Q?iQZG6ex7hjK+RuVbPWsbWn0K+pONYnbaS39rCPIujC9iJi1mrJ5Rj5mJ8bEu?= =?us-ascii?Q?x2o1F9oBbsUUNCBjFT9zz6tgJjsgX471YR7Sgb6LVQE6H74qtMWi+SOW7o+1?= =?us-ascii?Q?byJoFiSWDzLKuCQRtq6VO/DN3G/L3rbDBQGxZLdcxMWawBnJ0wREGqTDI4Ey?= =?us-ascii?Q?9UfWwFEKBxpZbGyCeO4fz2tktJ3YCzUxAENz1rW4CkOTvkJCjhRUprZrP1Rv?= =?us-ascii?Q?bwimizRZYgTKCFbVlUEuvVCo4PpHSOFtesQo+S0u09bph+l8Ts7rzGKh3vSX?= =?us-ascii?Q?F64Qu0JMZxLSL4FtCOPPjKdn30sWVQ88LrsdbpEVvizZ/MiJJw6VQr/U8P1k?= =?us-ascii?Q?/KGks2qXZARkspF8FLuE7woomPqkXhSxZ0fyF931HXzwGJUJxn7DMmVt/jge?= =?us-ascii?Q?26ubHVc9lC79OMOe5J1wDOF7Iv2bLaxg1ir/7fQolU/iM+8R4w7g5Qbmi7sr?= =?us-ascii?Q?dc03h0AiZTOJrRyiNAWhJDbch6kY9Kfml4f/AZM0Adaw+Uv2NFxXAr5eb6Oh?= =?us-ascii?Q?CX7LmRKlu6nDRFdJbRgyJdei?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: c9df5a96-9a71-4817-0c2a-08d8e95214e4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:42.1558 (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: pJm0/qURiUrBf8+Itpz73oyeeElLTwapm2x+W9TIEngZY24OQIyJxX1AfIIMVHXObFQNNoxJHBlXjrFUDNAtSUgybEY7P7utDQuxX4bgktE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6216 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.20.128; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-obe.outbound.protection.outlook.com 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" To be used in further commit. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- include/block/block.h | 3 ++- block.c | 9 ++++----- block/io.c | 31 +++++++++++++++++++++++++++++-- 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/include/block/block.h b/include/block/block.h index 85481a05c6..ad38259c91 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -9,6 +9,7 @@ #include "block/dirty-bitmap.h" #include "block/blockjob.h" #include "qemu/hbitmap.h" +#include "qemu/transactions.h" =20 /* * generated_co_wrapper @@ -421,7 +422,7 @@ int64_t bdrv_get_allocated_file_size(BlockDriverState *= bs); BlockMeasureInfo *bdrv_measure(BlockDriver *drv, QemuOpts *opts, BlockDriverState *in_bs, Error **errp); void bdrv_get_geometry(BlockDriverState *bs, uint64_t *nb_sectors_ptr); -void bdrv_refresh_limits(BlockDriverState *bs, Error **errp); +void bdrv_refresh_limits(BlockDriverState *bs, Transaction *tran, Error **= errp); int bdrv_commit(BlockDriverState *bs); int bdrv_make_empty(BdrvChild *c, Error **errp); int bdrv_change_backing_file(BlockDriverState *bs, const char *backing_fil= e, diff --git a/block.c b/block.c index 3b9681a738..03a1f02e5b 100644 --- a/block.c +++ b/block.c @@ -49,7 +49,6 @@ #include "qemu/timer.h" #include "qemu/cutils.h" #include "qemu/id.h" -#include "qemu/transactions.h" #include "block/coroutines.h" =20 #ifdef CONFIG_BSD @@ -1543,7 +1542,7 @@ static int bdrv_open_driver(BlockDriverState *bs, Blo= ckDriver *drv, return ret; } =20 - bdrv_refresh_limits(bs, &local_err); + bdrv_refresh_limits(bs, NULL, &local_err); if (local_err) { error_propagate(errp, local_err); return -EINVAL; @@ -3328,7 +3327,7 @@ int bdrv_set_backing_hd(BlockDriverState *bs, BlockDr= iverState *backing_hd, } =20 out: - bdrv_refresh_limits(bs, NULL); + bdrv_refresh_limits(bs, NULL, NULL); =20 return ret; } @@ -4812,7 +4811,7 @@ static void bdrv_reopen_commit(BDRVReopenState *reope= n_state) bdrv_set_backing_hd(bs, reopen_state->new_backing_bs, &error_abort= ); } =20 - bdrv_refresh_limits(bs, NULL); + bdrv_refresh_limits(bs, NULL, NULL); } =20 /* @@ -5203,7 +5202,7 @@ int bdrv_append(BlockDriverState *bs_new, BlockDriver= State *bs_top, out: tran_finalize(tran, ret); =20 - bdrv_refresh_limits(bs_top, NULL); + bdrv_refresh_limits(bs_top, NULL, NULL); =20 return ret; } diff --git a/block/io.c b/block/io.c index ca2dca3007..35b6c56efc 100644 --- a/block/io.c +++ b/block/io.c @@ -133,13 +133,40 @@ static void bdrv_merge_limits(BlockLimits *dst, const= BlockLimits *src) dst->max_iov =3D MIN_NON_ZERO(dst->max_iov, src->max_iov); } =20 -void bdrv_refresh_limits(BlockDriverState *bs, Error **errp) +typedef struct BdrvRefreshLimitsState { + BlockDriverState *bs; + BlockLimits old_bl; +} BdrvRefreshLimitsState; + +static void bdrv_refresh_limits_abort(void *opaque) +{ + BdrvRefreshLimitsState *s =3D opaque; + + s->bs->bl =3D s->old_bl; +} + +static TransactionActionDrv bdrv_refresh_limits_drv =3D { + .abort =3D bdrv_refresh_limits_abort, + .clean =3D g_free, +}; + +/* @tran is allowed to be NULL, in this case no rollback is possible. */ +void bdrv_refresh_limits(BlockDriverState *bs, Transaction *tran, Error **= errp) { ERRP_GUARD(); BlockDriver *drv =3D bs->drv; BdrvChild *c; bool have_limits; =20 + if (tran) { + BdrvRefreshLimitsState *s =3D g_new(BdrvRefreshLimitsState, 1); + *s =3D (BdrvRefreshLimitsState) { + .bs =3D bs, + .old_bl =3D bs->bl, + }; + tran_add(tran, &bdrv_refresh_limits_drv, s); + } + memset(&bs->bl, 0, sizeof(bs->bl)); =20 if (!drv) { @@ -156,7 +183,7 @@ void bdrv_refresh_limits(BlockDriverState *bs, Error **= errp) QLIST_FOREACH(c, &bs->children, next) { if (c->role & (BDRV_CHILD_DATA | BDRV_CHILD_FILTERED | BDRV_CHILD_= COW)) { - bdrv_refresh_limits(c->bs, errp); + bdrv_refresh_limits(c->bs, tran, errp); if (*errp) { return; } --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615993431; cv=pass; d=zohomail.com; s=zohoarc; b=Zjegi/Zfo3ccgYrBfStXKDGKEvB4VABYNbn/SMqzhRiVte/7UbRs1XKJgURdpZ/VzJATcqg4iv3ACcfQ2cSjEXvxC/L0wlXTpSP5KcGuybiMhicrD1UGsA5WDXK9vE0Bu19fAxWDwfFbAfqwrsFa72qX1zuAPU3Oo1Vi0m39/7U= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615993431; 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=T04kETF1eMBgpZvBqkFGLzLSnvs2s80XJIwqI4hwbd8=; b=M10677bJjDqbnuRSUHwXLdg5lO05bC8GxaRIKrntAkiqCA5Tl1+yUd8P+YjXZ/cb7kU8lj5lUCUAnPaWU+dnVRtsKoeuoFsEXIQirRi8beUdLEx6OPeusv8xW+W/FD5qarvlJf3ABgZMrvS4O1zIgA3qxDcQGBBuQc1l5veGZaE= 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 1615993431942254.08634367141565; Wed, 17 Mar 2021 08:03:51 -0700 (PDT) Received: from localhost ([::1]:48444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXiB-0000Re-3f for importer@patchew.org; Wed, 17 Mar 2021 11:03:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXIF-0005D6-0l; Wed, 17 Mar 2021 10:37:03 -0400 Received: from mail-db8eur05on2128.outbound.protection.outlook.com ([40.107.20.128]:5633 helo=EUR05-DB8-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 1lMXI8-00079x-9p; Wed, 17 Mar 2021 10:37:02 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6216.eurprd08.prod.outlook.com (2603:10a6:20b:29c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:43 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:43 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mT4n1ihmCpG+pXSEFxIL+VQKmf/OjNGzmM6/Jg6khgOndidJDhEVwKBqpHC1hE9HPwIoe7zt9umEGLqiN8/upa86x46UmPte5r6+vHE7V/ujcZ+hTtq9bUaEjG9iJgEAnMcNmj/Do4Kynlw4ehy9hwjjo56wQw0sCexC4Krryw0ZaEjozojlOjdqmnUtzf33cDtUKUfPEP8i9xA3TM4SI4whYNhaUQxbRGnBOp/vsLuTbdWADEHLPQNqb4R++hvUqcX3k1Cq5+fOexzjuOd1G4Gb5epgItUsksQqJ8m5s80U2oNin7NN1/5rPdUTdRHcuXldsQuatYYgLx7aiwsi5w== 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=T04kETF1eMBgpZvBqkFGLzLSnvs2s80XJIwqI4hwbd8=; b=N7EK14T2DV44rjy+v61oEY4XrYItBLS5IG83T/uMFfF16bXXudRWhR5Ue6Lc5HYu5GmTG6bk6PElz3Csik9JQiCaABnBSRj8hG2XOKh2A0fZGTDt8QdiQK2tAtoek8Aw7UCxVjVx5NpACprj+LlSIhIDCDv4hmV0Xepmnq+Zd/gyR9XbiUKICW7WppseqPq/kJMA113WjWGBOpsFfQXmzMgK234DALGtYrX/52pQBBSaIjvLw82g3vhOXeCzZd1ybg88Jh5mgU/24ITYmmUULFf5tz/zoCrMk+vEzVmbs6yY3dHHcAVnagD0aZf5kwxWMEAy6dHBajxlOGUGWWmunQ== 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=T04kETF1eMBgpZvBqkFGLzLSnvs2s80XJIwqI4hwbd8=; b=HW6rbWFMBrfP92gbRj8nn64kujcdteKVYlBv6CmM+rCM3+qabeel8IbaSNljoc3UF2UNJ3+44496ql0x4vIC/x/Zul62mYZV/5kPRnZKaHj5hv/UEu4M7DwTj0GfOiuAK3Xzh1uUCX7nntys/1djycrcs5HgOCd6eIYQJhIyaT0= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 28/36] block: add bdrv_set_backing_noperm() transaction action Date: Wed, 17 Mar 2021 17:35:21 +0300 Message-Id: <20210317143529.615584-29-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: c52f32e7-c7aa-4183-51d1-08d8e95215bb X-MS-TrafficTypeDiagnostic: AS8PR08MB6216: 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: 5iITGyIg71U9ao+N8WFr/7lF5sulF/rIh7phmeQ8TBtmSlsaryo02Sor6gtpm9iHAy/F1j+nB7rJ9VhAWJsMsUIOltUFT+vYz0P/4T6Mit1cptUvKDgu96k1W2+9RRXNhT/7Q0mAvaWMemnXJu2e03ZwznpU1/bFEVnELjlyEfZNRpA9gYvq2vM6pR8bZDrKKCh4RCpnyV1XL52RMjZoRbWZSOttN7O3g4988jYEnCkfNV9OBcy6/EwydGsWkUynlwChFWFEPLcUHIFsTDHA9uoAdFbnLqFRnM5ciy0e0CiYM5wdA5/Z5WfHg7LaaRbxyNBKdzgl6PZ4oh+lTkaax7cMpatvunOvfMOAsyzq40v9z0V/uusJ/zAh7OflwDfkv6lwAsZTgl1knDPjotTaaSArfT7WolMz08OIgKiq9IUWBD8KIiGy0vLtBO7cqiZUv889PWj4B6Vpg5d+micc3wpRA/ISnqvBrEWipj07/73wiFsC0a8bKxiclEdqiwERWLt/gWL6RoEWqieEYdWdb0peGbHRmYOqDC8/7JFvfAyGMznfaaIg+SmL0NcMI6nXTKsZjRpA4gE0wHp27BpjDhlGtrQ7ODAm+rGwLP5H8p0= 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)(366004)(346002)(376002)(39840400004)(136003)(6916009)(83380400001)(316002)(2616005)(66946007)(6512007)(66556008)(8676002)(956004)(26005)(1076003)(16526019)(6486002)(186003)(4326008)(36756003)(8936002)(2906002)(6666004)(5660300002)(478600001)(86362001)(66476007)(6506007)(52116002)(69590400012); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?5hor9ddYVNQdMylB6R3wobCbIMmIvBKyasQ6s0eu1CBhFQC9xKBhL2HC1V2S?= =?us-ascii?Q?JhPtxJImmmYiI6AxHCdq6K0hQB7I2X8SMxun0qgW40kuBciD+PtJN8LoriLQ?= =?us-ascii?Q?9e14tcBodX5szQmFmq4L4ypECI5ls93bSJTsBPp5YAxxy9qaAgFE7Q9rsylt?= =?us-ascii?Q?ENkHl2w84XerHz01B5CdHu62Wga/mBRdmTvp5CejNsGmhwn3l0D/n/ckAG9g?= =?us-ascii?Q?dyCpPhABkACbhD8MXtDutAe71pOZeMLu7xHzP2MnzVT9sqlBaGSWdFOOxX0C?= =?us-ascii?Q?B7xZ5dnrZuC5MSvF8LZ2jU82RGPjpYDjG840TpRdPg/xvEhCGTriV3Evq3uG?= =?us-ascii?Q?5CLoBJTsXWGpXb7+k128pbmQQOya52gYXPZyaSv45fm/MkcjYmrH3Qb3TnLZ?= =?us-ascii?Q?v+xX1osxE/TDj7mbDJgFlBeIlw4/aHutXNMtfNpJyvuU1j5uoiEmHPNNdzHx?= =?us-ascii?Q?RsPI3ZB8bn9ljG7GlO2+H9WsUH0wmtv32yszgB3q1TK/rRfi8m8SjrFYggA7?= =?us-ascii?Q?xMYQqFzLWfF9k+j8AG0kmczkJx1qxJoD4qXLem2Dsxr2RPWO82blMKDZO6HO?= =?us-ascii?Q?ar5W1fEFl+rwpjxuyt5IXnk1000ck3AILaQ5YUfuRbx8k6LlMtdB5Qfks7cs?= =?us-ascii?Q?4+Ft936Yrllf+B/QV7iNA6lERjkA59FLXHxF+3i4DzSMjoKBPV+GyTmFEVFm?= =?us-ascii?Q?DM1g70VB1mqEwTrDv9V+fSgOI0VapkpToE8esRo4EoWeVyHXPDIGBBFZnIuB?= =?us-ascii?Q?BbMT1+/R6pUqpG9vNHCWrkF+B+LFafM3IkUt7MQOg326z/3PDUHUMlCFWudZ?= =?us-ascii?Q?SmL+WWbD/mtf3Npn3MlKgWTl37wtxAwoU3puZDxuYjxJPxZDLr4mlpjwOY4w?= =?us-ascii?Q?vbe0tAzfo5wrH8xlP27WzPEjNvdLXwW3yAHkkGf3E5dBQd6PBYGyFUnVFgtu?= =?us-ascii?Q?Vi06dsIuYbb7wyPtD7Dv7tSdYDkN53R0Zlsm0escuWFniWpHMusLfubyPskZ?= =?us-ascii?Q?qr0hayVxzMtef+uFCORJLc3si4aj9jF3J+im9C6sUq/+pPc3hU1ZVjiu0zRo?= =?us-ascii?Q?rT8T150e7B5QUYxDvcFihC8xfERlR0jtNhySxMxjX4/ZPC/GUvHpIItzOpGq?= =?us-ascii?Q?3Z3APQ7UgDk5lsylbJuSxhrQ4AQfJJb53p6KqGrJsse4MdaJyW1jZ+njEWEK?= =?us-ascii?Q?E9PivU0bnWr/isaRxIRDCtk+fWHkeZ+ZvEYafC57Tt2WzaUqK9qbtKvXgCj0?= =?us-ascii?Q?TxOTN9JLvPKXbfYeD1Di4L/jRVBEMtql6wZfLzmi+BXYFtPs4zQI2hCW0CgW?= =?us-ascii?Q?JlREin/41g5UzuFuEW/QWlGO?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: c52f32e7-c7aa-4183-51d1-08d8e95215bb X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:43.5875 (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: kF7FO0z/JOK4BKGVfXu9m6bG1obX0NYfrpCnuzQ71mR7YJarBm6QJxTT4dGyUO68VDk04C8TQamxHfso9qz6qlnex0gGKko3Oc0Pq6OL5VM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6216 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.20.128; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-obe.outbound.protection.outlook.com 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" Split out no-perm part of bdrv_set_backing_hd() as a separate transaction action. Note the in case of existing BdrvChild we reuse it, not recreate, just to do less actions. We don't need to create extra reference to backing_hd as we don't lose it in bdrv_attach_child(). Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block.c | 54 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/block.c b/block.c index 03a1f02e5b..b58c8d3e10 100644 --- a/block.c +++ b/block.c @@ -92,6 +92,8 @@ static int bdrv_attach_child_noperm(BlockDriverState *par= ent_bs, BdrvChild **child, Transaction *tran, Error **errp); +static void bdrv_remove_filter_or_cow_child(BlockDriverState *bs, + Transaction *tran); =20 static int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQ= ueue *queue, Error **errp); @@ -3287,8 +3289,9 @@ static BdrvChildRole bdrv_backing_role(BlockDriverSta= te *bs) * Sets the bs->backing link of a BDS. A new reference is created; callers * which don't need their own reference any more must call bdrv_unref(). */ -int bdrv_set_backing_hd(BlockDriverState *bs, BlockDriverState *backing_hd, - Error **errp) +static int bdrv_set_backing_noperm(BlockDriverState *bs, + BlockDriverState *backing_hd, + Transaction *tran, Error **errp) { int ret =3D 0; bool update_inherits_from =3D bdrv_chain_contains(bs, backing_hd) && @@ -3298,36 +3301,53 @@ int bdrv_set_backing_hd(BlockDriverState *bs, Block= DriverState *backing_hd, return -EPERM; } =20 - if (backing_hd) { - bdrv_ref(backing_hd); - } - if (bs->backing) { /* Cannot be frozen, we checked that above */ - bdrv_unref_child(bs, bs->backing); - bs->backing =3D NULL; + bdrv_unset_inherits_from(bs, bs->backing, tran); + bdrv_remove_filter_or_cow_child(bs, tran); } =20 if (!backing_hd) { goto out; } =20 - bs->backing =3D bdrv_attach_child(bs, backing_hd, "backing", &child_of= _bds, - bdrv_backing_role(bs), errp); - if (!bs->backing) { - ret =3D -EPERM; - goto out; + ret =3D bdrv_attach_child_noperm(bs, backing_hd, "backing", + &child_of_bds, bdrv_backing_role(bs), + &bs->backing, tran, errp); + if (ret < 0) { + return ret; } =20 - /* If backing_hd was already part of bs's backing chain, and + + /* + * If backing_hd was already part of bs's backing chain, and * inherits_from pointed recursively to bs then let's update it to - * point directly to bs (else it will become NULL). */ + * point directly to bs (else it will become NULL). + */ if (update_inherits_from) { - backing_hd->inherits_from =3D bs; + bdrv_set_inherits_from(backing_hd, bs, tran); } =20 out: - bdrv_refresh_limits(bs, NULL, NULL); + bdrv_refresh_limits(bs, tran, NULL); + + return 0; +} + +int bdrv_set_backing_hd(BlockDriverState *bs, BlockDriverState *backing_hd, + Error **errp) +{ + int ret; + Transaction *tran =3D tran_new(); + + ret =3D bdrv_set_backing_noperm(bs, backing_hd, tran, errp); + if (ret < 0) { + goto out; + } + + ret =3D bdrv_refresh_perms(bs, errp); +out: + tran_finalize(tran, ret); =20 return ret; } --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615993784; cv=pass; d=zohomail.com; s=zohoarc; b=PVGobWMpE1nowzUb7MSSWfqIQyyH78XL/u8lCkYnvLS6DfzKpJLrZ9js7wMpRO4mTZXUgoqhOWVVxQolglDFjuXl3UN6pjbiR+CVouHzsG0Xt+gNVs+RcpRKOiu1yKvbKvLE5UtkIluO+Z64Vz3OW940BhgJKJBogKe4+vKk44c= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615993784; 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=OIe9Xr+z696ADIyXME/Vjp0kA7jxWxzAJGy5IvgK+v4=; b=PnFu3HJf8D4aYLd/OypFYGguIUjfnzMyOQMPg/2s6MqmxLisH0iHJKEPbYKdogbIg6JqFnP5SP7MO7YafXHx/Lvtjw90jRkEU26XhWA2lbHxMD2gtcvoqrFRU8kAENE8bUdPnOeYH/eJwHG4rrb9QMZYmu1OoeDLI8yw/Osx7zc= 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 1615993784324920.0512614229718; Wed, 17 Mar 2021 08:09:44 -0700 (PDT) Received: from localhost ([::1]:34406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXnq-00076A-8C for importer@patchew.org; Wed, 17 Mar 2021 11:09:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXIG-0005H7-KD; Wed, 17 Mar 2021 10:37:04 -0400 Received: from mail-db8eur05on2106.outbound.protection.outlook.com ([40.107.20.106]:39072 helo=EUR05-DB8-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 1lMXIE-0007Ew-PX; Wed, 17 Mar 2021 10:37:04 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6216.eurprd08.prod.outlook.com (2603:10a6:20b:29c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:45 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:45 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:43 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YN+bBc1zDPpov2l2EnllMkqgy2siOgsx7KbR02/4w6Qaca49+brnxT1Pz7E6P7Eq5uMHdisUCIeTqjHTOd1lXm0bbvITK1M5M2+cesAZFuYI4qZpuTTfR3p6kNnS58CbKvCGhrgJNigOaqYo8X6+Q9o2RYRyOzqjgCdI6Pie8A1zkvuuDrRUEoeU6uN7rdTf1QRofN1hdxBIy3nsTxxkZ3k5wd3e92/g2EQEIKL5jN95SWG+pRSZfMOfXesk5awccAiEnbEyQzkEcsAjsXPoMseB6dseDYRdu/P+ueafno2db2th+rNggYRpQJk0ZKV1wmGxDOFWaYTguWDWKnLXiQ== 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=OIe9Xr+z696ADIyXME/Vjp0kA7jxWxzAJGy5IvgK+v4=; b=FMMOPfONfYcXMwB3D4ve3vWETWJW6eO9bP5GDo/ay+RQ2X7WQKlWisngJ3Z3WdGwP56xWisU4RdKjZyyw4Ne7bmdrY1qFqCjaOAWUvRXnNtasTityT7mQnl0f3z8e5ihgUYOFEP96S0JfcRVDrND4tzFgM4sR7IG4j8DylCxm4c43sfUumNBz/N/zh3yHEPj+5/T0QggWcwbPGlnK0+o+3jl17os9aAki/8ImLlVveBn+GUvqL81NYnf80N597aOu+fALID4JduNOhJeNYPdIf//DzgkEx8sYq/0NDsDm46sCcM/c6ePqzlsF5BKbvyZeJr72nDpwI+5Oo2/WV+Stw== 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=OIe9Xr+z696ADIyXME/Vjp0kA7jxWxzAJGy5IvgK+v4=; b=cx50mAzcibyIv6q93WQ1ZDAVllgGz4xq7ljeOXId5YyvI/+7Ew8HC8qeIbIt3xIE3niu7LaEKFu0mLUe3+DKU8Wh2m0D+XPA4KGWd9CgZr86i2wCNhLsENhuHa/dYfYtw4uZOfjnZ43ZmSn0OugVvWspsHyRmxQFSe5VPPjVTsw= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 29/36] block: bdrv_reopen_multiple(): move bdrv_flush to separate pre-prepare Date: Wed, 17 Mar 2021 17:35:22 +0300 Message-Id: <20210317143529.615584-30-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: e6af7607-4bd1-4c2c-2c26-08d8e9521689 X-MS-TrafficTypeDiagnostic: AS8PR08MB6216: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4Kt6UNPBnEJqHQ9xGJENYcelNFls+JLNPcPLn26goxy8fwo5kg7M8fCHx5oidmAvONy+8XXDI5FOyNZ8C7QrpP2lD1c3PWt3pfFFOs7GD4dPfeyrlrRuKLlz18eIrvkz4Kx7Itg+gr0SNfLv0Um4uEhgN29t1K/Ei5q8GhsTEY1VerrslrHx6uHQC9hwqZy9O+6upikTGXyc28V7r2dKlOZ1abNskse75n8atahOO4x/VNXwY3swRX16yFMvbOGnPtQ2wMURuLGznpC9YAIl873l7ZCIhxHQFz6XktwmAOa7B4Qz4aBuA0L1mGv6qatRuwUyySXWgzl6E2dHY9GfkI3+AUWHx0AfARQV3NCX+D/uWnS3/fVqBbS+TBwx9E/pwxH5uhNj08nofxLJoYswB1llhRRgeyYpAHVomSplgQ1OgvrvdqfHFXu9/adtGxsa8GnADsk4WiG01unVTuNbqiqmMTgr0yaI7AhYODatEOSM7+5wPfQUPastgN4rrgJK0IQSDOKeVk7soI7XYvfBRdQTlu2XbKxvE7+/HWN5Zwh9dY4fpkuoWP6EPk/8w1nwsU7r6zaAwtctZ7hEdntYMcQ2Dg0jO0Z0kuiULxXySwqQEdfSpMjAany/yzCAlCWs 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)(366004)(346002)(376002)(39840400004)(136003)(6916009)(83380400001)(316002)(2616005)(66946007)(6512007)(66556008)(8676002)(956004)(26005)(1076003)(16526019)(6486002)(186003)(4326008)(36756003)(8936002)(2906002)(6666004)(5660300002)(478600001)(86362001)(66476007)(6506007)(52116002)(69590400012); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?wEq1nkNasH+2V2rIRq0RR/zDHATjrp92zeTmA7Ax6uV5JaM9s02aBWOMYfFM?= =?us-ascii?Q?Fl1oXhUaqBDd3uG7F6ldm7biGHm+5MO5sDPb4hYWpdx2Dk/kJCr7fdLYTVp+?= =?us-ascii?Q?i0111ue5WoxP97nq/0rVaz3eFPNh46tpniEKmD3e+o1ci/VDB+LgXxguaICy?= =?us-ascii?Q?7UJvU3N8m7PRv1xu+DNcoHSepOFEKIFYGl2UCZzwfZalOieJsB3dGyC/6qbx?= =?us-ascii?Q?hw0xYfg1TQvnDIiXKU1+Hr9iqSWFkfm4aVdmB++lZz6JIqO/Bilkpq9qU5YI?= =?us-ascii?Q?MMCxO9bfjiV+dM2kF14p0GvKSDa/wyvi8KoIY5zt+7yNWN/zkv0h0VBZuYsX?= =?us-ascii?Q?r2Ky15p6dMxyLrtZN6yweqSEDhwIGQ57k1nhNdkis1QFNiXegC2OUN2VsUWA?= =?us-ascii?Q?tUdxIPpl+gstF2K3KiAoy57hyKVAiPjswZtIrG2oKI2UlmDrYWfEuDUpULnj?= =?us-ascii?Q?HTLsA8bKU6AKrIdEhBmujiZyeo1IxscRQYp26tg5YJxO29hNYtRVHu10S62z?= =?us-ascii?Q?DqNKsKWD8P2bs/q/ps59ozuPgLSnb1oodZS+1NJiLvSluUJ5jYKelaVSWEn4?= =?us-ascii?Q?Bb/I6i4eYEOqm/E2cCpaeImwvsZhTV1EYPFhh++ixoeBYLjchUq73uI3Xysz?= =?us-ascii?Q?1/5b3vovTqcTV9CfoSxcUJXURl4iIx7NgpRoAUxs0b2kntSD9DyxoqEwuimx?= =?us-ascii?Q?5/luwH6bjV8zjePrGYMOuZxyOWSbT1WcX7ooTt5F6DX29r6GShm8oED0pCkR?= =?us-ascii?Q?glI77K1JANxe/fhtivW4CCgiAzRoA1oL+Mvb4d4LnOS26PSImLzzXc3Ar6Tt?= =?us-ascii?Q?cJREW0YzTUwMCW0Jd39GPj024TNtwiDqJvb1pFGbsk/6iJhwAkSVBvdQdpJC?= =?us-ascii?Q?JgkaTlX80FUUh4ZBtu/m+xLpwZdCd7stV69IXUcMmjzKHCh2yP/JY9oRmJEk?= =?us-ascii?Q?+K9gGJNJRMZjNOgnyTTrMV7OuNG5T8xgJEQTY9R4cdHeb7U2c7x2hJYEHyXa?= =?us-ascii?Q?c4T651o9qcjEjeeklx5oHxn32vVDUh2vT1pBXRAezarGk2mrixovxBosUaI4?= =?us-ascii?Q?uoFy9GT6QS0YYCcJuSzE22tPVZsGZ7ODMPeQfJqxq6hmqVuT6cL8swn9qiLZ?= =?us-ascii?Q?shPErWGJoLi7IRKqSto0L36kY9iJ1S1ZI5IXj3RUv35S9xdLweijXCqv7Siy?= =?us-ascii?Q?naD7V97CXjAozV+bX7wos3yWHaYT3U88wiyjb33VMUvRKhWecDZcTLql5FDI?= =?us-ascii?Q?W/yj6Zzg11encnOPWlqQafUOLwypQeFkqx4C0MrFjMtpmvyIm70uVFpPt5+y?= =?us-ascii?Q?cfPU/STWTThe4+WIEefMv4ob?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6af7607-4bd1-4c2c-2c26-08d8e9521689 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:44.9366 (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: 7oKTNJwzM9d+LQgMACFoCGkdGjVozazUSfET5SzTTyIQScORftP2dUNEiWKTBing2lUa9w+NC2YruIUrgrps6DphNLIkHHmerjF5/AuGCWs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6216 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.20.106; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" During reopen we may add backing bs from other aio context, which may lead to changing original context of top bs. We are going to move graph modification to prepare stage. So, it will be possible that bdrv_flush() in bdrv_reopen_prepare called on bs in non-original aio context, which we didn't aquire which leads to crash. To avoid this problem move bdrv_flush() to be a separate reopen stage before bdrv_reopen_prepare(). This doesn't seem correct to acquire only one aio context and not all contexts participating in reopen. But it's not obvious how to do it correctly, keeping in mind: 1. rules of bdrv_set_aio_context_ignore() that requires new_context lock not being held 2. possible deadlocks because of holding all (or several?) AioContext locks Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/block.c b/block.c index b58c8d3e10..fde4bb219d 100644 --- a/block.c +++ b/block.c @@ -4239,6 +4239,14 @@ int bdrv_reopen_multiple(BlockReopenQueue *bs_queue,= Error **errp) =20 assert(bs_queue !=3D NULL); =20 + QTAILQ_FOREACH(bs_entry, bs_queue, entry) { + ret =3D bdrv_flush(bs_entry->state.bs); + if (ret < 0) { + error_setg_errno(errp, -ret, "Error flushing drive"); + goto cleanup; + } + } + QTAILQ_FOREACH(bs_entry, bs_queue, entry) { assert(bs_entry->state.bs->quiesce_counter > 0); if (bdrv_reopen_prepare(&bs_entry->state, bs_queue, errp)) { @@ -4634,12 +4642,6 @@ static int bdrv_reopen_prepare(BDRVReopenState *reop= en_state, bdrv_reopen_perm(queue, reopen_state->bs, &reopen_state->perm, &reopen_state->shared_perm); =20 - ret =3D bdrv_flush(reopen_state->bs); - if (ret) { - error_setg_errno(errp, -ret, "Error flushing drive"); - goto error; - } - if (drv->bdrv_reopen_prepare) { /* * If a driver-specific option is missing, it means that we --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615993970; cv=pass; d=zohomail.com; s=zohoarc; b=FZlhentUaoAH5enSVks3zX5isNcwJHzP++x8p+vPbKvZ8WGSMul+4I7nkQ2ZDv45urSXbUBptj2Ua3lBKgzy0mV2Nk/Rj6yoJj9DeelMUjQ2dLjOpipHuW2g9oaRB3p3Hs24KMfH8OVSngSJCf/ae+Fk2R+yrbvLzKK5dXiehtQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615993970; 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=tlyIqqfGc95vrVAc+TfWpMYFG0x760og6wpVbqxhXW0=; b=RZbYXndevcM7AOHbJhy2oZxBYgZZ7ExGBCtgPWu4HIq0gbo3Zv9fHwjhmae06nTk0Qzo0zKsoAGZyp57S0Gh0S/iMvhdIwIswzfQDrNLfALdg2PwGm+BM+/xlPhQigxO8uuxuXegiPhbtdsyy6W2g7cs0BKXZuY0ZrfBjwvEn7U= 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 1615993970053697.025426027651; Wed, 17 Mar 2021 08:12:50 -0700 (PDT) Received: from localhost ([::1]:41646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXqp-0001la-VR for importer@patchew.org; Wed, 17 Mar 2021 11:12:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXII-0005Ln-Jq; Wed, 17 Mar 2021 10:37:06 -0400 Received: from mail-db8eur05on2128.outbound.protection.outlook.com ([40.107.20.128]:5633 helo=EUR05-DB8-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 1lMXIF-00079x-LG; Wed, 17 Mar 2021 10:37:06 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6216.eurprd08.prod.outlook.com (2603:10a6:20b:29c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:46 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:46 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pb2lqXxXFFcrr9HkavsOaszjhB5Nf72vn73w/fRadCH9EMHBY3QcIOojbrabDsShP37AbyoSEep82oi9aUgNMNP3pdj7eycDPzVXxXfuuOquBiKxqD7AwGwx5fN82VvQlLiNavfdmIeUFN+/o2MfM5D7FY3SBv6NlaYfO9hSlNBzxiZHnt+OzN5+hT87DKsiVillJ4NWJ9CDEVlJNp+9vge++H7lrIDbJJB52gmkqzK4eEgiVRmQ/9TFeRBK2OdW8foISyKNWBAU1uYmTdb+qBKqh3Z/beGcwXRqUCmzMwl2QRSR2M6J4OGtVaVpvktogVh79eoMTAF4Xn+8t4hhNg== 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=tlyIqqfGc95vrVAc+TfWpMYFG0x760og6wpVbqxhXW0=; b=DKw4Sow41x1C/FfgZCNNasTIRomB/LL49Sv0Q79uIsgSGsZ9a5JIUoRcAIdCROwr3ylwNsWVqe62y4lnPf3/geJkvuLNzd2bM+ddJC2fRwBk8ylYkofw6LAyyDEjcoy+wP1QOoNiIUI/8fqCBJZhjOO3qEsIfWu46frtKP/WW5aBeTjuBmi+QtqoWssVmFoJNfW8jz+/5R2g75t3176m5DWikQ9iKOO2Vt0lnPBJHM3WdnTNbrRDbAc4Fe7iQTrFk+jPLj47O7iNgQObCUni0NsxTDj4T7I47tL/0+3hPt6tmh5wQh8sYVGOfWpOZTquZJMjFwxKqlUbWyS7tZN6Ug== 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=tlyIqqfGc95vrVAc+TfWpMYFG0x760og6wpVbqxhXW0=; b=g1NFsPNuFMGf7siBe/zSh4kIPGVyAEQyLBRHyqVx80IxzC6uqIBtxZ/fpzMiRxGvCJOLBU5D4yVURCTnp0rIFxx/zj3IFWhq13ZBZ97SsQB4WZIVCKHBnV8llUz1ID7DP8ucb4Sj1MRgGJ+hpmM8C9m3pxNp4tR2ywRwSchcXpo= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 30/36] block: bdrv_reopen_multiple: refresh permissions on updated graph Date: Wed, 17 Mar 2021 17:35:23 +0300 Message-Id: <20210317143529.615584-31-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: edaa67ae-b44b-45f2-886a-08d8e952175f X-MS-TrafficTypeDiagnostic: AS8PR08MB6216: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:114; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tF2nekQluICHO7zhl215BZYmz+DBrQYmtRA5XfbokQyqNfxOL/dLutqEohGU/7MZuQgYz/o5EOMhYfjxKxNfondzYcSyVpQ0MHSVl9jNEqLoi89LOw8BvwH7SVAxSGUrT3ZISyXjylLmqSfnZEGUqZlyxO4EyldDuGHol++FF4e7nhtiOq+SCyaY/1p0SlwIhooQBanv4qTWRrlet2e37cJ3F4smszWVTgu/DU17poxYZ7s5zs8bp4NpSzaqgt4ULWh0yiD8DE4KhQh/HVDoQgNN2EEayNikfCS94nPR2WUTdKhbmDQL8hLf53ylNEjsiKfU0G5JfaWZv6UsUpy2DO2b8dpkaGvBAmD6y5gh0dMVgTB/VkDs92IO3IJ7yRq9tJ46dl/kAr4/ae+FraIt7f2Tc0CH7ndHbVyzOEhQjN8st1vA+ouI7c7YfMOlC9Hyvh860DJ9Rl/nI4ywEhc2KxLcpToBPulDN1g8+uC9J8dmnfEXqRjoHyDRdGOqaaXPlhcYiznaKOInkhwIpUBzq2OEn6vR/RwieTikEDmx6PzHbSw0AyZ6T6/itb6D628U2vo2rcQ/z8Y2Gil3r9Y2Bq20+k0wW4Wp3Sr674FHS5zLpSGl10mBxuj4leDqDPy3 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)(366004)(346002)(376002)(39840400004)(136003)(6916009)(83380400001)(316002)(2616005)(66946007)(6512007)(66556008)(8676002)(956004)(26005)(30864003)(1076003)(16526019)(6486002)(186003)(4326008)(36756003)(8936002)(15650500001)(2906002)(6666004)(5660300002)(478600001)(86362001)(66476007)(6506007)(52116002)(69590400012); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?sizADMl3EDh+1GPMzgJ19hcOmKGRRBfDDy4u7ffuePswdmAJ48ParzWELons?= =?us-ascii?Q?lFlP3Zfx8fKSfPAmZf7CGjqIRjwPr9UWYHcNAT11XjBXJuAfKT/tMxeGYTIj?= =?us-ascii?Q?MlOGN3qmCw+iD6BcLFeEj0Kf1W6Yo96Md7UeZVKpJvEJF5vADTjyNf3p5JTv?= =?us-ascii?Q?Kte62Wzqy631QKoqh5Nu0elXcEmzeTENcFl9otfvlNfC4hLiV58dREtK0/C2?= =?us-ascii?Q?zVSPYDlZwryvmLPhMZj4wq8Qup0A9mZ1Uc0cUcbQ4ghh9Bn21S+HZgkLCdON?= =?us-ascii?Q?reAMJmmPe6Qr87f7LugNA3K2z9Drw7Sg00QA1iIcDvIBCZNQ4x66QVTNn+C3?= =?us-ascii?Q?FL+94lkq9J/EyD8hP+KSRq9QSaofKbYkjSCu3Hz8rjQKHPqx8DewZ0W8wGf9?= =?us-ascii?Q?TNZW0kyIkqrR9sAMBB/GoQUXFXDJjWIcx96tdOEArd+aUuIXbNR0gnWFbHen?= =?us-ascii?Q?6DgPagYrRCn+O/OFicfSRAuAxhjAHdr4TsKyeCKvyHru9SHi38P80rMvbcmF?= =?us-ascii?Q?mDgH0f/Hdulpd8KRY657YPvZbP/TyuAXIIkT1MnsbW6qdcGJrvfr+RHieue6?= =?us-ascii?Q?//VU2DJCh55sOhjvONc+dinMZRZGu4ZZuPoJr5mKzYA3ES3yNxsHwjWmcIk1?= =?us-ascii?Q?ef6CJex1JLVf9339nNVAZ/i/ub0uztoYtuwwsmeuvlBR0+x5dXzvBkqKfLls?= =?us-ascii?Q?netfsTkwki9f8f1lJBUcJvgtLZbges/vQqHZhtO/bBA/CEhJrVLV/PynltR/?= =?us-ascii?Q?rFSSNpiJpt6CSzT/AdYJViR+uN+Wxq6vP6MR2i3LhFAcHw0bXqnCdZAepY+u?= =?us-ascii?Q?CdN/lm4zQS8qFRkb+HWHOaR0j8aGw/kaEF3Qif+oAyJkoxEeEjeJf2K++YrI?= =?us-ascii?Q?lPtcySZBr1TJITbe22E964wPcIkY/EObczpKdJDJWYZVVqZVYnxNoZ1Tl/3n?= =?us-ascii?Q?gkt5y1hD8vjka/ppkLvm20qOa+Y2swbuPADSc62tHSh9BviBmn1f03cP/lzH?= =?us-ascii?Q?mAJf+JRlvr3Ztbi6uO/MR/k+H7NswvhZEST61gds5VA5x/0TADgDBwmkTAJU?= =?us-ascii?Q?N+UyNF4GXWxgE1App1SapaFrXqht1Ea7dSl/p0zTkx/jFlCfWOzG6mnDVrg7?= =?us-ascii?Q?BFBexGTprfLtdCXQ9AI9w3y4AaRV2uQVesnV71VCc+A5wF9z1Kj1cZDCb6qT?= =?us-ascii?Q?dhFOOMMwqTkVO58KFm/NDU/h2puto6BXYDCl0NAY+Lqr7VG2aQg9bebUgT9z?= =?us-ascii?Q?4VaUbyzxRwbZTNdwGf0+U4O8jYmltI28j46b7l/NXX/WZQSPors9Rl9+ahEC?= =?us-ascii?Q?W2cxWbOA7y0xPANc/A2VG7ju?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: edaa67ae-b44b-45f2-886a-08d8e952175f X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:46.3912 (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: JDypxI9rUsGyg1yXXQakMUOBIzJ5mCJ8vn49rwiokSFtp/arFmoaX+4ncFcossH+S+JBkUz00XoRdx3Dyc2WR7eENwL0jXTMCrQuV4eeFQk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6216 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.20.128; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-obe.outbound.protection.outlook.com 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" Move bdrv_reopen_multiple to new paradigm of permission update: first update graph relations, then do refresh the permissions. We have to modify reopen process in file-posix driver: with new scheme we don't have prepared permissions in raw_reopen_prepare(), so we should reconfigure fd in raw_check_perm(). Still this seems more native and simple anyway. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- include/block/block.h | 3 +- block.c | 187 ++++++++++++------------------------------ block/file-posix.c | 91 +++++++------------- 3 files changed, 84 insertions(+), 197 deletions(-) diff --git a/include/block/block.h b/include/block/block.h index ad38259c91..8d5b3ecebd 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -208,8 +208,7 @@ typedef struct BDRVReopenState { BlockdevDetectZeroesOptions detect_zeroes; bool backing_missing; bool replace_backing_bs; /* new_backing_bs is ignored if this is fals= e */ - BlockDriverState *new_backing_bs; /* If NULL then detach the current b= s */ - uint64_t perm, shared_perm; + BlockDriverState *old_backing_bs; /* keep pointer for permissions upda= te */ QDict *options; QDict *explicit_options; void *opaque; diff --git a/block.c b/block.c index fde4bb219d..53a8af301a 100644 --- a/block.c +++ b/block.c @@ -95,8 +95,9 @@ static int bdrv_attach_child_noperm(BlockDriverState *par= ent_bs, static void bdrv_remove_filter_or_cow_child(BlockDriverState *bs, Transaction *tran); =20 -static int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQ= ueue - *queue, Error **errp); +static int bdrv_reopen_prepare(BDRVReopenState *reopen_state, + BlockReopenQueue *queue, + Transaction *set_backings_tran, Error **err= p); static void bdrv_reopen_commit(BDRVReopenState *reopen_state); static void bdrv_reopen_abort(BDRVReopenState *reopen_state); =20 @@ -2434,6 +2435,7 @@ static void bdrv_list_abort_perm_update(GSList *list) } } =20 +__attribute__((unused)) static void bdrv_abort_perm_update(BlockDriverState *bs) { g_autoptr(GSList) list =3D bdrv_topological_dfs(NULL, NULL, bs); @@ -2529,6 +2531,7 @@ char *bdrv_perm_names(uint64_t perm) * * Needs to be followed by a call to either bdrv_set_perm() or * bdrv_abort_perm_update(). */ +__attribute__((unused)) static int bdrv_check_update_perm(BlockDriverState *bs, BlockReopenQueue *= q, uint64_t new_used_perm, uint64_t new_shared_perm, @@ -4148,10 +4151,6 @@ static BlockReopenQueue *bdrv_reopen_queue_child(Blo= ckReopenQueue *bs_queue, bs_entry->state.explicit_options =3D explicit_options; bs_entry->state.flags =3D flags; =20 - /* This needs to be overwritten in bdrv_reopen_prepare() */ - bs_entry->state.perm =3D UINT64_MAX; - bs_entry->state.shared_perm =3D 0; - /* * If keep_old_opts is false then it means that unspecified * options must be reset to their original value. We don't allow @@ -4236,6 +4235,9 @@ int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, = Error **errp) { int ret =3D -1; BlockReopenQueueEntry *bs_entry, *next; + Transaction *tran =3D tran_new(); + g_autoptr(GHashTable) found =3D NULL; + g_autoptr(GSList) refresh_list =3D NULL; =20 assert(bs_queue !=3D NULL); =20 @@ -4249,33 +4251,33 @@ int bdrv_reopen_multiple(BlockReopenQueue *bs_queue= , Error **errp) =20 QTAILQ_FOREACH(bs_entry, bs_queue, entry) { assert(bs_entry->state.bs->quiesce_counter > 0); - if (bdrv_reopen_prepare(&bs_entry->state, bs_queue, errp)) { - goto cleanup; + ret =3D bdrv_reopen_prepare(&bs_entry->state, bs_queue, tran, errp= ); + if (ret < 0) { + goto abort; } bs_entry->prepared =3D true; } =20 + found =3D g_hash_table_new(NULL, NULL); QTAILQ_FOREACH(bs_entry, bs_queue, entry) { BDRVReopenState *state =3D &bs_entry->state; - ret =3D bdrv_check_perm(state->bs, bs_queue, state->perm, - state->shared_perm, errp); - if (ret < 0) { - goto cleanup_perm; - } - /* Check if new_backing_bs would accept the new permissions */ - if (state->replace_backing_bs && state->new_backing_bs) { - uint64_t nperm, nshared; - bdrv_child_perm(state->bs, state->new_backing_bs, - NULL, bdrv_backing_role(state->bs), - bs_queue, state->perm, state->shared_perm, - &nperm, &nshared); - ret =3D bdrv_check_update_perm(state->new_backing_bs, NULL, - nperm, nshared, errp); - if (ret < 0) { - goto cleanup_perm; - } + + refresh_list =3D bdrv_topological_dfs(refresh_list, found, state->= bs); + if (state->old_backing_bs) { + refresh_list =3D bdrv_topological_dfs(refresh_list, found, + state->old_backing_bs); } - bs_entry->perms_checked =3D true; + } + + /* + * Note that file-posix driver rely on permission update done during r= eopen + * (even if no permission changed), because it wants "new" permissions= for + * reconfiguring the fd and that's why it does it in raw_check_perm(),= not + * in raw_reopen_prepare() which is called with "old" permissions. + */ + ret =3D bdrv_list_refresh_perms(refresh_list, bs_queue, tran, errp); + if (ret < 0) { + goto abort; } =20 /* @@ -4291,51 +4293,31 @@ int bdrv_reopen_multiple(BlockReopenQueue *bs_queue= , Error **errp) bdrv_reopen_commit(&bs_entry->state); } =20 - ret =3D 0; -cleanup_perm: - QTAILQ_FOREACH_SAFE(bs_entry, bs_queue, entry, next) { - BDRVReopenState *state =3D &bs_entry->state; - - if (!bs_entry->perms_checked) { - continue; - } - - if (ret =3D=3D 0) { - uint64_t perm, shared; + tran_commit(tran); =20 - bdrv_get_cumulative_perm(state->bs, &perm, &shared); - assert(perm =3D=3D state->perm); - assert(shared =3D=3D state->shared_perm); + QTAILQ_FOREACH_REVERSE(bs_entry, bs_queue, entry) { + BlockDriverState *bs =3D bs_entry->state.bs; =20 - bdrv_set_perm(state->bs); - } else { - bdrv_abort_perm_update(state->bs); - if (state->replace_backing_bs && state->new_backing_bs) { - bdrv_abort_perm_update(state->new_backing_bs); - } + if (bs->drv->bdrv_reopen_commit_post) { + bs->drv->bdrv_reopen_commit_post(&bs_entry->state); } } =20 - if (ret =3D=3D 0) { - QTAILQ_FOREACH_REVERSE(bs_entry, bs_queue, entry) { - BlockDriverState *bs =3D bs_entry->state.bs; + ret =3D 0; + goto cleanup; =20 - if (bs->drv->bdrv_reopen_commit_post) - bs->drv->bdrv_reopen_commit_post(&bs_entry->state); +abort: + tran_abort(tran); + QTAILQ_FOREACH_SAFE(bs_entry, bs_queue, entry, next) { + if (bs_entry->prepared) { + bdrv_reopen_abort(&bs_entry->state); } + qobject_unref(bs_entry->state.explicit_options); + qobject_unref(bs_entry->state.options); } + cleanup: QTAILQ_FOREACH_SAFE(bs_entry, bs_queue, entry, next) { - if (ret) { - if (bs_entry->prepared) { - bdrv_reopen_abort(&bs_entry->state); - } - qobject_unref(bs_entry->state.explicit_options); - qobject_unref(bs_entry->state.options); - } - if (bs_entry->state.new_backing_bs) { - bdrv_unref(bs_entry->state.new_backing_bs); - } g_free(bs_entry); } g_free(bs_queue); @@ -4360,53 +4342,6 @@ int bdrv_reopen_set_read_only(BlockDriverState *bs, = bool read_only, return ret; } =20 -static BlockReopenQueueEntry *find_parent_in_reopen_queue(BlockReopenQueue= *q, - BdrvChild *c) -{ - BlockReopenQueueEntry *entry; - - QTAILQ_FOREACH(entry, q, entry) { - BlockDriverState *bs =3D entry->state.bs; - BdrvChild *child; - - QLIST_FOREACH(child, &bs->children, next) { - if (child =3D=3D c) { - return entry; - } - } - } - - return NULL; -} - -static void bdrv_reopen_perm(BlockReopenQueue *q, BlockDriverState *bs, - uint64_t *perm, uint64_t *shared) -{ - BdrvChild *c; - BlockReopenQueueEntry *parent; - uint64_t cumulative_perms =3D 0; - uint64_t cumulative_shared_perms =3D BLK_PERM_ALL; - - QLIST_FOREACH(c, &bs->parents, next_parent) { - parent =3D find_parent_in_reopen_queue(q, c); - if (!parent) { - cumulative_perms |=3D c->perm; - cumulative_shared_perms &=3D c->shared_perm; - } else { - uint64_t nperm, nshared; - - bdrv_child_perm(parent->state.bs, bs, c, c->role, q, - parent->state.perm, parent->state.shared_perm, - &nperm, &nshared); - - cumulative_perms |=3D nperm; - cumulative_shared_perms &=3D nshared; - } - } - *perm =3D cumulative_perms; - *shared =3D cumulative_shared_perms; -} - static bool bdrv_reopen_can_attach(BlockDriverState *parent, BdrvChild *child, BlockDriverState *new_child, @@ -4448,6 +4383,7 @@ static bool bdrv_reopen_can_attach(BlockDriverState *= parent, * Return 0 on success, otherwise return < 0 and set @errp. */ static int bdrv_reopen_parse_backing(BDRVReopenState *reopen_state, + Transaction *set_backings_tran, Error **errp) { BlockDriverState *bs =3D reopen_state->bs; @@ -4524,6 +4460,8 @@ static int bdrv_reopen_parse_backing(BDRVReopenState = *reopen_state, =20 /* If we want to replace the backing file we need some extra checks */ if (new_backing_bs !=3D bdrv_filter_or_cow_bs(overlay_bs)) { + int ret; + /* Check for implicit nodes between bs and its backing file */ if (bs !=3D overlay_bs) { error_setg(errp, "Cannot change backing link if '%s' has " @@ -4544,9 +4482,11 @@ static int bdrv_reopen_parse_backing(BDRVReopenState= *reopen_state, return -EPERM; } reopen_state->replace_backing_bs =3D true; - if (new_backing_bs) { - bdrv_ref(new_backing_bs); - reopen_state->new_backing_bs =3D new_backing_bs; + reopen_state->old_backing_bs =3D bs->backing ? bs->backing->bs : N= ULL; + ret =3D bdrv_set_backing_noperm(bs, new_backing_bs, set_backings_t= ran, + errp); + if (ret < 0) { + return ret; } } =20 @@ -4571,7 +4511,8 @@ static int bdrv_reopen_parse_backing(BDRVReopenState = *reopen_state, * */ static int bdrv_reopen_prepare(BDRVReopenState *reopen_state, - BlockReopenQueue *queue, Error **errp) + BlockReopenQueue *queue, + Transaction *set_backings_tran, Error **err= p) { int ret =3D -1; int old_flags; @@ -4638,10 +4579,6 @@ static int bdrv_reopen_prepare(BDRVReopenState *reop= en_state, goto error; } =20 - /* Calculate required permissions after reopening */ - bdrv_reopen_perm(queue, reopen_state->bs, - &reopen_state->perm, &reopen_state->shared_perm); - if (drv->bdrv_reopen_prepare) { /* * If a driver-specific option is missing, it means that we @@ -4695,7 +4632,7 @@ static int bdrv_reopen_prepare(BDRVReopenState *reope= n_state, * either a reference to an existing node (using its node name) * or NULL to simply detach the current backing file. */ - ret =3D bdrv_reopen_parse_backing(reopen_state, errp); + ret =3D bdrv_reopen_parse_backing(reopen_state, set_backings_tran, err= p); if (ret < 0) { goto error; } @@ -4817,22 +4754,6 @@ static void bdrv_reopen_commit(BDRVReopenState *reop= en_state) qdict_del(bs->explicit_options, child->name); qdict_del(bs->options, child->name); } - - /* - * Change the backing file if a new one was specified. We do this - * after updating bs->options, so bdrv_refresh_filename() (called - * from bdrv_set_backing_hd()) has the new values. - */ - if (reopen_state->replace_backing_bs) { - BlockDriverState *old_backing_bs =3D child_bs(bs->backing); - assert(!old_backing_bs || !old_backing_bs->implicit); - /* Abort the permission update on the backing bs we're detaching */ - if (old_backing_bs) { - bdrv_abort_perm_update(old_backing_bs); - } - bdrv_set_backing_hd(bs, reopen_state->new_backing_bs, &error_abort= ); - } - bdrv_refresh_limits(bs, NULL, NULL); } =20 diff --git a/block/file-posix.c b/block/file-posix.c index 05079b40ca..7b7e63cfa9 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -175,7 +175,6 @@ typedef struct BDRVRawState { } BDRVRawState; =20 typedef struct BDRVRawReopenState { - int fd; int open_flags; bool drop_cache; bool check_cache_dropped; @@ -1080,7 +1079,6 @@ static int raw_reopen_prepare(BDRVReopenState *state, BDRVRawReopenState *rs; QemuOpts *opts; int ret; - Error *local_err =3D NULL; =20 assert(state !=3D NULL); assert(state->bs !=3D NULL); @@ -1106,32 +1104,18 @@ static int raw_reopen_prepare(BDRVReopenState *stat= e, * bdrv_reopen_prepare() will detect changes and complain. */ qemu_opts_to_qdict(opts, state->options); =20 - rs->fd =3D raw_reconfigure_getfd(state->bs, state->flags, &rs->open_fl= ags, - state->perm, true, &local_err); - if (local_err) { - error_propagate(errp, local_err); - ret =3D -1; - goto out; - } - - /* Fail already reopen_prepare() if we can't get a working O_DIRECT - * alignment with the new fd. */ - if (rs->fd !=3D -1) { - raw_probe_alignment(state->bs, rs->fd, &local_err); - if (local_err) { - error_propagate(errp, local_err); - ret =3D -EINVAL; - goto out_fd; - } - } + /* + * As part of reopen prepare we also want to create new fd by + * raw_reconfigure_getfd(). But it wants updated "perm", when in + * bdrv_reopen_multiple() .bdrv_reopen_prepare() callback called prior= to + * permission update. Happily, permission update is always a part (a s= eprate + * stage) of bdrv_reopen_multiple() so we can rely on this fact and + * reconfigure fd in raw_check_perm(). + */ =20 s->reopen_state =3D state; ret =3D 0; -out_fd: - if (ret < 0) { - qemu_close(rs->fd); - rs->fd =3D -1; - } + out: qemu_opts_del(opts); return ret; @@ -1145,10 +1129,6 @@ static void raw_reopen_commit(BDRVReopenState *state) s->drop_cache =3D rs->drop_cache; s->check_cache_dropped =3D rs->check_cache_dropped; s->open_flags =3D rs->open_flags; - - qemu_close(s->fd); - s->fd =3D rs->fd; - g_free(state->opaque); state->opaque =3D NULL; =20 @@ -1167,10 +1147,6 @@ static void raw_reopen_abort(BDRVReopenState *state) return; } =20 - if (rs->fd >=3D 0) { - qemu_close(rs->fd); - rs->fd =3D -1; - } g_free(state->opaque); state->opaque =3D NULL; =20 @@ -3078,39 +3054,30 @@ static int raw_check_perm(BlockDriverState *bs, uin= t64_t perm, uint64_t shared, Error **errp) { BDRVRawState *s =3D bs->opaque; - BDRVRawReopenState *rs =3D NULL; + int input_flags =3D s->reopen_state ? s->reopen_state->flags : bs->ope= n_flags; int open_flags; int ret; =20 - if (s->perm_change_fd) { + /* We may need a new fd if auto-read-only switches the mode */ + ret =3D raw_reconfigure_getfd(bs, input_flags, &open_flags, perm, + false, errp); + if (ret < 0) { + return ret; + } else if (ret !=3D s->fd) { + Error *local_err =3D NULL; + /* - * In the context of reopen, this function may be called several t= imes - * (directly and recursively while change permissions of the paren= t). - * This is even true for children that don't inherit from the orig= inal - * reopen node, so s->reopen_state is not set. - * - * Ignore all but the first call. + * Fail already check_perm() if we can't get a working O_DIRECT + * alignment with the new fd. */ - return 0; - } - - if (s->reopen_state) { - /* We already have a new file descriptor to set permissions for */ - assert(s->reopen_state->perm =3D=3D perm); - assert(s->reopen_state->shared_perm =3D=3D shared); - rs =3D s->reopen_state->opaque; - s->perm_change_fd =3D rs->fd; - s->perm_change_flags =3D rs->open_flags; - } else { - /* We may need a new fd if auto-read-only switches the mode */ - ret =3D raw_reconfigure_getfd(bs, bs->open_flags, &open_flags, per= m, - false, errp); - if (ret < 0) { - return ret; - } else if (ret !=3D s->fd) { - s->perm_change_fd =3D ret; - s->perm_change_flags =3D open_flags; + raw_probe_alignment(bs, ret, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return -EINVAL; } + + s->perm_change_fd =3D ret; + s->perm_change_flags =3D open_flags; } =20 /* Prepare permissions on old fd to avoid conflicts between old and ne= w, @@ -3132,7 +3099,7 @@ static int raw_check_perm(BlockDriverState *bs, uint6= 4_t perm, uint64_t shared, return 0; =20 fail: - if (s->perm_change_fd && !s->reopen_state) { + if (s->perm_change_fd) { qemu_close(s->perm_change_fd); } s->perm_change_fd =3D 0; @@ -3163,7 +3130,7 @@ static void raw_abort_perm_update(BlockDriverState *b= s) =20 /* For reopen, .bdrv_reopen_abort is called afterwards and will close * the file descriptor. */ - if (s->perm_change_fd && !s->reopen_state) { + if (s->perm_change_fd) { qemu_close(s->perm_change_fd); } s->perm_change_fd =3D 0; --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615993569; cv=pass; d=zohomail.com; s=zohoarc; b=e8A93wyGnYYXrcnACPdVAnAjY9jzn9UQiON/MY2aaq5zpEqqCQBaaeCdUqpN/imAuUZd7Wdl/+TkyFmfDARiBzXBfdMo9ZTs/RQDSTrlGY6JgXMEOEPnxCJySH7gnfeHBPu1oE8WYCTF+GHTGdVcQwvIzHUJJFl6HlVTStN8irE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615993569; 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=29gbyL69Ob/VCkLz3u3RazZ18XR+4biTtbXAOYqK1rI=; b=UykBGESRp2o0sXhzExVzUQ2yR7qIflDeO+LWJqLhAf91GGItVVy5Yf19Vs0DKvHphzWW+VlnJFOWya6Rm0sYrG639PVjusnGjSLmvxYBzTtuFiYYf9ERgNVbyRdnEiZzImi5jMCQoO0+gCCzU4ez98bvVFkuIbe2VFmEJbA1Hdo= 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 1615993569225202.2478936836029; Wed, 17 Mar 2021 08:06:09 -0700 (PDT) Received: from localhost ([::1]:53730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXkO-0002jB-4i for importer@patchew.org; Wed, 17 Mar 2021 11:06:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXIJ-0005OF-I9; Wed, 17 Mar 2021 10:37:07 -0400 Received: from mail-db8eur05on2106.outbound.protection.outlook.com ([40.107.20.106]:39072 helo=EUR05-DB8-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 1lMXIH-0007Ew-E2; Wed, 17 Mar 2021 10:37:07 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6216.eurprd08.prod.outlook.com (2603:10a6:20b:29c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:47 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:47 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iiB4UHr005/Pp+g912rsMLfg7nDFKoDRIihozSRvSQ3inNjuaB9ucfPOFstUwObGk8XyOqmKDQPniu9xpiJzslIR/urXmX/CPeayWBGBJkXqRBQvnzmvouBWQLfsjMv4cDbTlBAZuIntS/7j1bsdEQGZ/ug/DCRN2Duyj1Z3/09PzpMdehq7BaFGVAR2Kt7vxQcx72WYomMseJ4hAp4YRlm8jWHlIwTJtyzpVqghYDyHBguf2xq58x8raFzXmV5PA+UNayAO1uKu46Hk5pzUFbCujdUbKBXW/yEB4hEJDh3L5BwvJa3eAT7B35JxQui3ypso/bhCKN6DMv7vj6Q4Pw== 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=29gbyL69Ob/VCkLz3u3RazZ18XR+4biTtbXAOYqK1rI=; b=BbIprDJ1RubLTA/Tsi1nZy6U+m3/rZnh69YpKFboEeh/Niu0WJpW3bSyrx7FVMaCmvhHEzBuI+MriL7xjdxCLdbpSwYyGPTc0DT7eOW9EWC8J5HikNuN1tTE5JWdixPLhmRdM6m2bmbrbQ5wzbepktJrf1ejpg1e6T9cpc5x059BQPYMvFBb640SKBTqMHc/Xzcot6vlrUAf1gGWe35kdD8e5eLxS0bSi8fqi00bLScvO2KYkNWuupEVjaStGq2PWhcQ76wTmQaUPBaBthRE3ClqLwkuG9FGdKdHqf96/t7KBU0QdT54ptjUjVYyOTRGRa74+5QY9HEZOZ6hLJlR0Q== 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=29gbyL69Ob/VCkLz3u3RazZ18XR+4biTtbXAOYqK1rI=; b=ODy1zxXzOLmz+ScPoBupEr+4pzF9bSnkWadFlECA0ujukglGjoO7IxY67yDg/zlRl/nlYdmrlOkI+I9k94jQoVNK0NGzMiHnwWa+g7hOy6BXXSX9o4QVWVqyl+G6jOCHfPqgVuYJAAABU34Pwg92ooGMpM7up8fwfN7Ue+AO3n0= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 31/36] block: drop unused permission update functions Date: Wed, 17 Mar 2021 17:35:24 +0300 Message-Id: <20210317143529.615584-32-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: 6b83233f-ec61-46e6-d7df-08d8e9521839 X-MS-TrafficTypeDiagnostic: AS8PR08MB6216: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2803; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ypr2y7iQegunzY/fZKLOudwUdjH3faPTnQFGbhMBQnR929JxmGvhU9/Eqd7G5QKJDOZqNaZWFcmoTUUpcovM4fh9Zx9uD1nvaE6Fc+XtCZ0TYN2Q0SCw4rGlR3UGxwWT/D1sFbU+lyHfjlb5hZvvu7WZuVang1Jg1nz79wzk7fASjJUqP8v6QiSxD6Tcy2QvDMrZSC0u0aiNd5BDrQtJh4zIY/YhW8nNTeUTOmxHdPsQoryqBnGL4P6iBloOFKkdwlTsETusZtlg9yC9VCROoVd6c6i1hE/uvP4g7BNiEqjBFvBdDk6t0xbwaWGtaNmXudeTJd7ywAgdUW6fcWVM4Iu8veN/BeiMs9LHkRuqHZ54P/0m8IKWE+W0ZgETHONFJMlyZJ2NVIF5y2L90Q6H/CcJqjI71mDFgvVHWTj3aoOjRghmAudpbzjFIA/3mj6FtuT1oThpnFqYNdkaKyjOYbYrbu4irCb6nVLV/TUE688i21UKNe+jWMtqwVJdC1URq4trsXI19/6LaKRcQZbthvlY+9eWlhOOhkTTfU7ZxgVdpb3UZnzroBwAdFG6Xq01lSJqpJuWpelJNrvJw6/1ck1gALm8f15b1yXwC8hyI04= 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)(366004)(346002)(376002)(39840400004)(136003)(6916009)(83380400001)(316002)(2616005)(66946007)(6512007)(66556008)(8676002)(956004)(26005)(1076003)(16526019)(6486002)(186003)(4326008)(36756003)(8936002)(15650500001)(2906002)(6666004)(5660300002)(478600001)(86362001)(66476007)(6506007)(52116002)(69590400012); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?0ROB7AaO/l70al8xE4RnKCE+huKAOdQO5TQLJoAaGpspZZHPtvctrvoU8RJr?= =?us-ascii?Q?Fv/DZaGiQVj0vN9ZDSueiZvAjB7Pyu7YyKBjiBIohE567uiH2yOLdzjcc6tg?= =?us-ascii?Q?CwSoFbyTxU7pDR9LNL8ruV/H2trtYiuv/wK/cxIBpvx2EyLomcLcowTxIxEL?= =?us-ascii?Q?HArj//PnrR1k/OeJpMQMzXwlZWTvOcC8CQUt+hLSiLBafYVzgkWHOwa/aF0m?= =?us-ascii?Q?abl9DM3VgCVw9ScOX1kQWvFikAreia4MMu/eNXOtrz3WzdV6Q9Yz9CeYYtMu?= =?us-ascii?Q?81s+3pbzQ7JgPI5naPqqEwqQr1MHu5EPUeK6Jss74tEYsAulm9zw4h0bOQ2e?= =?us-ascii?Q?Dpwek19Z9BOCpOLDUT50Isc9VYgxyATZq9b9abROqZVzJyzjN3byDjZ0+k2l?= =?us-ascii?Q?HGm/EnAkgVrdaypsbih6N3UQGxx/ZdyqvqoG5a7hnXKyWhtcdMZ9K1Mgo+f/?= =?us-ascii?Q?a5/Wo+y2aKWrKQrs8dmVOc3QjK9fMo8VGn0smbWN4ifFIQQvdVVWW1AaWk3a?= =?us-ascii?Q?Ce2VBxO8v5CyM/irVm1wOlRGL4D7chId6EV2om9bYqSQRTBIKxx5yX1yEQfM?= =?us-ascii?Q?Lhxoz/90okytPOMm1C8fRd1K2V9PeyhPTOZnuWysDvBWkUtc+B2ZZb2MWoY+?= =?us-ascii?Q?J+DxwqKMhcUZGPArnJK5B7wOMyDZ4X3r+zr/xC0O8zxcoN02LA2YT+8zVbKA?= =?us-ascii?Q?ZeIeztldbh/7A4/AyDGPomMRP9JZOdIOcJ1CSHHWoBf2baYhgo4pHPp+49z1?= =?us-ascii?Q?4qFn4SW0S/2W8L5Hd3WBCyjQTimkXucJreymsHFeMaZL/Qs7yX19dqhUJayV?= =?us-ascii?Q?4wi60umYF4g82MqOHJZG7IgGhL+Ux0jjPyed4YsRPnJboPSdoapCNoeyeUXK?= =?us-ascii?Q?/t0yYZQglWkjGhd5hCNI4TIYBPaUL77QilsAPCyAMLVDC64mmCRdqOXMDksh?= =?us-ascii?Q?wVwXy97mJrNsfVq6vAhBLn6zyNv1SmonpWaVo+fmdK9oas2nKPSJqIXQdyP7?= =?us-ascii?Q?V7KO/OJCO5VMhHfOZ0DKxBLUpOS6LMEfeztr/Ki+CYdcd+O15V+Imn6bA5IG?= =?us-ascii?Q?AE100fOTFGjpP1Qqpr7+oMHLkiD8WDqlXqGejkX7e0/5fDnZaZlewuD1aCoQ?= =?us-ascii?Q?mQtHA8ETU/mXXabNPHPIk6tImN3WEqBPP+iaF9Jw1avUQb4E96H/+RbWcJhR?= =?us-ascii?Q?yLgX31lcwYXBRWnyH9hHg/YouZqmfoigbZokGVHgf5M2nN1e0xtTYC3A6dSw?= =?us-ascii?Q?HCNef5ilq8UW1n613ZQ/PF3JgPcalsM0qCVBzPb1xrrE7AxHXppqeuiR4Q1X?= =?us-ascii?Q?jvtMuYoQv+MnEfSraVqiUobp?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b83233f-ec61-46e6-d7df-08d8e9521839 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:47.7472 (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: /8ZSJT7RHu0FTO74kRwQvJNMIOlsZb43YYDIAtQJjhmtJ0wV//YaFOzzlcNrkzpbyY6vQprZm8V4noMvgAVlBjFG5CU0S5LRDKgwPA6Dal8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6216 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.20.106; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block.c | 103 -------------------------------------------------------- 1 file changed, 103 deletions(-) diff --git a/block.c b/block.c index 53a8af301a..b39e6455b2 100644 --- a/block.c +++ b/block.c @@ -1953,11 +1953,6 @@ static int bdrv_fill_options(QDict **options, const = char *filename, return 0; } =20 -static int bdrv_check_update_perm(BlockDriverState *bs, BlockReopenQueue *= q, - uint64_t new_used_perm, - uint64_t new_shared_perm, - Error **errp); - typedef struct BlockReopenQueueEntry { bool prepared; bool perms_checked; @@ -2392,56 +2387,12 @@ static int bdrv_check_perm_common(GSList *list, Blo= ckReopenQueue *q, return 0; } =20 -static int bdrv_check_perm(BlockDriverState *bs, BlockReopenQueue *q, - uint64_t cumulative_perms, - uint64_t cumulative_shared_perms, Error **errp) -{ - g_autoptr(GSList) list =3D bdrv_topological_dfs(NULL, NULL, bs); - return bdrv_check_perm_common(list, q, true, cumulative_perms, - cumulative_shared_perms, NULL, errp); -} - static int bdrv_list_refresh_perms(GSList *list, BlockReopenQueue *q, Transaction *tran, Error **errp) { return bdrv_check_perm_common(list, q, false, 0, 0, tran, errp); } =20 -/* - * Notifies drivers that after a previous bdrv_check_perm() call, the - * permission update is not performed and any preparations made for it (e.= g. - * taken file locks) need to be undone. - */ -static void bdrv_node_abort_perm_update(BlockDriverState *bs) -{ - BlockDriver *drv =3D bs->drv; - BdrvChild *c; - - if (!drv) { - return; - } - - bdrv_drv_set_perm_abort(bs); - - QLIST_FOREACH(c, &bs->children, next) { - bdrv_child_set_perm_abort(c); - } -} - -static void bdrv_list_abort_perm_update(GSList *list) -{ - for ( ; list; list =3D list->next) { - bdrv_node_abort_perm_update((BlockDriverState *)list->data); - } -} - -__attribute__((unused)) -static void bdrv_abort_perm_update(BlockDriverState *bs) -{ - g_autoptr(GSList) list =3D bdrv_topological_dfs(NULL, NULL, bs); - return bdrv_list_abort_perm_update(list); -} - static void bdrv_node_set_perm(BlockDriverState *bs) { BlockDriver *drv =3D bs->drv; @@ -2523,60 +2474,6 @@ char *bdrv_perm_names(uint64_t perm) return g_string_free(result, FALSE); } =20 -/* - * Checks whether a new reference to @bs can be added if the new user requ= ires - * @new_used_perm/@new_shared_perm as its permissions. If @ignore_children= is - * set, the BdrvChild objects in this list are ignored in the calculations; - * this allows checking permission updates for an existing reference. - * - * Needs to be followed by a call to either bdrv_set_perm() or - * bdrv_abort_perm_update(). */ -__attribute__((unused)) -static int bdrv_check_update_perm(BlockDriverState *bs, BlockReopenQueue *= q, - uint64_t new_used_perm, - uint64_t new_shared_perm, - Error **errp) -{ - BdrvChild *c; - uint64_t cumulative_perms =3D new_used_perm; - uint64_t cumulative_shared_perms =3D new_shared_perm; - - - /* There is no reason why anyone couldn't tolerate write_unchanged */ - assert(new_shared_perm & BLK_PERM_WRITE_UNCHANGED); - - QLIST_FOREACH(c, &bs->parents, next_parent) { - if ((new_used_perm & c->shared_perm) !=3D new_used_perm) { - char *user =3D bdrv_child_user_desc(c); - char *perm_names =3D bdrv_perm_names(new_used_perm & ~c->share= d_perm); - - error_setg(errp, "Conflicts with use by %s as '%s', which does= not " - "allow '%s' on %s", - user, c->name, perm_names, bdrv_get_node_name(c->bs= )); - g_free(user); - g_free(perm_names); - return -EPERM; - } - - if ((c->perm & new_shared_perm) !=3D c->perm) { - char *user =3D bdrv_child_user_desc(c); - char *perm_names =3D bdrv_perm_names(c->perm & ~new_shared_per= m); - - error_setg(errp, "Conflicts with use by %s as '%s', which uses= " - "'%s' on %s", - user, c->name, perm_names, bdrv_get_node_name(c->bs= )); - g_free(user); - g_free(perm_names); - return -EPERM; - } - - cumulative_perms |=3D c->perm; - cumulative_shared_perms &=3D c->shared_perm; - } - - return bdrv_check_perm(bs, q, cumulative_perms, cumulative_shared_perm= s, - errp); -} =20 static int bdrv_refresh_perms(BlockDriverState *bs, Error **errp) { --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615993275; cv=pass; d=zohomail.com; s=zohoarc; b=VVJ+SIoYu1FSsn/vQ7NxwzsPMQH9PTw4oASov62JsarvasPMK+ww4BCI6EvawwN6+rxqX2z6VA6emNy68AdaIR8fpUmBW2jOzruZG6d20pQTXXi4qLo7Na2X6db4A1TKBybGNR/fRP9ltrTNMYg3bXHMJ0jNZ/u12AD1+2Ulv+U= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615993275; 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=W0H1OEIjGowssb46MmjHizuqPSgU1eUkmvN8f1KzC48=; b=EXqE7Up4Z+DRywJxGy1UPRCZ5ZS4CCCgnlZOBykhk7pKBCVZWqgg6aediEbQnONi/9HEqux1GFACWZpmdw97GMm00W9JvCHaVjJMb98eezSQXcyvns8H51n8DP90F+I1T+fa34FB6Od0CRwflnP9YdSjyK8i+sdiJnNpoEqMMgQ= 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 1615993274968639.4152579356725; Wed, 17 Mar 2021 08:01:14 -0700 (PDT) Received: from localhost ([::1]:40894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXeu-0005Mg-Qy for importer@patchew.org; Wed, 17 Mar 2021 11:00:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXID-00058p-DY; Wed, 17 Mar 2021 10:37:01 -0400 Received: from mail-eopbgr40135.outbound.protection.outlook.com ([40.107.4.135]:23235 helo=EUR03-DB5-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 1lMXI4-0007ET-NQ; Wed, 17 Mar 2021 10:37:01 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3573.eurprd08.prod.outlook.com (2603:10a6:20b:4b::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:49 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:49 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:47 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kQ9tNVE41+8TyxglDkldf+u619kPcgyRwzw59ZzMUNx0EvT+dDK6t+QDgCGQFQ8GBiaNJVp7dqP09Vfd2zWgY4o8jYwF3W7MbKY3zEU/fLqgcVHUnU8FncdXr1lLYFC9GZuaAc2zv6ysayt7MKo9xhENaxA8JDOdwkQuQW4jyyqHv2BzV0RkZlnsQ41Yrxy9kk+9FLJsttaNdEPWbRvVVLro8xzduxsECxO4yV2gziDTAWtFuSqbztnVRvCIax1D4ISjvoi63KREsR6QkfiIkMnIS5Cluvtnp7Mu/EvkFI/9HL9kI+kAh99eWpCx5DqofPBXRFbL1Xb7UaxcmAjXNw== 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=W0H1OEIjGowssb46MmjHizuqPSgU1eUkmvN8f1KzC48=; b=UZL6BfAVP5ZLUpkF+2QaVm8QNEu/9RdyksdyF3fsfO659iXZddKFQ5Y70oEotw+yghLJGrs/zIMferTniNllmVHlwxe+sHJnbRhlFoSvu0NPp/eVWvpi+t62u30shPYZz7DOCucThtcvzaHsyOT5MU5gnVz+zF5vK5x+HW8kVNK1+x7BeWXoVACsaeQ/DdIX+XHzzSn9ZcAKc4wJeTmjF6VbffZNoqn0mgA2SEF1bc7DhJVJrH/AERmHNm0eQvGeHPmWd6Wp6yj3cpNEYSFxNZDb/lUIuKUwZgfHKv/vZCbZ5H+J8PrlPCVwofal12ilA42zPKXnzWZfDWSd/oz+fQ== 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=W0H1OEIjGowssb46MmjHizuqPSgU1eUkmvN8f1KzC48=; b=Fa7RlvAZu9JTMXZIy4fcrYPvfmHA1AUjcUHOy1DqCogajXF27g42cWiRw0se5W9cQltrPmc5UHFq0xwGU3BsrgsT+nlneJulq+N2PXFfT0lUIRLNK48s/w1ksdFgfZf/56giQs3nPETgUjYX+ZcW/TwVBRJCty9Kb38Dph1oQKI= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 32/36] block: inline bdrv_check_perm_common() Date: Wed, 17 Mar 2021 17:35:25 +0300 Message-Id: <20210317143529.615584-33-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: 79bbaec7-58f1-4b3c-8b49-08d8e9521907 X-MS-TrafficTypeDiagnostic: AM6PR08MB3573: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2399; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SzQAXz2H1XBYSVDm4dpJZ4dPw2/YG8MjK5agTlbV5wpDUYTGyu1lZECk0GpOFX29HUYj4isKXXz3HoexQiDuSJk5vpK3Gz1y2AF1KpeMCMS6Dci4PFuxRErHYezloipYJSoALITrHqvaEYl1ApClBnlpoSmTyn9pS5g39nLRIAsQd9Ou546xTe3T90H9W0lS9N+9SqHeYMaMrFtxvQIb/R7kcbHNiLzCIFdsHRQYkzhSoHn/oVgZ1Uqe2r6DzkPvjCg2fP2oc8Y/RXi2ZWlYZK/YlZuE0n5rsea27i7jTznEVbhrUZb+RVIYjEWwaIGcmClSTmBBMofd830zIf9PI2xbSNhdsn9XaSYRcvcrNdh09PP9kr5wxVWRpjxQKReITeCfPFuF8GVBzOCF8LI/Or5AmkB+m5QmYvAQ2i/+EkbM9XBxkUJtKYFYCSBVkuOiUdIKJYPWqSNjyoj9IA9sSOQYZF/g0j1kJXvXofvZBCvqpdfOdp0sABPBqnXNaJ+Em5+t2XBI0xBNTY4IJtkRKtmY7rvBhhEsSc+W7ZLyXp9I0Tyhb3wMX6DrHa22CgAfyknRlZS+jzH1Y2QWXy+RAM/UvwQv1B47Od4t5cKIQFA69nR1OdenVWseaZhEZ3n9 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)(136003)(346002)(396003)(366004)(376002)(39840400004)(4326008)(66556008)(26005)(6666004)(66946007)(5660300002)(8936002)(478600001)(83380400001)(8676002)(186003)(52116002)(86362001)(16526019)(6916009)(2616005)(66476007)(6506007)(2906002)(69590400012)(1076003)(6512007)(36756003)(6486002)(316002)(956004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?grLdC8JeLZYKglgXHRsiHpTiqOMh7AJVIKkBhtphyV5HQ586YxbqYFB+0x4U?= =?us-ascii?Q?w0h6IgYf7X7VqGWMvgY7JACocrlsVWlFJAOuEy8wfUmRZLx0D7Z/q6gKju8j?= =?us-ascii?Q?c3VL4gl9koTKwgBp1j0fpQYp0+/WatF1/x0xOJ5VnpToBwVNgXOVBJf/JKUB?= =?us-ascii?Q?iYb/2wIIaKti1UluR9sPepguUrI+9HbrFg+VNazMX92/YIXMuPP8ewfqQ44Z?= =?us-ascii?Q?Vd7b4DTQ4Upugp2sNl1hAC9EELI4GHc6+Ss84iW2dLO1FgKOcIeR4Ixzss5o?= =?us-ascii?Q?p0Qt5wMh8035tnRtImH4T5dM03FpjRknclEnwsvAs1xkv1dLlhH3s/8bwZxo?= =?us-ascii?Q?HHf8PLxDfrbYtq967NpKgRAjWFQaHF6wX92sExyPwfDIvDCxLJFrfbzqSeF2?= =?us-ascii?Q?z5n2XnrFXPdv302B/b+3pcvXEfH+ZhXrWAgpKy1INW01t1//oXvdeSoeu/fY?= =?us-ascii?Q?S/W9F4a031AFPoxj1EkZ0Cjd9k4p/X9317JwfwDv9J2qxv6/25UIHUnrhLzR?= =?us-ascii?Q?1N7CfLnF/5Z/Wg2zqjGTBSnEJQNmOYpCz+Zq8FdmLfgP0h4UyPtsZdCCvQ1u?= =?us-ascii?Q?ZaMTvfhbTgloJtUaEJo91s1fQVBDgfb1kBk7csxB7umTIe6rNoYvhy1jKJUy?= =?us-ascii?Q?bO8DWc3J9b703rvzgx4xkflk6UrMsrai5aOjWUjxspOLeMakSh3WWQ5Nhnzi?= =?us-ascii?Q?M0X5ODCHGUGhtW3ODcOjS6kO7fgG7my699F57Cr4K2Fea+Vyrd1OrE/ZWQt/?= =?us-ascii?Q?BOVqkPu2znqHVTc//uE4zc4KhLCVnxu+78PZk/MC6r+27hETJ32Qz8GRQFL1?= =?us-ascii?Q?U9fFOd87M8zaAkiWhxK94gj3J/oQ8pAAIBf2zXTVtf9OXbQuqBI9CfFQil5i?= =?us-ascii?Q?2lyv8rsbbNaz1EaN8OEf6xzkEewg1vvl+RKHQQstMX24Fwso6w3eZ+Z83VMW?= =?us-ascii?Q?NobKFhMBa7ZCpMbh86xvPTXT0m3twQ9HtxcrB4+v5rYN1zazQ8yw0bN/27ep?= =?us-ascii?Q?NVPvGDDk71W6KD6omBSWvDf12AO9JEln6YlR2sLbPN6dj3WB/AJHLlLxK+rV?= =?us-ascii?Q?CKlcNseTv7NQxpIIEUc2MopC1KNN6ocEam/3lMdRGzz5Y8FaoSfmWjdr2V4v?= =?us-ascii?Q?7dbu3ohligGm37EOi/mnftZ4B9ks0pXVn8lyp2zi2rwQO4uWtFw6UKsDRqCC?= =?us-ascii?Q?fwAiZlGoFej9Z2P4lDoHW3dF4R5kicLn/0KbFOe7+EH6Ngdpd/1ncpbvI5OD?= =?us-ascii?Q?1FzUWBlYe3RGo6wOe+c5+CH8pLw56qjr9XTUksgrJT/DGB8RiJjD+/rBE1Z4?= =?us-ascii?Q?PaLsytgjXw5uabJuzqJF4Jke?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79bbaec7-58f1-4b3c-8b49-08d8e9521907 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:49.1043 (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: ZmtT7tLnZXD6DhG+jhtf1XC0fh+1xPWNODZSloy8s4+dVGTqdVS9dncSuSlXq3vRePSI5aL91Gdf6cPmUjVheYOZC3ndN6to7WzsB8XZx+I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3573 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.4.135; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com 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" bdrv_check_perm_common() has only one caller, so no more sense in "common". Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block.c | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/block.c b/block.c index b39e6455b2..29e00c4708 100644 --- a/block.c +++ b/block.c @@ -2339,33 +2339,13 @@ static int bdrv_node_check_perm(BlockDriverState *b= s, BlockReopenQueue *q, return 0; } =20 -/* - * If use_cumulative_perms is true, use cumulative_perms and - * cumulative_shared_perms for first element of the list. Otherwise just r= efresh - * all permissions. - */ -static int bdrv_check_perm_common(GSList *list, BlockReopenQueue *q, - bool use_cumulative_perms, - uint64_t cumulative_perms, - uint64_t cumulative_shared_perms, - Transaction *tran, Error **errp) +static int bdrv_list_refresh_perms(GSList *list, BlockReopenQueue *q, + Transaction *tran, Error **errp) { int ret; + uint64_t cumulative_perms, cumulative_shared_perms; BlockDriverState *bs; =20 - if (use_cumulative_perms) { - bs =3D list->data; - - ret =3D bdrv_node_check_perm(bs, q, cumulative_perms, - cumulative_shared_perms, - tran, errp); - if (ret < 0) { - return ret; - } - - list =3D list->next; - } - for ( ; list; list =3D list->next) { bs =3D list->data; =20 @@ -2387,12 +2367,6 @@ static int bdrv_check_perm_common(GSList *list, Bloc= kReopenQueue *q, return 0; } =20 -static int bdrv_list_refresh_perms(GSList *list, BlockReopenQueue *q, - Transaction *tran, Error **errp) -{ - return bdrv_check_perm_common(list, q, false, 0, 0, tran, errp); -} - static void bdrv_node_set_perm(BlockDriverState *bs) { BlockDriver *drv =3D bs->drv; --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615994120; cv=pass; d=zohomail.com; s=zohoarc; b=f8JzWuRQ6QN8ULeFKpc+nztOiHb2plDI2ljKSWU1pxqJlvY8D93VIScj6+b5YY9KsqfXhEAm05v67VMh97RRwt7lkmXz1GZEB0vX2d9mstm/tADgCbI1lCxbhI7ZoZ3Zhd5IuirvbfbQJzc1CrNAfgHuvyWzySOU4XYVxwedDtA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615994120; 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=8kwlA703STIj0/64Hf8bLJwwyrGwt1zS3ODrhUbqFmI=; b=nauBa6uQeaiXNMEjrg5Ps9rIA0Y3B5Vi9eHq27KlbdKEyFiH0DSVIR8s75F5A45bt+aBejbRsu+so0CEm8f0g7zWHZG7PgyUMhap6FFbwzN8EWyeyzwxkoLdovRV5oYW8/wGS0zpZRLUFTLhSPsbhHCvaAzH5W09x2ac+3goOVA= 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 1615994120904783.7064905300944; Wed, 17 Mar 2021 08:15:20 -0700 (PDT) Received: from localhost ([::1]:54356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXke-00033b-MP for importer@patchew.org; Wed, 17 Mar 2021 11:06:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXIG-0005G6-70; Wed, 17 Mar 2021 10:37:04 -0400 Received: from mail-eopbgr40135.outbound.protection.outlook.com ([40.107.4.135]:23235 helo=EUR03-DB5-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 1lMXIE-0007ET-54; Wed, 17 Mar 2021 10:37:03 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3573.eurprd08.prod.outlook.com (2603:10a6:20b:4b::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:50 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:50 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:49 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iqLRV50UiQEx7pzXjvrb7aw7zRanYoiH6zVlrkoTZBFNR+LhTSbAwsyh/A95qDKxPCzWjurxbJOMG/OdrPvY6ZJyw2YNTw9E/23cS1LEkw1LIKvktmKTU/R6TqKxP6u25dlvfa1gan9rwn4nAHTdCXjCSj7znthES3A6TwkbMP5sTzcTiOcq38LMSk/+x+VmLKJQI9EDe0/F78hm2lvuCgK1LiMtEg2EBV01d0qtHA47MqOAnUJus8gdell7QUFl3N8q3osuZa+piTrmSurg2F+OKtKesK+VsvNc98lbdXpEv/CK9S3tpMSkdYe7z/rvzzhldmSHfLk9+cGLzn/ZRA== 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=8kwlA703STIj0/64Hf8bLJwwyrGwt1zS3ODrhUbqFmI=; b=U2Dco4SUwUzk/voFbarr0FGdEqaFf95AjqXlp2Ws1pcV5xWE9YcCMg7Lm9p6sbgfjNMjGicxV+RfG/avZA4UBHIwe0d6PLBQ+t4KlOrFFb7VJfxh8HIN9LDHOJdhWGIRgQTVsTYcqQkwzCXytBHjhXaurnZDidwyXCpt2CedwCRlmykp/XulxMtIJqO1X6pj7kt3qnbLcRDgjMZ4t7dyxuAR46j5I4XwjS2IVkF4N0f1e3L3PWSpAjtWFOkqvshWvrfoOlm8MgCu9rXJnKmmwGQIyBgz2RjH0dLwvqbHsxSUfhX/Zxnob7SviJlTWj2gCX+Hxpo8jxC/ZD4U/sGySw== 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=8kwlA703STIj0/64Hf8bLJwwyrGwt1zS3ODrhUbqFmI=; b=ucgaK9tx/UhuCed2OzWdlxnm9xMRoHL353LHpieQaYiMZYnF5BJj0A5smN4DlJnHu3WkxVy3rgeEGG6bW4neKbIUZMSL5QwsvGTS6iJyQ1z6Q3Gyf+ZwsbEk4FDWjf0uMkNjTx1mcP0myZ+MAqad4u8C/Y3XURSrjpiwymK6FEE= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 33/36] block: inline bdrv_replace_child() Date: Wed, 17 Mar 2021 17:35:26 +0300 Message-Id: <20210317143529.615584-34-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: 1d35fbdb-aa16-48ad-a330-08d8e95219d4 X-MS-TrafficTypeDiagnostic: AM6PR08MB3573: 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: n9ktkmH3oyw3L8qswCfsvAP3Jjg2IJSIKWbTvTDN/YoJ8dWZ+BV72EUJO3XqGeflrK35glqrzC8LPndQSBnHhW3qrQyawAXPTFxsn2F/ICvkbDPTOjAlaaSQ3uLhKCOlKhL/9Q3IhCtvRoa/3IoAdaMGMLUwlEDva/QqAXevdFw235mnjsGlGd5f1LU/MT1T3in8dcyzhg2vmGw7fdo0hA50z7SfmecRGJTVMpiAISxXaJs5ScH1vgdecYDxI38/EOZl16DxqMU5uutBFsXd+qg8vpAdUWKdaYgZTLTdLvx8WKwjZN9uvv11+EBUxRgq76SNdrNEx8oe2TcSQURdc4UuXR4uap9ukf8CZFIHd2ju67N48D13gWHI0kQI/119kPIXtgErtikgMutWcoMGZBBBnH0v93ZhE2L+fnSAnm30N2jCmkhRfPtS7f1bN/Ciujbwbl9VXwp13BuxatJWowLMkMgZeTtPmnzDK8f2X+bJuRbaMwYZOjZ9TMB1S0vVWviwzNKQkVaEg3XPUIhfTCM67U6DECsCb9vraDgHPszrXvlphFi4B3UexGhVzGAuQdy2UxY7gwomMBIIuKKbmqz5lNwFT8irApY9PoAkc6C6FIv0Uk34JZDbvcpiallP 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)(136003)(346002)(396003)(366004)(376002)(39840400004)(4326008)(66556008)(26005)(6666004)(66946007)(5660300002)(8936002)(478600001)(83380400001)(8676002)(186003)(52116002)(86362001)(16526019)(6916009)(2616005)(66476007)(6506007)(2906002)(69590400012)(1076003)(6512007)(36756003)(6486002)(316002)(956004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?irY/Me9S6IbEwzBcMjAVQr/S6hIT+QynSxacGw6sShCUfZfxBPhVLjLJao7W?= =?us-ascii?Q?yHdLZiz7huGvs6Y/+iB/owH3Ve2GrWnH7mjLMAiATFvaHQDjQKhad4HWX5os?= =?us-ascii?Q?PSAWcQNpPNbagolfyTsZ3UnruEIQP6lJtFKjgw5TIteI5CQeT+G7OBe9VqoB?= =?us-ascii?Q?Fsp+vpEXcFqE8DHI1t2iYgdiNXFvhep7IPRYq4nMzPXILhGelflq6H0g5Fxw?= =?us-ascii?Q?UvSr/nkiDpuslZGVeX7Lrm2XlsX9Ee0ARPktWI1l5vCtYazWJTZuhJ31+mWP?= =?us-ascii?Q?Hnw9oKv90DZpDMKQCe5aN5xZlwWRfXW/pmderhVUQEUz2+Q36Fexy/KHovOm?= =?us-ascii?Q?3ukfCed4v+ZheP27etGKNOaEYWecwWfUPpbasHg5+dHzlebocL7VdMWsEjGE?= =?us-ascii?Q?IkufC/GAfz2aHLXbOFwvc0nNAMDRBUz8vkgg22qfkbq3oO+R+CwVOb4+6rVh?= =?us-ascii?Q?KBCWhSMI8UBZEss9N00uIVGuhye/KvMV8lKKQzdUYDu5gzB9yxQsc9PLGOE1?= =?us-ascii?Q?xv3xjT3ger4Gr+bCQbHfk6m6ZPmegSw6WKlk9wJfg4YG3fuF5TSNIR/P4Een?= =?us-ascii?Q?Ke23hQU7C/oabI/CgB+U1lwB3G77+LWwDMdDgvpBr7/of+ecFIJTcCFDod8H?= =?us-ascii?Q?uDGf/1Nhm93zbjE1RIXoQbG3c5UfX0/Wd9ZokvYhILi6aH8QfCPQa7k70FJT?= =?us-ascii?Q?2otIeqcBDyN4doQNQGCAsBnji+go8HHNMzcZ7MSesaRGCfw32XRJx4sFUHTn?= =?us-ascii?Q?mlk1NQg3JTi2+5TbZ98gvpNuL8GnPa1zwvwvxwVre/Nhtk1bWY31zwvhCLE7?= =?us-ascii?Q?IcUlgYa+HX6uEBlxtc51ApcOr9UlzwNEaRgY7oj6wX+uxfGjzqlx8vc16BH1?= =?us-ascii?Q?VFTlrDePL7DdwP6QiW5T7ij+J3nXJjjU0AS2aKT+mcNhhGHGl/pvSF7gTf6M?= =?us-ascii?Q?HGkyKIK6YUiaS/yKUxfylSlwaTMXiwYP+B2gHzCA4Xa/k3WKKNv2mx+NPZ94?= =?us-ascii?Q?EVDCBoKDu9ZeQ/WZFM1C5A02cLBbv3u91b34ueJGlgke30XWXFVeeCJGiRhD?= =?us-ascii?Q?WAGczJOnCKcjc11IGcsHcPpSbuGvzkNB1JdFr/2jqQci9OT4Bi3gr4xZ8cyc?= =?us-ascii?Q?UgBOGOvQkpMTFPDdlRmF0aUQBEvsR7gJSe1VKuQayyGXveZuikrD2GQXKt/T?= =?us-ascii?Q?gvCT0sZ+I98kmvq/RhI98r9VnsgvOCxl7E10BCSlHOuo2u44DkV+32rSmSaw?= =?us-ascii?Q?KDr/STbWKhkgeJvy+lOicbFw7IEIgOphTzvBZRPLVou1Iq2vsMaLdy2oalO2?= =?us-ascii?Q?8MfAYSXHRuzJCzpZEhAziqly?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1d35fbdb-aa16-48ad-a330-08d8e95219d4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:50.4573 (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: RzaJVxxzv2g8lEzmK5S1jyvGhQ6eZZCGPjGchV1Yk8pBbwFImSdzSCh5j0h2iGA5hNgIfWygySv8FqnLd2ApP0e/kNS336h6aDsNybrGd3k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3573 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.4.135; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com 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" bdrv_replace_child() has only one caller, the second argument is unused. Inline it now. This triggers deletion of some more unused interfaces. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block.c | 101 ++++++++++---------------------------------------------- 1 file changed, 18 insertions(+), 83 deletions(-) diff --git a/block.c b/block.c index 29e00c4708..707a8a7f8c 100644 --- a/block.c +++ b/block.c @@ -2367,42 +2367,6 @@ static int bdrv_list_refresh_perms(GSList *list, Blo= ckReopenQueue *q, return 0; } =20 -static void bdrv_node_set_perm(BlockDriverState *bs) -{ - BlockDriver *drv =3D bs->drv; - BdrvChild *c; - - if (!drv) { - return; - } - - bdrv_drv_set_perm_commit(bs); - - /* Drivers that never have children can omit .bdrv_child_perm() */ - if (!drv->bdrv_child_perm) { - assert(QLIST_EMPTY(&bs->children)); - return; - } - - /* Update all children */ - QLIST_FOREACH(c, &bs->children, next) { - bdrv_child_set_perm_commit(c); - } -} - -static void bdrv_list_set_perm(GSList *list) -{ - for ( ; list; list =3D list->next) { - bdrv_node_set_perm((BlockDriverState *)list->data); - } -} - -static void bdrv_set_perm(BlockDriverState *bs) -{ - g_autoptr(GSList) list =3D bdrv_topological_dfs(NULL, NULL, bs); - return bdrv_list_set_perm(list); -} - void bdrv_get_cumulative_perm(BlockDriverState *bs, uint64_t *perm, uint64_t *shared_perm) { @@ -2742,52 +2706,6 @@ static void bdrv_replace_child_noperm(BdrvChild *chi= ld, } } =20 -/* - * Updates @child to change its reference to point to @new_bs, including - * checking and applying the necessary permission updates both to the old = node - * and to @new_bs. - * - * NULL is passed as @new_bs for removing the reference before freeing @ch= ild. - * - * If @new_bs is not NULL, bdrv_check_perm() must be called beforehand, as= this - * function uses bdrv_set_perm() to update the permissions according to th= e new - * reference that @new_bs gets. - * - * Callers must ensure that child->frozen is false. - */ -static void bdrv_replace_child(BdrvChild *child, BlockDriverState *new_bs) -{ - BlockDriverState *old_bs =3D child->bs; - - /* Asserts that child->frozen =3D=3D false */ - bdrv_replace_child_noperm(child, new_bs); - - /* - * Start with the new node's permissions. If @new_bs is a (direct - * or indirect) child of @old_bs, we must complete the permission - * update on @new_bs before we loosen the restrictions on @old_bs. - * Otherwise, bdrv_check_perm() on @old_bs would re-initiate - * updating the permissions of @new_bs, and thus not purely loosen - * restrictions. - */ - if (new_bs) { - bdrv_set_perm(new_bs); - } - - if (old_bs) { - /* - * Update permissions for old node. We're just taking a parent awa= y, so - * we're loosening restrictions. Errors of permission update are n= ot - * fatal in this case, ignore them. - */ - bdrv_refresh_perms(old_bs, NULL); - - /* When the parent requiring a non-default AioContext is removed, = the - * node moves back to the main AioContext */ - bdrv_try_set_aio_context(old_bs, qemu_get_aio_context(), NULL); - } -} - static void bdrv_child_free(void *opaque) { BdrvChild *c =3D opaque; @@ -2954,8 +2872,25 @@ static int bdrv_attach_child_noperm(BlockDriverState= *parent_bs, =20 static void bdrv_detach_child(BdrvChild *child) { - bdrv_replace_child(child, NULL); + BlockDriverState *old_bs =3D child->bs; + + bdrv_replace_child_noperm(child, NULL); bdrv_remove_empty_child(child); + + if (old_bs) { + /* + * Update permissions for old node. We're just taking a parent awa= y, so + * we're loosening restrictions. Errors of permission update are n= ot + * fatal in this case, ignore them. + */ + bdrv_refresh_perms(old_bs, NULL); + + /* + * When the parent requiring a non-default AioContext is removed, = the + * node moves back to the main AioContext + */ + bdrv_try_set_aio_context(old_bs, qemu_get_aio_context(), NULL); + } } =20 /* --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615994014; cv=pass; d=zohomail.com; s=zohoarc; b=hKGqMybM/18iIAjEuisZ02wFEMEf83mlCXTWiZK3IWc5xnFaTbfPcLJGRdtNtcbRmcSqiTN/eORQyn5yl/xoVrWaInLZWuQjI9C+P8c9A5P+noO6og9CGRziePfy6Qu+V/FKO06+D2BjWZfsy4BrVZLhbJZ/Ez00IoYZJDyoBp8= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615994014; 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=UnCgXCMPoieBYHi9QqQCw3FkX7fX/1go7H4/s/BCtbU=; b=EZ6iue2D/ZojlrkfQgEEP0mqr/t1hQktPuMQcBd3WJYdI4LqpGqIDbbXEfdPMZOcA3a+wItj7dV7PR0poHGWVkqjw9s17IiZn1pDhGgr6yNqQ+Mk7ZiHqKx/ch09vdg/a6VN9TEM5iA7dcG2R+Dfyg4MgZ8zfTf7s2eoO6IiS5w= 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 16159940144411021.7505426316252; Wed, 17 Mar 2021 08:13:34 -0700 (PDT) Received: from localhost ([::1]:43262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXrZ-0002UF-Du for importer@patchew.org; Wed, 17 Mar 2021 11:13:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXIL-0005SJ-9L; Wed, 17 Mar 2021 10:37:09 -0400 Received: from mail-db8eur05on2128.outbound.protection.outlook.com ([40.107.20.128]:5633 helo=EUR05-DB8-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 1lMXIJ-00079x-8J; Wed, 17 Mar 2021 10:37:08 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6216.eurprd08.prod.outlook.com (2603:10a6:20b:29c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:51 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:51 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XoGdpBwTDKEgFDVPFvLXI5AB0/odpOcSz8Q8a23kAzSyOi7Gqig5oyG4ByQmdAOsu/qnMTxgX06RlvQbaWpYDcKPrhLfZEw1f92DA4+FNh3ZfFcyyXkjqEYQ/71qA5WMpFBxUsICRPQHD3FZMa0DWOeY45YQct+O/G/n0ntyRLTmyhecY/lXCTPdwimcVfSadtgMpuZMNeLgK9K0MJwaJnAmxZ+2jrCHf4AUNQDzy0Y9y2AY5lY/qGeEe609FylC5o/GpkdmcJXiKo0NrxhilENUFmsNgVQYBussqxDCh6NdBGxKXdFPf0054stS6MP4rwKpq5SCb/xJoIXbtqQPwQ== 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=UnCgXCMPoieBYHi9QqQCw3FkX7fX/1go7H4/s/BCtbU=; b=gyRc9kje1uXdu3N1PwvhmWoM8JdGHqA0BYwF+lgbr0NULfR03+OxHm+7dDO0pwdl7I4F+7iPu0k+aU9X70/L1Krkbo8MoPYy72xvuMarrUP3ZZ7MQgLJB9L0R2S5DkCmQIcXlLikFZ56KZNL4A+V/NiXCkOqEv9P+hVt7vW6RhRXcN7cdKDW/0QjQRAMW39lvv/OJSN/1uXrCYdgEt8WDLi/dmI9SLzLYQh8JW8CMHahOrCkd7JS3sGU5f4lf8aI1Wb9VJ60oqkW8b2C9xFcOfBNNzMJ9FnMOTGJ3M3mLU0jL0zHJEayXJlwPAEyv/P2JAEtrTqrN94UUz6E/wtd5w== 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=UnCgXCMPoieBYHi9QqQCw3FkX7fX/1go7H4/s/BCtbU=; b=HfdpPV2IKFg6UfQO2n5vQKaWvaT/EF8ymoIYMghuY2JA4eway74+xckJTfBrpStqS9NZHGA3JiZAlf0AgUqKpglYf2WXFsO3qC/LFdicngd8w/4tSypm88DM9B7w4P6ICvOPaxVk30w2XFjU1K6GkJv+7Cb7B1Is1OVvZBy3P9Y= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 34/36] block: refactor bdrv_child_set_perm_safe() transaction action Date: Wed, 17 Mar 2021 17:35:27 +0300 Message-Id: <20210317143529.615584-35-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: 7125bba0-4687-47f0-3999-08d8e9521aa5 X-MS-TrafficTypeDiagnostic: AS8PR08MB6216: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:161; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qXzmPTsWBsj2nwTtMcUWt6rn2lAlvAqId/eer2C653zuyQdHpO5+naCs4pom9zCiB+5ifvND9FgCGBawqKRfUVBdHIULGsZw57RWLrCgDq2zUjwynJK59Ui7cv/9SHGIrWfDGZVMTC549gGvUhemJipeXnZec0Ypmin5OsEsJPVaafLP9zHE9EhaLEa8EX0tLLDD5keLfIEZBiZvy/WfAtYkGYYslHa+UVNmhOSBKIVJ80aZQdEE3CLbymHzYCzDYGCF83OL0ZdpHmsOQQgi7ToRKY8LfZJGSnykRY4nShD4MWQRO8ES1VvE9gw9Wnrin4402OuS8f+ey12VmRE3uW6ZJ5IOET0xhgftQib/oScO0igEuAtWbFswE9aVhUUNolutBkAYaljdb98ksIMreTWrCzZHp/URkZLetg6ObE1BocShROwNCJ0YlsRhjPUTl485YgKoLxjnp+ZT+1d7ZxwJ/7IYJwl+Sn7jnpmfN2HA4Iq5M4V1CPiz8xW0IQBW0X2DF9ZEdlruhtiizS9Rzwlo/wdSV8FHXbX+a76tTRKMaWqzPtp2tz/zeZ4hjGDWi/SoQAtP52RZKgypni0xskJhcZmIlkLpnjO2neJAnwbw1+GqYE6zqqVTny5GIER3 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)(366004)(346002)(376002)(39840400004)(136003)(6916009)(83380400001)(316002)(2616005)(66946007)(6512007)(66556008)(8676002)(956004)(26005)(1076003)(16526019)(6486002)(186003)(4326008)(36756003)(8936002)(2906002)(6666004)(5660300002)(478600001)(86362001)(66476007)(6506007)(52116002)(69590400012); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?2Jp+JR++dA25HoGJu0Opywmx9X2CIo12rmu0ThyKIFZ4wL+c2Uy9yBvIWVDp?= =?us-ascii?Q?pdDZ/pftRf1V58Qarh3tQY7Lik6FxH2k4tc9BIe6/6WTi4zLFUVjGiyIiA4s?= =?us-ascii?Q?PNW1YemZvwYWZZ5wBqwX9FvzV1aJaaB/gFq9CeeaCNFp9jx9xlwUcXRCvF0G?= =?us-ascii?Q?1X7XvbKGEjZQZVoWnhavGFSbP1rkNKSYR6664xu17AQLSa+GB9PWW9jZU3Sj?= =?us-ascii?Q?NgMz0+gZrreKIjOFgYRiOg62gzBUJj1zOMsGqHp2EriVNRYLX2Pwrx0dHuK3?= =?us-ascii?Q?6+65vpJJJE8+9I5zoTEjBAn0DPkUiR4DKNsEPdZajtEqEI1CuY5ec4EjULaD?= =?us-ascii?Q?5+qg/rlMILm9EOXQeCdUhcHkTbh2pqPQM2h2jRVmCJKK0Zl10vQ81gWx+Hk+?= =?us-ascii?Q?Eeg0CivRNBr6Y/0zRiRAdILxrMbVJw7ARcTWmDPawYvcfwyX5XMMKpTHdzVg?= =?us-ascii?Q?fJ4KQrbD5XX9voO/FqDNc5EAgnWwniUTIS2CCzPoAWzHWdrOzXEqtBHFx0/U?= =?us-ascii?Q?Mkgydm3zB/kYw1a4Y/iz7fptWDu0g6m2qutcqYoTd73E66Dq+EX0Suo0syfY?= =?us-ascii?Q?ZahElu6QXokfQw3Qb/+kYYc8Pj0NZF4AQQb3DJTz5n0vMYcX5pf6NGiXoFT9?= =?us-ascii?Q?3I0V7ilPe2Gl2mWpRlsB8bz3W14M5lQrecIrdbPW+Bu4iGWmhgekSZWh56E3?= =?us-ascii?Q?+ErOnYgVlHMlHfBeK3xN4hr/M6rwmpwK7OPHxa1KnzEMy1BqObLkCJ6RI8eQ?= =?us-ascii?Q?Hi0OTytFZSE2z+FgeHYq8y3k+UqnAfAXKS238z7bYK7oUcaY+jRysR0OggFV?= =?us-ascii?Q?EVlTZ9/ksob/ElOW2fUdFnaKoq0Zy8++f72PKRIOAWc1iqHHNRu9NZMVnzE2?= =?us-ascii?Q?M+P1Qe6XAKMjWCdIti0s3uNhtmDl8Y/pV+wF++CJDKo1rhg3PAV9i0ije4sd?= =?us-ascii?Q?cixhdktiTlbF+kVuTGtpU+OEUZxfXNO8QqX/4H4j3s7Q4IjEuv4wEZhWR+46?= =?us-ascii?Q?G9cr3v9QgWU7q3m1ZkEO06Q9yLiKqOfDAgnP/V6atqpU3VQSISg9DD5oxUJe?= =?us-ascii?Q?uT/N9NU1gN50cxxcyZCbqUXeYKkIn7ygOtoEuI2r6mwLW9joP2ANs4O/VYpD?= =?us-ascii?Q?iiER9p14FuhOQyD/6ON6JR+Iz0HMoyQ+3k896RXbVGnqgE/Qq9nOBEQNz5CH?= =?us-ascii?Q?xTutXeLcYIVcoQpxdwPbTlVRD0/V23bCp8nz98gZGzj2Q1qP2kXsYnVD4iXH?= =?us-ascii?Q?FVPfO8n9KNpkifB5hGx/fMnfceRYabzs10p/nspLpTTtOeOfNs4/4Sl4vXnh?= =?us-ascii?Q?DEU35eSH/8TJAdHx7YZpN/eD?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7125bba0-4687-47f0-3999-08d8e9521aa5 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:51.8233 (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: YbWhuG8i007YZ/iXgH4xA3SZhFHFhT4dFKwne+AE1MXtir/fJYgVHdw0rd9F3f8wwtwRZs2H2MrLkSkQX04MypyZcL6bOZFmUA6gGPT3Jd4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6216 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.20.128; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-obe.outbound.protection.outlook.com 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" Old interfaces dropped, nobody directly calls bdrv_child_set_perm_abort() and bdrv_child_set_perm_commit(), so we can use personal state structure for the action and stop exploiting BdrvChild structure. Also, drop "_safe" suffix which is redundant now. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- include/block/block_int.h | 5 ---- block.c | 63 ++++++++++++++------------------------- 2 files changed, 22 insertions(+), 46 deletions(-) diff --git a/include/block/block_int.h b/include/block/block_int.h index dd2de6bd1d..c823f5b1b3 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -813,11 +813,6 @@ struct BdrvChild { */ uint64_t shared_perm; =20 - /* backup of permissions during permission update procedure */ - bool has_backup_perm; - uint64_t backup_perm; - uint64_t backup_shared_perm; - /* * This link is frozen: the child can neither be replaced nor * detached from the parent. diff --git a/block.c b/block.c index 707a8a7f8c..b7cded9826 100644 --- a/block.c +++ b/block.c @@ -2101,59 +2101,40 @@ static GSList *bdrv_topological_dfs(GSList *list, G= HashTable *found, return g_slist_prepend(list, bs); } =20 -static void bdrv_child_set_perm_commit(void *opaque) -{ - BdrvChild *c =3D opaque; - - c->has_backup_perm =3D false; -} +typedef struct BdrvChildSetPermState { + BdrvChild *child; + uint64_t old_perm; + uint64_t old_shared_perm; +} BdrvChildSetPermState; =20 static void bdrv_child_set_perm_abort(void *opaque) { - BdrvChild *c =3D opaque; - /* - * We may have child->has_backup_perm unset at this point, as in case = of - * _check_ stage of permission update failure we may _check_ not the w= hole - * subtree. Still, _abort_ is called on the whole subtree anyway. - */ - if (c->has_backup_perm) { - c->perm =3D c->backup_perm; - c->shared_perm =3D c->backup_shared_perm; - c->has_backup_perm =3D false; - } + BdrvChildSetPermState *s =3D opaque; + + s->child->perm =3D s->old_perm; + s->child->shared_perm =3D s->old_shared_perm; } =20 static TransactionActionDrv bdrv_child_set_pem_drv =3D { .abort =3D bdrv_child_set_perm_abort, - .commit =3D bdrv_child_set_perm_commit, + .clean =3D g_free, }; =20 -/* - * With tran=3DNULL needs to be followed by direct call to either - * bdrv_child_set_perm_commit() or bdrv_child_set_perm_abort(). - * - * With non-NULL tran needs to be followed by tran_abort() or tran_commit() - * instead. - */ -static void bdrv_child_set_perm_safe(BdrvChild *c, uint64_t perm, - uint64_t shared, Transaction *tran) +static void bdrv_child_set_perm(BdrvChild *c, uint64_t perm, + uint64_t shared, Transaction *tran) { - if (!c->has_backup_perm) { - c->has_backup_perm =3D true; - c->backup_perm =3D c->perm; - c->backup_shared_perm =3D c->shared_perm; - } - /* - * Note: it's OK if c->has_backup_perm was already set, as we can find= the - * same c twice during check_perm procedure - */ + BdrvChildSetPermState *s =3D g_new(BdrvChildSetPermState, 1); + + *s =3D (BdrvChildSetPermState) { + .child =3D c, + .old_perm =3D c->perm, + .old_shared_perm =3D c->shared_perm, + }; =20 c->perm =3D perm; c->shared_perm =3D shared; =20 - if (tran) { - tran_add(tran, &bdrv_child_set_pem_drv, c); - } + tran_add(tran, &bdrv_child_set_pem_drv, s); } =20 static void bdrv_drv_set_perm_commit(void *opaque) @@ -2333,7 +2314,7 @@ static int bdrv_node_check_perm(BlockDriverState *bs,= BlockReopenQueue *q, bdrv_child_perm(bs, c->bs, c, c->role, q, cumulative_perms, cumulative_shared_perms, &cur_perm, &cur_shared); - bdrv_child_set_perm_safe(c, cur_perm, cur_shared, tran); + bdrv_child_set_perm(c, cur_perm, cur_shared, tran); } =20 return 0; @@ -2432,7 +2413,7 @@ int bdrv_child_try_set_perm(BdrvChild *c, uint64_t pe= rm, uint64_t shared, Transaction *tran =3D tran_new(); int ret; =20 - bdrv_child_set_perm_safe(c, perm, shared, tran); + bdrv_child_set_perm(c, perm, shared, tran); =20 ret =3D bdrv_refresh_perms(c->bs, &local_err); =20 --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615993740; cv=pass; d=zohomail.com; s=zohoarc; b=k0u2caFbkMYalrATBJs7n5h2tNM6B9dbjmbIVWb+RqEvf2Bz27Es4cJUTw27HgPIbkyhe73N426DWSmHp9t5rWjE1r8i1xia4BKNRRr5hJDryC9GQumxvQEOfcj1Qm8FI8UVENKbhP2uAJlRVEuM3zZ86yRK3FvRBckeVQXLppo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615993740; 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=FPUokNKOKbWECSPxb1qlUyjrs24bumzgZlODWy5G3T4=; b=jKnzQ67KdgdGegkfxDG/hpnGSvA5M6pa4cKtEm8WVFBeQXmilYwdB/inAp7iOsfa6fmNE1WVv8fUKXH5ef1nEsCUlw76/jHkWCPVf60z8Bkcw1BptlTJmkNSCSomp60Sj0HY981YkHQqt/8s00ifCY6vZLVvPX9n6XVYIA/qaq4= 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 1615993740837187.1695124979766; Wed, 17 Mar 2021 08:09:00 -0700 (PDT) Received: from localhost ([::1]:60498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXnA-0006BG-11 for importer@patchew.org; Wed, 17 Mar 2021 11:09:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXIL-0005Tv-UH; Wed, 17 Mar 2021 10:37:09 -0400 Received: from mail-db8eur05on2106.outbound.protection.outlook.com ([40.107.20.106]:39072 helo=EUR05-DB8-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 1lMXIK-0007Ew-52; Wed, 17 Mar 2021 10:37:09 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6216.eurprd08.prod.outlook.com (2603:10a6:20b:29c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:53 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:53 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mqci2ePgushn6xM9d1V/NmV36wMJ8ZEsT/NxK/puaErSccBmb4S6ZUSwwihuy6tjmqQuYJ4bxkx1Yiol/4iE/W+TinG3L6dgUqxr/wSRjY9K6qb2pKD/Y3SEyE3Jf2v/7GZpjhqoeVxJgxxnOYwog5RHKXdc8PadV6fsQmOHzW9Wl+EAvrt1cDlZjxLNT5yxqZw5u/UCQyGX4M1BnIs09g+AMkIxV6yRNoZ+4Oki3VXJtTmWMBAFd3CcXwqO2NnOOsJgw81njng4fRTcg8M1nrqQQitXc0uyOdTvLnzZ3rWE2H+4M6mPGICfkO/TEwrPKd4XTmX5Vc0rsuVtvVVLkw== 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=FPUokNKOKbWECSPxb1qlUyjrs24bumzgZlODWy5G3T4=; b=D6RBozW0SRPLR0aBuLl2he7l7AckLjuzDQUI3fp0C4NAEPZkTSkhmzggdBnBVzZjPSDM5qhpyZD31oy7AigzPPWdMWA0iTLYU4d1tG0bqHUbW16LQgopuUi+xXJy6w2BAjhUpPccMlpNFHFHHnfxpRtjLZ8VV83yq3q89ce06NhHYsiy3EF9BMSDVrbIHkuplxIFN1X1VORxRwFF6CqC10ZV5/XxioccD4RRbE65chgFIgWPFJiFALs9j7gwRU6ndqt3BNP1d3G+cZnzlypzvEEKcULbv8stJMgBhaXJJYk7DRYsrC9cjPnI5hCpDvupkaOtXEJT0Uqz9sRfw3W4sQ== 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=FPUokNKOKbWECSPxb1qlUyjrs24bumzgZlODWy5G3T4=; b=tKANK6MwbscHxBpNIp1oF4j+0h+fNHDWaHTOM5lPHhdLS9tFnoZFOjSzK+EdBEe080x7upEglapYnX0RnCSO99qdhYbYuZX5yqZNtEyAPVb+KGnUIox4jDMf4YbH4mhoU6Q6w+h5KuNbst2oSvLy8PkoSRnoUx6VwPI3V5X7A+I= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 35/36] block: rename bdrv_replace_child_safe() to bdrv_replace_child() Date: Wed, 17 Mar 2021 17:35:28 +0300 Message-Id: <20210317143529.615584-36-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: dd9562b9-3bfe-4ec7-8228-08d8e9521b75 X-MS-TrafficTypeDiagnostic: AS8PR08MB6216: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:24; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Mb+ra+P87ctFRcz+bAgFrTHW7VJxdt+AS+nDgaWyOntkNjaee/hOCaq+IUtD/35KwllSP0/gBzkkTzu4ve81XzbgcpVZU03X378GWb0hBAVdPfor2h0qo9dh7SUHf6OQknzfzNIe5WJdwXEBB2Fiy9cmXBIpk/UMelrtlJzpL36PdXFKrvOa+Ti4AOR+riop6vGOltccf395mz0jqIo+nwQA/yvZKL3v5VfKYeNhtRdxkgNyUbznDhsE0nY3BGHF4P0ST0P0ySfwJip5cgfDoEYbz240P3TxrLjPinfWBPUgcBKZfyWT2s/3f/QbjYh3FBdQky7n1FosyoV/hJk6NV4vGQ6R35THhL3qdGD9pfBHSXdliCS+6C5D3z8TfFKkGsaZYQpS2Zd8IkMXDrXROA+kL+pMKjokjO2y47sNsoAgsycGILbfNHqLavixllgeFtPb3uF1BcVxWQs26RvGFmYvsYO0I39B8nZLLmo7TbtuJ1553E9yr1vdKocIDYzE5w646wLNP0LgnzE/Wp4m2EGpNIC43Qolq9GN5LpxaxjDV2QifSxp7STKoIZ3xpf71obeC339zGV1u/hdHhmk7T01JTt3ZeFByBk0j5ZlgDMrQ+81ZPWYTQtmTwxh/9Za 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)(366004)(346002)(376002)(39840400004)(136003)(6916009)(83380400001)(316002)(2616005)(66946007)(6512007)(66556008)(8676002)(956004)(26005)(1076003)(16526019)(6486002)(186003)(4326008)(36756003)(8936002)(2906002)(6666004)(5660300002)(478600001)(86362001)(66476007)(6506007)(52116002)(69590400012); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?tQZ6azNc6qo1HQTTsT/In3i7sLB43TqiriuVHQcjx4AbuTW1Z1RUF47Xj4WR?= =?us-ascii?Q?POC+H9lkI+PefwdduBNaFBOkXUOq8i08GtPp4ESItOxjPxQv2x1kUIqDOyHo?= =?us-ascii?Q?lAEOazQABPye9hTWW/CAsaTpLX1rRDkdKKjF2k6y6+jxuK1i9P8OlONjjO1/?= =?us-ascii?Q?A2X8BuEgu2MenKeIlzOVOqcK+mT4IXDL3gad4EA+5Bau7GclF+Ctn/a5o27U?= =?us-ascii?Q?7epuf2mUkD1MsyBl8csw6oeJhR30Hvre59t0+rD4RcpYkioUgjC/V3jXxFKk?= =?us-ascii?Q?0Kwppm8+zz2R1QZP9bwBjsi+ysesdwB2Wem2LT07rL217kowqmoRovpSxlCh?= =?us-ascii?Q?yiSeH5dh25ms2kt1dVi0Ie+rAuQKbQZXi0ygzBOpMXzNGBhOuUHPhnul8dnc?= =?us-ascii?Q?gqWGVxCjtc7+QSB/ewHRpU5Unxn/mQbRQBXeoBnxFsCjLGV7J18k6Eaco3zV?= =?us-ascii?Q?bwjcLJb80syzq09grQK6TOu4YeGFv7HIxv1agNT+N/wcokNGey3+uRURHMk7?= =?us-ascii?Q?HDNV9s/bZyblgf1J8ZKfZuTjyhBtOWqXUzeP/EKIaLaXU0qXXezK0ZtS00OE?= =?us-ascii?Q?Eeq8rVe44DJ6WO0ctB8o/StROAjx9XYkXnaUmnFE98fQp4FGSFjlH+Cfqg+c?= =?us-ascii?Q?KB7mX02j1VfHOv8fbs1iftD6ELFD4bOQgbyzOxqIKp3+jj9FhFS0ATXHPMYp?= =?us-ascii?Q?Pu6BwOOf/PAH9LllQQhkuhP3shahIL3cyEt/oZbYDYB6DDTA3oFlZCxpCahe?= =?us-ascii?Q?+xiVfq79Qu1jQyA74DzS3xn4RTr6EUu9RtRqGhn8V3tOXGsWH4LO9waSk9WS?= =?us-ascii?Q?pb0jLYd+gi/E9TvxSUx5JBIYSWUhpjz1JnJwbnKlzilCvSp7t5ABnMDRHKWI?= =?us-ascii?Q?foSgzaNGqByhlWUGXDSCFgUKRJur/PfSCwFrRFY5nQ8yrryFcG/r6bBFnERb?= =?us-ascii?Q?h5Nk4zHC9gQwjTi7NK/XY+uAmlnX6H6Ru6qDxbEmC/h78NE1pvclWR3yvryT?= =?us-ascii?Q?YblOOKzI7f9zd0YyZFtOurlVOx06VGeKRsgZkjkJPbLGddRoHDV77OLXup9v?= =?us-ascii?Q?8ceaobnodth49DbF34lc/ARAmb+j8RGz9qWfPRdy1LvjMRK5tzd16FT3QJEP?= =?us-ascii?Q?upf7ntFJKvOKJEaISLxvS0ykSF46IIVWBpzfDKvArWG/ZMHBVgFNGrKT95/l?= =?us-ascii?Q?1vbX/+sY11BnJE+f+/TJJMCuOXoB2w1Cx6rlDei79uMuY/GrLWJxVR7O74Zw?= =?us-ascii?Q?N9zx0YBad5VVYGeZxYG9Ys+6zZVDkYUEfLaTXjB5B75xVKTEFAdjwMs7CKRe?= =?us-ascii?Q?gCQK4x+GcN3b17ggFd6B+flU?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd9562b9-3bfe-4ec7-8228-08d8e9521b75 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:53.1963 (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: zkWo3mGI81Rldx9aE3uzM79YjcPhS1XN4W63xyoLn9xEnzZhWHlpz2sFLsAPx7Ds7S3NbOutD21Cqg+RUsOvHfWI3R/k/hU7r0GVgqluhXs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6216 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.20.106; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" We don't have bdrv_replace_child(), so it's time for bdrv_replace_child_safe() to take its place. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/block.c b/block.c index b7cded9826..b61ac9ff19 100644 --- a/block.c +++ b/block.c @@ -2214,12 +2214,12 @@ static TransactionActionDrv bdrv_replace_child_drv = =3D { }; =20 /* - * bdrv_replace_child_safe + * bdrv_replace_child * * Note: real unref of old_bs is done only on commit. */ -static void bdrv_replace_child_safe(BdrvChild *child, BlockDriverState *ne= w_bs, - Transaction *tran) +static void bdrv_replace_child(BdrvChild *child, BlockDriverState *new_bs, + Transaction *tran) { BdrvReplaceChildState *s =3D g_new(BdrvReplaceChildState, 1); *s =3D (BdrvReplaceChildState) { @@ -4762,7 +4762,7 @@ static void bdrv_remove_filter_or_cow_child(BlockDriv= erState *bs, } =20 if (child->bs) { - bdrv_replace_child_safe(child, NULL, tran); + bdrv_replace_child(child, NULL, tran); } =20 s =3D g_new(BdrvRemoveFilterOrCowChild, 1); @@ -4802,7 +4802,7 @@ static int bdrv_replace_node_noperm(BlockDriverState = *from, c->name, from->node_name); return -EPERM; } - bdrv_replace_child_safe(c, to, tran); + bdrv_replace_child(c, to, tran); } =20 return 0; --=20 2.29.2 From nobody Fri Mar 29 08:09:31 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=1615994155; cv=pass; d=zohomail.com; s=zohoarc; b=fQlGIvAgyPDIBuBAi1Edfa9IEOUf2ZRjAy/CINKNi4w7fwMQWFMJ5U6Ie21r6He7iFPw5rTsMtbAFN0fHrb4Cgf0vzR6RJmiMERPyfyWWN6xpFDyA8Rp495U00uph82IyYkN6IyGLhNtvSCWZM7fnLXvPg84T6R3yvuABZ362Ss= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615994155; 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=Uf2kObg2JOykYZkfMlchJRq1hql2HSNxsoDM+Orol88=; b=gOw/dI9Rg5NO6ZLiZM4jj4ePgmbXVAbeE5lCII8Bvgf9wL4/DxVFh2vynVlaSit4P/8SnehuC5n+7Zfh12WB0KxnHrLPbpbCD3zF1f7OlSJQRqREq4T26u28QQ+OpZXathXJZMor9vIB1y1whEIIcZ09K4u+GNbxXnOafwqefdU= 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 1615994155935139.00384238395077; Wed, 17 Mar 2021 08:15:55 -0700 (PDT) Received: from localhost ([::1]:48412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMXtp-0004pA-Ra for importer@patchew.org; Wed, 17 Mar 2021 11:15:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMXIO-0005Zc-2q; Wed, 17 Mar 2021 10:37:12 -0400 Received: from mail-db8eur05on2128.outbound.protection.outlook.com ([40.107.20.128]:5633 helo=EUR05-DB8-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 1lMXIM-00079x-2a; Wed, 17 Mar 2021 10:37:11 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6216.eurprd08.prod.outlook.com (2603:10a6:20b:29c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Wed, 17 Mar 2021 14:36:54 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3933.032; Wed, 17 Mar 2021 14:36:54 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:36:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O5RyMQJvSogcpgl+DZZOgbLsfGz1XD2knZhJDoxMqBFAkar5v2bS+NCNH8ovlaJIUwS/1hb0ISVHntpLeAkdJS6/zC+YaDR7RhAIDVmTTvn38czPf+NSNgX4PPKQOAK5pH+UU4e9e1zYV3/UonL4mwP2wWFE0Nuc1GfNBMtfAdUHkXhoABqSbNpU2lj7n8qGiA/jifytR05P0U1hy55YYC+BCMP6zfTMOBJbqTMRxDTiTTAE24JvH1MRdr6TGVjUN04l8ASFTscry3hPx/HLrBi0se5bzKZbz7CnR1pDnMC1Gj6F47RN5e2b0f0yd0y9z3uHe2IXlzUR2jkqskephw== 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=Uf2kObg2JOykYZkfMlchJRq1hql2HSNxsoDM+Orol88=; b=hwFKMZ2vrhva92H4pwB81eMZbknnDu8UunSEJAf5dmKTU4LeGhX9fUFv5ZtgD/ySqwR0bR52Kj6D/y3Ha3Bn31NJgDZ2P+JNMxLgwYOx5q1Dm3XB8nWK9nljHOXVukVyUtuId7JELLeCBkrM9lepdSS4UMwROwgvtDvv7myOBAFVeuQ2+O0S2/CRct3n31nrJkHsncT3HJw+LpsPzND6TidivX37z3ZttILmElduG+c645+UsZrYpt5YL1Elts2Bj0EXaUxwkr/ifwlw2KCpS77vLKhyXQo5icq96gHbK5mIxOPfn6fbw6m+dhpBpk69FHI/yzzuajnnNzB1I47EJA== 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=Uf2kObg2JOykYZkfMlchJRq1hql2HSNxsoDM+Orol88=; b=JY5JdQW9ZwT4A4LFQTeyOCdSnO53FoqtPe/07SH03eOZsX+8j8NBbdRa1Dye/u29EVME1T5Cvl6JlxkCAQ7RHSSOmZ6Ki45uYPgIBTI6iekRMKh04dnUYc2IvEkjgUO2OqwyJzLD1EAkupdMrn/8TeTVTPH8OtXVXoVF2xPSJlM= 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, armbru@redhat.com, fam@euphon.net, stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v3 36/36] block: refactor bdrv_node_check_perm() Date: Wed, 17 Mar 2021 17:35:29 +0300 Message-Id: <20210317143529.615584-37-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210317143529.615584-1-vsementsov@virtuozzo.com> References: <20210317143529.615584-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR0401CA0052.eurprd04.prod.outlook.com (2603:10a6:3:19::20) 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: aa181db3-aca5-4b64-8d39-08d8e9521c46 X-MS-TrafficTypeDiagnostic: AS8PR08MB6216: 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: GHaFYcjtL6TnNOLyusWjsHIvhQ0EN7rKo3uXBuUjRb+HrdDLYKRRJXxZGeawO3H/FDyddb/EETU4A8nSPe9cxKuvz/N2rQ7UGRG3ds9mmmSx21n37du4aO+4a107VxKGYTPlLIgUbZ7wovvIdyFkBNlci5m2wl5Xg2jLZV8ziGq3Bnq2nclasGrtsQVHugWVJFJl7vJus750N77H6aMWnhAWr08H97d9gzAh6z6ULUU3MhxYfLBVWp4alUdUA2t3vEnGfzwVhipave6FnZc8reCjbWmEip2rElsKqfJppKDFTkSEhV01RkpQArHRUgc8rflwc92ZY1e9KAcmSnZAOysuWt0Hn07H/dtH3HU2jToTqEHpgbYkOB8qZ4ANQ1Xa7oOySxSt+bZ6bmG+KCcUDwzFvtuOc31tN8Jwdt4s2n6BOPSs61JCwiXDnHTKI66xR8boaYDQwLzeMGRW6n2gDjB8rBeoDDrPBmPQTp9ErBEmgAs6KrJ8+VBUwOOXoWAnZFO3oli+l6/B1LHU5odVh3yGWz7HmeTZbGGyij1R8dKsTrGc+OgXqqLO5CsL8D3c5j5sRo1OmcsBYPdsjT8MeajgBaFI8usmBRsZNz50gxdU7MoEIOxZm/y045Ge4CBp 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)(366004)(346002)(376002)(39840400004)(136003)(6916009)(83380400001)(316002)(2616005)(66946007)(6512007)(66556008)(8676002)(956004)(26005)(1076003)(16526019)(6486002)(186003)(4326008)(36756003)(8936002)(2906002)(6666004)(5660300002)(478600001)(86362001)(66476007)(6506007)(52116002)(69590400012); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?7D0+XH27D56CuqHCUjRTGUmEqjW3aGGSoTS8YUrxRslcv2cVGOISgGpMrf1b?= =?us-ascii?Q?mUnTLtzveE2fiDefB0/bjUGmRLCwtHt/mxK/HyA/YKYlhKasdOgMmKPzFIMj?= =?us-ascii?Q?vyNnj8eZ97PIfAUPvog2zRqY9GIEEY2OVX/uVKyu6fKwnCtGQQNlEOFMSgRs?= =?us-ascii?Q?ycP9omYcBXES3XdP4e1/7Vh7sEIzm4CbuBpz9U95kGcH6Lu1aKoMx0vGGcld?= =?us-ascii?Q?2m0FMia/vsJq+v7ugs+0OVcmXcIN4x2oA4dTu1FGloUL4AQbWTTUjPo4BZUd?= =?us-ascii?Q?XWyGoTAQwUhcjU+vSUaGWWFjuJtDMPizscIU+wgZibAfyuz4esY3tx3rOAmP?= =?us-ascii?Q?rGDxBq8BcGdGB4X2Xvb7ul3p4JZA+kZavi6GD34FuzLnLNBUA2WEkaxuOjN9?= =?us-ascii?Q?4vTd5UoIjXpFiuuBWezgXrIbRmgSGvtcqjh/k/BfB9/Y8wNpNkXILnd0BYtt?= =?us-ascii?Q?4WunuDG6n4t2a/i8bYrKblkrp1yCpiGjcz2ENAUokPB6v4FFDwVepmp/pgNa?= =?us-ascii?Q?6QR3ZS05O1Fj3j2PzD2L1Pd1ixCqF2TaSzLkZF3HgFU2BMYKpNdR9r8EKVXc?= =?us-ascii?Q?ItQ4QL8f0NALYmyK8AuvfrgGwVN7/c80CkLG3ZAN4qqbxBFZ4X/bHmqqEplS?= =?us-ascii?Q?yM/S1a4scB1iWt0zwxhjBY/Wj8uBm2fq1mxv5y9r5jld2fjuYyxZtesP/vi0?= =?us-ascii?Q?Vk1WW2p8aQTOUHjgNzFF1hmsBL/LBhXNPDCkvLNYjnZjCKPjBXpdmTZil4cL?= =?us-ascii?Q?3zisOpoOQF2OcgYxjJdzOrSytV+mX+UyiFWwcKTB+ydbNxLSy3TU2KKBRvAk?= =?us-ascii?Q?xk/si/Q+qzx6j+4MCWEhh+S9IbfG3mvmpRtW0yOA94ETD4aC7MwEy+ZSVHsF?= =?us-ascii?Q?IEfxfBWKTHWf3LLZ44JBm+EcaMyY1XIQHoKQpGJbkSJstD1ClLD3vkICaZSv?= =?us-ascii?Q?VG/zQTUKwODA4VEY+hHbIA+ZA0KBk1d/vlqB4dAQYB0/YRcBHcVnCuECjGwn?= =?us-ascii?Q?FC3pWXw7hW63mAlVpZ9HkvgzG07aGh4I50Fk0dMWoHY+4nqcTlo5w+rMEg/g?= =?us-ascii?Q?5QR7Ons6Ik6ddIvfad5WEcjaMEgIXr5Eco6RPouU9muiZVLa0ApD35rseAHV?= =?us-ascii?Q?i3onojY4zkVcj7AC/7CZmCX78EuzicrSYpvfc6Z3QG8OpunYJlLsvuWPwd26?= =?us-ascii?Q?IAbb/f82qDr1GS20R3kaoGYrQi2oZDTQ2Uhe1TovvMsBQ4NGEjv2DJaNUttO?= =?us-ascii?Q?OvjWO/uRRmiJTy61S25evzHruI8Tsq/aTCsRsjCXZxUUXn92Fbe3N/HXUK9c?= =?us-ascii?Q?OrqoxHXxnudrS3Ehrli5urvj?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa181db3-aca5-4b64-8d39-08d8e9521c46 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:36:54.5643 (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: TU12grWXU0BVRiXQZ4DhrnQGT3gyzOAv+1E+4BOez7HEKnobMJ2YGoZ2arGIdOTcEzsTFQiugpmQ9cBL0oF9PfLYtcy2I+NUpvFz8fqDVIM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6216 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.20.128; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-obe.outbound.protection.outlook.com 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" Now, bdrv_node_check_perm() is called only with fresh cumulative permissions, so its actually "refresh_perm". Move permission calculation to the function. Also, drop unreachable error message and rewrite the remaining one to be more generic (as now we don't know which node is added and which was already here). Add also Virtuozzo copyright, as big work is done at this point. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf --- block.c | 38 +++++++++++--------------------------- tests/qemu-iotests/245 | 2 +- 2 files changed, 12 insertions(+), 28 deletions(-) diff --git a/block.c b/block.c index b61ac9ff19..95d8246d92 100644 --- a/block.c +++ b/block.c @@ -2,6 +2,7 @@ * QEMU System Emulator block driver * * Copyright (c) 2003 Fabrice Bellard + * Copyright (c) 2020 Virtuozzo International GmbH. * * Permission is hereby granted, free of charge, to any person obtaining a= copy * of this software and associated documentation files (the "Software"), t= o deal @@ -2236,22 +2237,18 @@ static void bdrv_replace_child(BdrvChild *child, Bl= ockDriverState *new_bs, } =20 /* - * Check whether permissions on this node can be changed in a way that - * @cumulative_perms and @cumulative_shared_perms are the new cumulative - * permissions of all its parents. This involves checking whether all nece= ssary - * permission changes to child nodes can be performed. - * - * A call to this function must always be followed by a call to bdrv_set_p= erm() - * or bdrv_abort_perm_update(). + * Refresh permissions in @bs subtree. The function is intended to be call= ed + * after some graph modification that was done without permission update. */ -static int bdrv_node_check_perm(BlockDriverState *bs, BlockReopenQueue *q, - uint64_t cumulative_perms, - uint64_t cumulative_shared_perms, - Transaction *tran, Error **errp) +static int bdrv_node_refresh_perm(BlockDriverState *bs, BlockReopenQueue *= q, + Transaction *tran, Error **errp) { BlockDriver *drv =3D bs->drv; BdrvChild *c; int ret; + uint64_t cumulative_perms, cumulative_shared_perms; + + bdrv_get_cumulative_perm(bs, &cumulative_perms, &cumulative_shared_per= ms); =20 /* Write permissions never work with read-only images */ if ((cumulative_perms & (BLK_PERM_WRITE | BLK_PERM_WRITE_UNCHANGED)) && @@ -2260,15 +2257,8 @@ static int bdrv_node_check_perm(BlockDriverState *bs= , BlockReopenQueue *q, if (!bdrv_is_writable_after_reopen(bs, NULL)) { error_setg(errp, "Block node is read-only"); } else { - uint64_t current_perms, current_shared; - bdrv_get_cumulative_perm(bs, ¤t_perms, ¤t_shared); - if (current_perms & (BLK_PERM_WRITE | BLK_PERM_WRITE_UNCHANGED= )) { - error_setg(errp, "Cannot make block node read-only, there = is " - "a writer on it"); - } else { - error_setg(errp, "Cannot make block node read-only and cre= ate " - "a writer on it"); - } + error_setg(errp, "Read-only block node '%s' cannot support " + "read-write users", bdrv_get_node_name(bs)); } =20 return -EPERM; @@ -2324,7 +2314,6 @@ static int bdrv_list_refresh_perms(GSList *list, Bloc= kReopenQueue *q, Transaction *tran, Error **errp) { int ret; - uint64_t cumulative_perms, cumulative_shared_perms; BlockDriverState *bs; =20 for ( ; list; list =3D list->next) { @@ -2334,12 +2323,7 @@ static int bdrv_list_refresh_perms(GSList *list, Blo= ckReopenQueue *q, return -EINVAL; } =20 - bdrv_get_cumulative_perm(bs, &cumulative_perms, - &cumulative_shared_perms); - - ret =3D bdrv_node_check_perm(bs, q, cumulative_perms, - cumulative_shared_perms, - tran, errp); + ret =3D bdrv_node_refresh_perm(bs, q, tran, errp); if (ret < 0) { return ret; } diff --git a/tests/qemu-iotests/245 b/tests/qemu-iotests/245 index 11104b9208..fc5297e268 100755 --- a/tests/qemu-iotests/245 +++ b/tests/qemu-iotests/245 @@ -905,7 +905,7 @@ class TestBlockdevReopen(iotests.QMPTestCase): # We can't reopen hd1 to read-only, as block-stream requires it to= be # read-write self.reopen(opts['backing'], {'read-only': True}, - "Cannot make block node read-only, there is a writer o= n it") + "Read-only block node 'hd1' cannot support read-write = users") =20 # We can't remove hd2 while the stream job is ongoing opts['backing']['backing'] =3D None --=20 2.29.2