From patchwork Fri Nov 27 14:44:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 1407275 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.a=rsa-sha256 header.s=selector2 header.b=enN45Z67; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CjHpf3jZkz9s1l for ; Sat, 28 Nov 2020 01:59:38 +1100 (AEDT) Received: from localhost ([::1]:48316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kifDk-0000Bu-GJ for incoming@patchwork.ozlabs.org; Fri, 27 Nov 2020 09:59:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kif19-0001F2-8l; Fri, 27 Nov 2020 09:46:35 -0500 Received: from mail-db8eur05on2112.outbound.protection.outlook.com ([40.107.20.112]:40192 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 1kif0y-000369-8r; Fri, 27 Nov 2020 09:46:35 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DkhYSALyQ4szkvE0dbYVDfs3vqYQeVf7kkHS9T0dbdviSX6Q5+BrdkUtywFo9KLwX1U3IyhVqjU0drQzG5mFSlkh6JOw8ObDEl80Q3NzgxTEp1nd5M9pf8Sbwotz7TnARBp38bT1vD9Glbd2V3ZG+CJZvTdOQEhVvgm+SnwtgY4zhPMkDAMFDjyUuSeSG8f3+MI03QI9AQJaSIQIHcuIywtAAVBD282mZnTXWriBKaFf73QBBLBUgfy11zia7yiRAQt4viWzfdBH8ofgjIDEmOfdeMTVHPJl+bWRi/FmfjtX2Cg6Jd1aHDJxlgzpk8h+cvAjgfyJYXC3ZvEqXeI9bg== 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=gz5aFpP0pFNJf+XRHJeM2GHXaL6TNAk3uERb3fkjda0=; b=dcWpu9rkn4lMqGrbSijLQQBFfEPoRs35Fjos5NAwCG8CnLVHUGYWDBmO+0MoTT8wlM0PbiMjiwDRxsrckDQv/+qQBjPSDIGaSM6p9CzpVmaRmCzoHRm6c6iymrFgZS0JV25eNkiCzkGLRkGHNg9RyX+WM1k9OewEMGLNK7sA1MCMJV9FEephWDiJw1lsxfpplw0GoXJ0NhLD8/fP+tO+JFSqZYk8FuzxNynvEnOZIyBGW68fHG1Btx5tC2z4f4CFuCslQeLzV420MMkNh63KSxypL+P1Xtv8zJGy2C2PbAsfo1O0fyESN1KJxQH85+y8M3lvcOOUC3222kkX6j0PgQ== 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=gz5aFpP0pFNJf+XRHJeM2GHXaL6TNAk3uERb3fkjda0=; b=enN45Z67kfdMIAo7clRdyM9L9vL38sbr6dhQ18QX9gWkleh1YWaW3l2lTp7AyV45dnfmRij5bVRBrWTHBgZqLiJD5y7QjKYV5LlpKFXfuIF5LB4A3tXNu3xGL7AbbFAKb+aP6nvVUGHnWjbnkK8UZ2sH7ff4Fhu8AJfT8cwc+OY= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB5128.eurprd08.prod.outlook.com (2603:10a6:20b:e3::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.24; Fri, 27 Nov 2020 14:45:55 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::d585:99a4:d7a4:d478]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::d585:99a4:d7a4:d478%4]) with mapi id 15.20.3611.025; Fri, 27 Nov 2020 14:45:55 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, armbru@redhat.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com, den@openvz.org Subject: [PATCH v2 02/36] tests/test-bdrv-graph-mod: add test_parallel_perm_update Date: Fri, 27 Nov 2020 17:44:48 +0300 Message-Id: <20201127144522.29991-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201127144522.29991-1-vsementsov@virtuozzo.com> References: <20201127144522.29991-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.91] X-ClientProxiedBy: AM4PR0501CA0052.eurprd05.prod.outlook.com (2603:10a6:200:68::20) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.91) by AM4PR0501CA0052.eurprd05.prod.outlook.com (2603:10a6:200:68::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.22 via Frontend Transport; Fri, 27 Nov 2020 14:45:37 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: da371e7e-4ddb-46f5-b702-08d892e31afd X-MS-TrafficTypeDiagnostic: AM6PR08MB5128: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iZ2cZWL4Gf5d7q38yOPyzMnZLlP15hrkvhS+nQWl+xGmMYJphm7oTaHTNyC5KQTW2Vah2XJ2Ri3QpfysgnNcK7du0o4eq7epWf784GROanFaayjAjSCCkWbc7R0/brShmZEehsUpFTUsp/dekMyPQ2haLiWlMOESMRUwUOSGpbaMoIvsYg3WExASyFFMybFTScWSkTV52ebnlkxpCUdHkt0waNsHBEuNnUVrLHyMZQQ4Q3rIueFu2NntcPtYn6IJ5P9rJ1Tt0L+VDp5jXjevNBSN4LQjugc+qzZhpMbcGvJCzafDbp3hI9d3cPZHZKGhHZJoGgu8ZwIBNehRKVQONg== 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)(39840400004)(136003)(376002)(66946007)(66556008)(478600001)(6512007)(2616005)(66476007)(6506007)(316002)(26005)(186003)(6666004)(16526019)(956004)(8676002)(5660300002)(6916009)(83380400001)(2906002)(4326008)(1076003)(8936002)(36756003)(86362001)(6486002)(52116002)(107886003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?1Q/eIt5Y9B+JdMkCdr3MsvZ3U/fIun?= =?utf-8?q?rY2slB/QDBYaLOYw4JAk7o7DotsyfSRPuhqCijrMIkX8gsg4ixSgwqJMjDH+7fj35?= =?utf-8?q?u6lvo+9yS0ZLzbl51tbKdr98Q3o5+QRPiy+/sDMgNbFTUtlEPiKPFiyFu9ogmb9Bo?= =?utf-8?q?syq29Lw6gpTCmnLLYJsaFwk5C8CdffMoQA7YmNeqy6Z7kgVCqKfthTJNywrqLlBKI?= =?utf-8?q?mKysa33R5mudzTBB0+bc13BD7dJAiQzc2wIsQ0sOD+j1NBdQJMTg2VjxSBVqK4rjj?= =?utf-8?q?NHALwxgMgAKIhJ9CVKt/Q3wrmet38ITS5a/VtZH4BM0vbBLo7Auc8NYvgSQvoq1Q+?= =?utf-8?q?jd+86mYzfFlG2y0tKOVfOk/N/o8lgh1lAS/HeuJmyucYrXKOSXxPyG5QmMxb2BZDa?= =?utf-8?q?s5Ers92EmJ0DXNjlagJ1qJWhubGQdpv7S7PQHXgSTxMzLE4s/6lpRery7N7FGcglZ?= =?utf-8?q?wx6uy+goiKfmLjqzGWA9r1k6mZ+9Yb33p+UNaV4MKEkXWaj84np7p/d5r5qCG7wj/?= =?utf-8?q?Jhnk6vPVmyHeAn7NyIDfmddRSQ0IkadSDv4RVATYWoVatVBqnqP4PIudij0+OqcBc?= =?utf-8?q?u0LaQeXA2q1Ki9QC4H46Z2IZIkT+c/ev7U2TA1p6mkwhcqkPlFb47ZTyebHotOhVX?= =?utf-8?q?L5p0zihexZBfWxv5eBkxQMG7T9nyk0Wyso8QH2/2gaTBAZdRCAbfcFS9TWEsllul1?= =?utf-8?q?JZ4e3MjAIE0WhhF4w06Cmpq6AZmfe0G+ukI8jW5gW1Ebgqe0Onos8nNUbttL86gYH?= =?utf-8?q?iUQ+suCouXyLOgkJylsZNUSCLVUQoWa6/9EKcpn2zOzVDAiXIC+h69j19tXRMf760?= =?utf-8?q?cdOCx8TkNiMboX3aOYoiV4vCnr2ktGE2UShtGL3/roPHvYtzfoXn3sg6bxFXy6eLW?= =?utf-8?q?HByVxksMNiFx5ka4ut/ekHyM8ni5aKxHY3DR3EAlUbgftiVcrjWhT/fArh/BOHIoM?= =?utf-8?q?HYhGtLUnpfhUzlQ/wHA?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: da371e7e-4ddb-46f5-b702-08d892e31afd X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Nov 2020 14:45:38.2594 (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: RStrhM2bzQ/+98GWpGJCIkKeupzQKYBktgQNKe4zGZr8oksZg28a6ksiOeUbbF8qggCE3/Qh2SrZZ2vYGzwSsZtzfrKrKQf7+RphoCNwIxo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB5128 Received-SPF: pass client-ip=40.107.20.112; 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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: ┌─────┐ ┌──────┐ │ fl2 │ ◀── │ top │ └─────┘ └──────┘ │ │ │ │ w │ ▼ │ ┌──────┐ │ │ fl1 │ │ └──────┘ │ │ │ │ w │ ▼ │ ┌──────┐ └───────▶ │ base │ └──────┘ 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 --- tests/test-bdrv-graph-mod.c | 64 +++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/tests/test-bdrv-graph-mod.c b/tests/test-bdrv-graph-mod.c index 3b9e6f242f..27e3361a60 100644 --- a/tests/test-bdrv-graph-mod.c +++ b/tests/test-bdrv-graph-mod.c @@ -232,6 +232,68 @@ static void test_parallel_exclusive_write(void) bdrv_unref(top); } +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 == bs->file) { + *nperm = BLK_PERM_WRITE; + *nshared = BLK_PERM_ALL & ~BLK_PERM_WRITE; + } else { + *nperm = 0; + *nshared = BLK_PERM_ALL; + } +} + +static BlockDriver bdrv_write_to_file = { + .format_name = "tricky-perm", + .bdrv_child_perm = write_to_file_perms, +}; + +static void test_parallel_perm_update(void) +{ + BlockDriverState *top = no_perm_node("top"); + BlockDriverState *tricky = + bdrv_new_open_driver(&bdrv_write_to_file, "tricky", BDRV_O_RDWR, + &error_abort); + BlockDriverState *base = no_perm_node("base"); + BlockDriverState *fl1 = pass_through_node("fl1"); + BlockDriverState *fl2 = pass_through_node("fl2"); + BdrvChild *c_fl1, *c_fl2; + + bdrv_attach_child(top, tricky, "file", &child_of_bds, BDRV_CHILD_DATA, + &error_abort); + c_fl1 = bdrv_attach_child(tricky, fl1, "first", &child_of_bds, + BDRV_CHILD_FILTERED, &error_abort); + c_fl2 = 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_FILTERED, + &error_abort); + bdrv_attach_child(fl2, base, "backing", &child_of_bds, BDRV_CHILD_FILTERED, + &error_abort); + bdrv_ref(base); + + /* Select fl1 as first child to be active */ + tricky->file = c_fl1; + bdrv_child_refresh_perms(top, top->children.lh_first, &error_abort); + + assert(c_fl1->perm & BLK_PERM_WRITE); + + /* Now, try to switch active child and update permissions */ + tricky->file = c_fl2; + bdrv_child_refresh_perms(top, top->children.lh_first, &error_abort); + + assert(c_fl2->perm & BLK_PERM_WRITE); + + /* Switch once more, to not care about real child order in the list */ + tricky->file = c_fl1; + bdrv_child_refresh_perms(top, top->children.lh_first, &error_abort); + + assert(c_fl1->perm & BLK_PERM_WRITE); +} + int main(int argc, char *argv[]) { int i; @@ -256,6 +318,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); } return g_test_run();