From nobody Fri Nov 14 19:25:40 2025 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=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1589963816; cv=pass; d=zohomail.com; s=zohoarc; b=E3+eLOz0xd+3szFqfjFCAEBz+doUfUgRDWKIW6K3Nxw7GydJuKSjSnwqnbWzOV5yc72GYLDvvq4hxxGP6DaN9KIjfRyWXaOH4/3KCvE46Olh/deZOnbmSfnPGSL707EXolI4HzwXXFvUSaJ58VU8+FuYZYGt8FDtdlLCgSZrE/g= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589963816; 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=CS7xwXSl8wZJavrF3vXnDVu/RKNJMA3gGBFuTghOknw=; b=asz4kMpLw7aCyOzqdQUS5X/IjsWThenOwmWv4rxYjA2jSNQ58L2xbzzz0Vu+otPxOLe+NsWQcqbrMjbRKr9XP8Dk0HHjwMtzNo7bzC0p8wXp5WtwEiDw3+anh2UJMFh2k1UVK4mxeOBPA1AxAX4aEgHG/SoeuxEmmqXwrFHc3nA= 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=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589963815746615.9577234801527; Wed, 20 May 2020 01:36:55 -0700 (PDT) Received: from localhost ([::1]:46640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jbKDe-00036X-CZ for importer@patchew.org; Wed, 20 May 2020 04:36:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbKCb-0000gs-5q; Wed, 20 May 2020 04:35:49 -0400 Received: from mail-eopbgr80090.outbound.protection.outlook.com ([40.107.8.90]:21573 helo=EUR04-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 1jbKCZ-0005RQ-UJ; Wed, 20 May 2020 04:35:48 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5448.eurprd08.prod.outlook.com (2603:10a6:20b:106::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.26; Wed, 20 May 2020 08:35:43 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312%3]) with mapi id 15.20.3021.020; Wed, 20 May 2020 08:35:43 +0000 Received: from localhost.localdomain (185.215.60.147) by AM0PR02CA0092.eurprd02.prod.outlook.com (2603:10a6:208:154::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.23 via Frontend Transport; Wed, 20 May 2020 08:35:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q/VYUGyVSDTQn/8gWzyjEFdlrhAQ83orGYfX/u/YghMYENQjwSueT+tbJpmqR99thtOqIX/WFpF0+TVpJeIGlaRV+TKSWJbaryKN06a2DNTe+Aq3o/no68sKV3qiHPrHKf6JJ/Nw5o72Qeyb1OaC2IeSNYp8S6E/L+HyeyV1MEp2C6dwHZlBguKLJXbTt6sfxhkBPfBu2y2Rud3lP01FJc9Dxlm1UyWjASjmEm97OArljcnJFQHwJcvFSKmojcI+JVve7VmIDbzmf+f+teu5cpIrg1/6CY2BCx0c2EQ9yZz+dPrJn0kCJlQuDS1Q8t3DAq+upaB1aajkkw+BKIvGYw== 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=CS7xwXSl8wZJavrF3vXnDVu/RKNJMA3gGBFuTghOknw=; b=a2jgMVjv+o2VNhkqsl32/oF3mDoB0bR3DvkxqCCQVxBkHNg7PGsp85JOz+QmoTL9FFTy4d1/s2qY+6gRXk9m7jvAT1MSVGnJrTSMq7CwCXDhsjnLIYfMroa8yXHnwWloPXzbqABNcSryZUAXN4V1q1Pu7fU6egAXbOIb7CnYctIV2sR4/5/cXXMU+QHPb95sxfozetVa7QAVZpMEnBOyFDWnlVWwwuReRJ6G30HIYg2sizU3poUiGi4zaVDEVHmE2XKaDwjSpIG0KeWDggB0UDZ8MJ6by9OB+1PMt4bHbdeq4Vq32W0sWSqRuCdEIqi6ofW9txrwM6kwJKucppNCfA== 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=CS7xwXSl8wZJavrF3vXnDVu/RKNJMA3gGBFuTghOknw=; b=ZloAy2YeG41m+Bvrhkg2kuxfmJzB4PytepZhrO/43n2R+8ruV63b6xaPIt6S2DMIBdTaSUrSGLSYWpfDSsFFEaIoIGuohHNBotTfD2z8tkMD8epInZn9qYCei2tbDs3aVzpXkHDGogYEy5IM9qAkLyWi42flfuw8p8bmfsCAp9s= 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 Subject: [PATCH v3 1/5] block/io: fix bdrv_co_block_status_above Date: Wed, 20 May 2020 11:35:16 +0300 Message-Id: <20200520083520.25793-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200520083520.25793-1-vsementsov@virtuozzo.com> References: <20200520083520.25793-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR02CA0092.eurprd02.prod.outlook.com (2603:10a6:208:154::33) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.147] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 522a8c4f-b2e4-415d-33af-08d7fc98c8eb X-MS-TrafficTypeDiagnostic: AM7PR08MB5448: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-Forefront-PRVS: 04097B7F7F X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wcvbunlWx0FRNlpLEVzwEVmp4DOZUe1k05CJWfRB4DSLrM1ITZU9vmNClq9GXG/n7BsCly6DG8v+iRswbUj4vnhqUQ6KJAD6jLM51uyfbBp4+Eh6Ai2DUc1efwY+xwcOch4iQmUCagFz6PMkHIiJavU6RQtR8gaa1SuNyns43AubLodEsbNlYt/c3qU+SyKwLwnzU+LP+FWfLhT8kkQW9TiMcMxNFOwo+dTzFNnL+lWLT8IfDY0ai9VPgJj9imOIBoU+1NuStXeTRZJrAccLqcGNwM0rU2QY7g4AfJ2tI05IotGL1J5sz9i9WjCofO/bddqdYA3m7zDjE1+I1e1xez655t3VHhXG3hyfwn3Tc3zZn+iZUiY/3QjYo5euEGKJvvvOEWB6lqZTpTuPbzIBQ2NaJBHReBQPSz+G+kfyaWHdDeECRamFXNSv8dh1VLyWsMXDOcw+aP2+7tFZEq3SlloDslRa8JmadOfY2bUWL4Hawl/o6ne6Bkq03WHARvoE 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; SFTY:; SFS:(4636009)(376002)(346002)(136003)(396003)(366004)(39840400004)(6506007)(26005)(8676002)(6486002)(52116002)(186003)(16526019)(1076003)(2906002)(86362001)(5660300002)(8936002)(36756003)(66556008)(4326008)(316002)(107886003)(478600001)(2616005)(69590400007)(956004)(6666004)(6512007)(66476007)(6916009)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: rfKKQPCdIZhFvmBDygAX9fOpNW5u31RekW+u8nKfDZh9p7z1MY8Lb/nEDt9NktUyWXJ5N7zZvk6AOKIFEKTIO5EAcbM91Yhybtcl/AMRXZpASBFh9/3XjV4Xx7OMcEgTNKw+XdrYN7Sv2xOulAgXTrcW6A1r8/T2+tD+YcB9hyzD4Jv1bh9gKV0eFO7cRVWLyJ4PcoXqDku2kmfR4tH2TmE6bJdCjzU7c9FlrIg1W9/CRwDcJVbd1Lyo0+F2XyAO7OIifCpRaya8b8XklwF0zTdENKmet661PZYT2y+v0MGDloOS6DC0O9ed5eb3x7Z6GuyZ/tkJua1l4EAymSgzXC2iildvjFl2RLIwiMAjpU62WwaIEPneuyJQsCe35G2dSd3Nj+7WLeflkAAvtY4+CVoL+bbfbxFP8gjvnKhi5KL2kNFjrFXoq0tgK27cbFHSv/xM4CdrPiirM/4MwU7sJkYkbEhFdXwfHHMp3qzDvGoGZGAYmLbzINI3g2By0fhZ X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 522a8c4f-b2e4-415d-33af-08d7fc98c8eb X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2020 08:35:43.3704 (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: WzZgWnMRrq+j0/g55R/8dRgZjCr7M6odpQdkSJFX0h37hfakgswFUfVD7tj/HKaETx+iePTQDozvSAvPnWC5WP/Kvldv8B/Sc6rhMvFHpQo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5448 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.8.90; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-VI1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/20 04:35:42 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] 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, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, fam@euphon.net, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, den@openvz.org 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_co_block_status_above has several design problems with handling short backing files: 1. With want_zeros=3Dtrue, it may return ret with BDRV_BLOCK_ZERO but without BDRV_BLOCK_ALLOCATED flag, when actually short backing file which produces these after-EOF zeros is inside requested backing sequence. 2. With want_zero=3Dfalse, it may return pnum=3D0 prior to actual EOF, because of EOF of short backing file. Fix these things, making logic about short backing files clearer. With fixed bdrv_block_status_above we also have to improve is_zero in qcow2 code, otherwise iotest 154 will fail, because with this patch we stop to merge zeros of different types (produced by fully unallocated in the whole backing chain regions vs produced by short backing files). Note also, that this patch leaves for another day the general problem around block-status: misuse of BDRV_BLOCK_ALLOCATED as is-fs-allocated vs go-to-backing. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/io.c | 39 ++++++++++++++++++++++++++++++--------- block/qcow2.c | 16 ++++++++++++++-- 2 files changed, 44 insertions(+), 11 deletions(-) diff --git a/block/io.c b/block/io.c index 121ce17a49..412b91b08f 100644 --- a/block/io.c +++ b/block/io.c @@ -2461,25 +2461,46 @@ static int coroutine_fn bdrv_co_block_status_above(= BlockDriverState *bs, ret =3D bdrv_co_block_status(p, want_zero, offset, bytes, pnum, ma= p, file); if (ret < 0) { - break; + return ret; } - if (ret & BDRV_BLOCK_ZERO && ret & BDRV_BLOCK_EOF && !first) { + if (*pnum =3D=3D 0) { + if (first) { + return ret; + } + /* - * Reading beyond the end of the file continues to read - * zeroes, but we can only widen the result to the - * unallocated length we learned from an earlier - * iteration. + * The top layer deferred to this layer, and because this laye= r is + * short, any zeroes that we synthesize beyond EOF behave as i= f they + * were allocated at this layer */ + assert(ret & BDRV_BLOCK_EOF); *pnum =3D bytes; + if (file) { + *file =3D p; + } + return BDRV_BLOCK_ZERO | BDRV_BLOCK_ALLOCATED; } - if (ret & (BDRV_BLOCK_ZERO | BDRV_BLOCK_DATA)) { - break; + if (ret & BDRV_BLOCK_ALLOCATED) { + /* We've found the node and the status, we must return. */ + + if (ret & BDRV_BLOCK_ZERO && ret & BDRV_BLOCK_EOF && !first) { + /* + * This level is also responsible for reads after EOF insi= de + * the unallocated region in the previous level. + */ + *pnum =3D bytes; + } + + return ret; } + /* [offset, pnum] unallocated on this layer, which could be only * the first part of [offset, bytes]. */ - bytes =3D MIN(bytes, *pnum); + assert(*pnum <=3D bytes); + bytes =3D *pnum; first =3D false; } + return ret; } =20 diff --git a/block/qcow2.c b/block/qcow2.c index fe0ce39799..ac43c58c7e 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3827,8 +3827,20 @@ static bool is_zero(BlockDriverState *bs, int64_t of= fset, int64_t bytes) if (!bytes) { return true; } - res =3D bdrv_block_status_above(bs, NULL, offset, bytes, &nr, NULL, NU= LL); - return res >=3D 0 && (res & BDRV_BLOCK_ZERO) && nr =3D=3D bytes; + + /* + * bdrv_block_status_above doesn't merge different types of zeros, for + * example, zeros which comes from the region which is unallocated in + * the whole backing chain, and zeros which comes because of short bac= king + * file. So, we need a loop. + */ + do { + res =3D bdrv_block_status_above(bs, NULL, offset, bytes, &nr, NULL= , NULL); + offset +=3D nr; + bytes -=3D nr; + } while (res >=3D 0 && (res & BDRV_BLOCK_ZERO) && nr && bytes); + + return res >=3D 0 && (res & BDRV_BLOCK_ZERO) && bytes =3D=3D 0; } =20 static coroutine_fn int qcow2_co_pwrite_zeroes(BlockDriverState *bs, --=20 2.21.0 From nobody Fri Nov 14 19:25:40 2025 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=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1589963811; cv=pass; d=zohomail.com; s=zohoarc; b=bFu3eVxM4HjMR7hAM8DNi9moLVQO6osnQi4MyaAoXOHppz3Bon7nLogHvVwk51Nj1gaA1RUDceVwutOiH++K8LHjjHXHKI5duPIL6JNZ7nMJ4Fa1LMf0Vr87TMFJ0vu1cVhuyeRkLafOfs6crmezWNoB/7xXKumkz3ILQMBFtpA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589963811; 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=FXhYterO8igpjdw0h384k3lZzozrmhtfxItY0AkNfsA=; b=K6POfT+aHj/YKNn9I/V1szpeDjbtYU39vhu35kcs/HEwmBFHrnNJ/PClxDI1lV5yvmQsdIvl1yZlZXn+GM3f30xc1XiJaFJmX+2Clokl1URnVuRu9/w9zFf1E6yEoS0u0UbTkkGrSDdHWA9xUU8ZDLTfXaQiWjJRcZu60dZg0EU= 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=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589963811928964.1590624576734; Wed, 20 May 2020 01:36:51 -0700 (PDT) Received: from localhost ([::1]:46242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jbKDa-0002qm-Ja for importer@patchew.org; Wed, 20 May 2020 04:36:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbKCc-0000jC-R6; Wed, 20 May 2020 04:35:50 -0400 Received: from mail-eopbgr80090.outbound.protection.outlook.com ([40.107.8.90]:21573 helo=EUR04-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 1jbKCb-0005RQ-Oi; Wed, 20 May 2020 04:35:50 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5448.eurprd08.prod.outlook.com (2603:10a6:20b:106::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.26; Wed, 20 May 2020 08:35:44 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312%3]) with mapi id 15.20.3021.020; Wed, 20 May 2020 08:35:44 +0000 Received: from localhost.localdomain (185.215.60.147) by AM0PR02CA0092.eurprd02.prod.outlook.com (2603:10a6:208:154::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.23 via Frontend Transport; Wed, 20 May 2020 08:35:43 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e1FEZVRlPvzjqEyC70xsm9hVp/pMxtyL8hiSJ5ndInSuQzfScOJVLyEUaSr8kuRG3eJBH5g1bIlg+8iJmkRjre9R3tMAR/XgyRx4HmptXJu4DpyqbxgYKA/rKv0zX5VRk8SSHvp3CUC3eXg2yE2JWpAntL438yu9k2m4gC35/D96in4/EiNZK9d+bUQzhssLmifwb7SdQmOXlFeg/9FAxd0JDclPj1x1zrK70wp8ldn0Vo1wxfLTrNxLN6MF11QeYIDDMrX1G9fQW/cLKjlQJUJp1j6ulZ9PPxKbf2iaVdWGoAr/QBW5z4NOucHQoOXIKwk3jLgVYo1eUEA6kHHi8Q== 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=FXhYterO8igpjdw0h384k3lZzozrmhtfxItY0AkNfsA=; b=WOv2nPRpBzQ8hl6huJhw6XhRC7TfARXTrJr39aFGHEnt4K6Gt4OGxYRpjHXsFeXVAsxLSNRr35TWGoBU9Ce8DB8ODbrSH9EjaP71KfidMA6CkKkU1mko5IvOD/p+eTZ1X7sUPHCppso2f6em/z/pbO5Ymeo6ZUwymzAXhiNKm8FVwLoHi4c9cbOl9NjhcBR5LnNUrZYhQz8fxBsrsi7Zn0KlE0mfWGwJsHvJFAhJFcKwU9KpAmdPKiH10fLhfTl+DmBpZOZEM+d+ypiaT/Fm+pwF7vnUTumCjl+yTK2BMvzM35dehd6RXusunXEJV/j81EckKHJNqTX2GRILvQVAwA== 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=FXhYterO8igpjdw0h384k3lZzozrmhtfxItY0AkNfsA=; b=B7d7ihJigCsrAQNZn8uFnbf9rOU+z4+MUOx36U3iSWF67tbJKwhp5XelufeepqMlGb7MRx6x31pYUHCLbGuP2ShoOwIGRXn4uo7XQISUEx5hgvUINvuQeSGvbIbkj926SkycM76F8Q2zO0nv6xcCPKdyuR5KHELspj6uFR17G2E= 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 Subject: [PATCH v3 2/5] block/io: bdrv_common_block_status_above: support include_base Date: Wed, 20 May 2020 11:35:17 +0300 Message-Id: <20200520083520.25793-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200520083520.25793-1-vsementsov@virtuozzo.com> References: <20200520083520.25793-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR02CA0092.eurprd02.prod.outlook.com (2603:10a6:208:154::33) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.147] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 53105c0f-e249-455b-bce8-08d7fc98c964 X-MS-TrafficTypeDiagnostic: AM7PR08MB5448: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-Forefront-PRVS: 04097B7F7F X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ergRpN8HKSVleYOb2ge78A+lESQj0sAJHez8jpirQr5AAy+XwN/EYpQCuU3+AdQQU8Su23bzichyxkIVxS/0GgszgA/wA4npBJl3TFlzAVD593SXoXYNGdIR6ZBfqH8POevLWHS+NEInmdVymd0grkG/oom00k4lUcnUcpese2WoPj1WZW77HWlfqHq9Bm2z1ij/95dp9+phAKvrQjYk616xf1YYolQqQc1XGSr1GUpK+FoybkRNhtQwGydJQqwEbKDvcf1CYwa6Gevq7d2AgK0qdNyhmvahyeRzv3HRjwgVoDrB4bHzyWmtNCrsepubIiC9aUqguDrQeWDSiabb9S45oeRiuLzFnRzIr2jSvDPvo2qxPYDrvplP/c/Ebjn2ZSV+KaI4lXqJjZL6KCs5rueUQTRSGx5bY2rrMJzKXCGFG6QuptpeH1BReomAqBuMgl+GvDKvEBwjDsCVVZL4DiKoNUGymLF51Kk0kuuD34N7KemdqW4rRv3UwTzDDb8L 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; SFTY:; SFS:(4636009)(376002)(346002)(136003)(396003)(366004)(39840400004)(6506007)(26005)(8676002)(6486002)(52116002)(186003)(16526019)(1076003)(2906002)(86362001)(5660300002)(8936002)(36756003)(66556008)(4326008)(316002)(107886003)(478600001)(2616005)(69590400007)(956004)(6666004)(6512007)(66476007)(6916009)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 8z0TJLHyvtBmFiIhvm2eixQmYCy02fI9k+ibWQ8OGHMP5URFEN9V0aa3patwkNls/yOKk2dPb/yK16sk0V+cXn5u8u6p/Sss2146zsD9hJn++/HS6sp9v1LB2AXYLY7Iq+vX6QlKoT3V51jJZ3lhadUO3+uBkTVhJ86tw/OLTC5bnnNIbTTT20VidxM0nSotkOnuo0TXp6Eu1mCjSJGdjaNREuGpsqDjlVarT6vN2ToNEHvxilxdoC0UazgATsRdYE9USBEKVA3QQKT95xa5/5Pj1ihNQeBCPKxAiDXIVwftqqljloSMuSANL7+LR6OhLEyhj0PgrrXxAHbYPG+16iWA7SIKcK8gTSkzz6CnBV2d02RFsF6Av4FjAiscw2Lt+DLhg4lyiAGMYO8O8hj5kTQl6cITG+d3EAf4eB0XUUX3lmVBe4K9mLdzL09pSGu0qutZvd4O7eJxST9DCnEfXP6mRenASb4kpcAel5oDD1W2PwAXVdSWooqnO3U8p2ej X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53105c0f-e249-455b-bce8-08d7fc98c964 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2020 08:35:44.1838 (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: o8NsGMI7LXn6I+vsv9SQysB/yDUKmKdVa3hT8EUG+CXQYstygdWwoJ7Qb42j4NT2JwcRgn+cGzMGRKFrUzOEuX5ZyZTkDrTTLngP8apZORg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5448 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.8.90; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-VI1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/20 04:35:42 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] 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, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, fam@euphon.net, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, den@openvz.org 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" In order to reuse bdrv_common_block_status_above in bdrv_is_allocated_above, let's support include_base parameter. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf Reviewed-by: Eric Blake --- block/io.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/block/io.c b/block/io.c index 412b91b08f..ae1c806720 100644 --- a/block/io.c +++ b/block/io.c @@ -2223,6 +2223,7 @@ int bdrv_flush_all(void) typedef struct BdrvCoBlockStatusData { BlockDriverState *bs; BlockDriverState *base; + bool include_base; bool want_zero; int64_t offset; int64_t bytes; @@ -2445,6 +2446,7 @@ early_out: =20 static int coroutine_fn bdrv_co_block_status_above(BlockDriverState *bs, BlockDriverState *base, + bool include_base, bool want_zero, int64_t offset, int64_t bytes, @@ -2456,8 +2458,8 @@ static int coroutine_fn bdrv_co_block_status_above(Bl= ockDriverState *bs, int ret =3D 0; bool first =3D true; =20 - assert(bs !=3D base); - for (p =3D bs; p !=3D base; p =3D backing_bs(p)) { + assert(include_base || bs !=3D base); + for (p =3D bs; include_base || p !=3D base; p =3D backing_bs(p)) { ret =3D bdrv_co_block_status(p, want_zero, offset, bytes, pnum, ma= p, file); if (ret < 0) { @@ -2496,6 +2498,11 @@ static int coroutine_fn bdrv_co_block_status_above(B= lockDriverState *bs, =20 /* [offset, pnum] unallocated on this layer, which could be only * the first part of [offset, bytes]. */ + + if (p =3D=3D base) { + break; + } + assert(*pnum <=3D bytes); bytes =3D *pnum; first =3D false; @@ -2510,7 +2517,7 @@ static void coroutine_fn bdrv_block_status_above_co_e= ntry(void *opaque) BdrvCoBlockStatusData *data =3D opaque; =20 data->ret =3D bdrv_co_block_status_above(data->bs, data->base, - data->want_zero, + data->include_base, data->want_= zero, data->offset, data->bytes, data->pnum, data->map, data->fi= le); data->done =3D true; @@ -2524,6 +2531,7 @@ static void coroutine_fn bdrv_block_status_above_co_e= ntry(void *opaque) */ static int bdrv_common_block_status_above(BlockDriverState *bs, BlockDriverState *base, + bool include_base, bool want_zero, int64_t offset, int64_t bytes, int64_t *pnum, int64_t *map, @@ -2533,6 +2541,7 @@ static int bdrv_common_block_status_above(BlockDriver= State *bs, BdrvCoBlockStatusData data =3D { .bs =3D bs, .base =3D base, + .include_base =3D include_base, .want_zero =3D want_zero, .offset =3D offset, .bytes =3D bytes, @@ -2557,7 +2566,7 @@ int bdrv_block_status_above(BlockDriverState *bs, Blo= ckDriverState *base, int64_t offset, int64_t bytes, int64_t *pnum, int64_t *map, BlockDriverState **file) { - return bdrv_common_block_status_above(bs, base, true, offset, bytes, + return bdrv_common_block_status_above(bs, base, false, true, offset, b= ytes, pnum, map, file); } =20 @@ -2574,7 +2583,7 @@ int coroutine_fn bdrv_is_allocated(BlockDriverState *= bs, int64_t offset, int ret; int64_t dummy; =20 - ret =3D bdrv_common_block_status_above(bs, backing_bs(bs), false, offs= et, + ret =3D bdrv_common_block_status_above(bs, bs, true, false, offset, bytes, pnum ? pnum : &dummy, NULL, NULL); if (ret < 0) { --=20 2.21.0 From nobody Fri Nov 14 19:25:40 2025 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=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1589963906; cv=pass; d=zohomail.com; s=zohoarc; b=i1vOCqcL/j/vz2+pk3A2k6OdD48aAiWnjIpl+ol7p1NeFYtCN8K76RNUeiLGLNlz30vmylPfFiLIPFm/ClQCEhV6Mlt280rc/Hjco8W+WaHBBa/EB8GUZ+6LihL93WdmvCPIQapiT7a9Clv9oylfP8PfLmmXWFVR4NZm9LaXd5c= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589963906; 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=sX/tbxLARYZgvdr5Dz0gjygHDRRy/qk1VQmWfHv7dnk=; b=ZK6vXqGBWNo4IgiPy+Bsf3Koo6NZS8Zr+bnxHmc66Q/2QTpfh6Rh3zjtuKXeSJ1ohsPJmWEG61vBR9qmbq52cgQKjsH4S9+HAP9FUDL3iZt3VbXqIR78oK6eM6nOyynr26lazJwr9QlpVfZaTMwqx1Q+Hc1NeDPjbPEIM8LhHJQ= 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=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589963906478139.53206333835556; Wed, 20 May 2020 01:38:26 -0700 (PDT) Received: from localhost ([::1]:53330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jbKF7-0006PO-A7 for importer@patchew.org; Wed, 20 May 2020 04:38:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbKCe-0000mO-Fb; Wed, 20 May 2020 04:35:52 -0400 Received: from mail-eopbgr80090.outbound.protection.outlook.com ([40.107.8.90]:21573 helo=EUR04-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 1jbKCd-0005RQ-CX; Wed, 20 May 2020 04:35:52 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5448.eurprd08.prod.outlook.com (2603:10a6:20b:106::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.26; Wed, 20 May 2020 08:35:45 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312%3]) with mapi id 15.20.3021.020; Wed, 20 May 2020 08:35:45 +0000 Received: from localhost.localdomain (185.215.60.147) by AM0PR02CA0092.eurprd02.prod.outlook.com (2603:10a6:208:154::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.23 via Frontend Transport; Wed, 20 May 2020 08:35:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DbzGMFWvhtjDoBta6blByiSlmgPYW91Kyf+Xu0MjrqGYgksYu3mKOvW69X+FiWPaLoxpv/9Yq1/d69trRVjzaSuPJ4HgjvU18zg0ckRK9Nc0SBBFV1gfo8eZW9X5xtAaEKHFk7kvKTFrgGc+1NcKkekftOoxm8+bSf/IPmG0FRmn9RHSXP+lNx2XgdWdB8fr5HkjfWconnqlFQ6IVMk3tC/ZVjVO8FFbyE4LLcetSZkECx+0xNkhxjRw0hEGiN0vFMaHc27iNbS4/i1EafaozNnRejfKyxv/i/jf3BWHe5/mkOKG+h1WFQIHxUGvQZgg8a4jR637l/dSTJWc3IE12g== 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=sX/tbxLARYZgvdr5Dz0gjygHDRRy/qk1VQmWfHv7dnk=; b=ILPdiKSy90wNL62BgZ24J4LGwkeeCnmm+WnJygLdzwsXe7pUYi8HRdTyyLQHmZnd45FVsduB2YaEpt2KkF7CACWD1S4q+9TEhYDPhL24J7Y8BxdY0+D0IxPgQ28DqM634Wh1c+jri5YNSv5vzKKXRMgqFFUATzqtBV8DEkEcp0doQR+KW7MFU3fHdVrqOeRPPKsfJLVV58j/P9dTH1FqylfQjh5JOWn4cReT8E5J2IJsYP2Z+aE5aOHtRtFBTHxoHWA2YJ+NzAKpUepXZIsLm5/tAQQcVpMFbeE3pTcnqURb94nwmLLbEuuX0nwvVWJ/kuwGzoqo7DWimhrQatkNHw== 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=sX/tbxLARYZgvdr5Dz0gjygHDRRy/qk1VQmWfHv7dnk=; b=RUyuslmqkUWnLoUc0E4RY9l11dCiNe4AuJS6vaZKZrOWz9gbuIPNbzhPZO+AwdJ4POjb05/Ko5yc/PxFN0Kj6CG2ftoKk2p5Bcze4X51WMtL59F13yGI7Rs0DZ57QNKpysXjf0ZWvYiy3cP5kQ5d34eH+s/4XJb6n5SznkFDbWo= 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 Subject: [PATCH v3 3/5] block/io: bdrv_common_block_status_above: support bs == base Date: Wed, 20 May 2020 11:35:18 +0300 Message-Id: <20200520083520.25793-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200520083520.25793-1-vsementsov@virtuozzo.com> References: <20200520083520.25793-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR02CA0092.eurprd02.prod.outlook.com (2603:10a6:208:154::33) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.147] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bf7e4f99-b408-4aaa-ae10-08d7fc98c9e2 X-MS-TrafficTypeDiagnostic: AM7PR08MB5448: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1417; X-Forefront-PRVS: 04097B7F7F X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pO/uwQJA8fBNABCpsmlrehezth3BNNTlewJtqUd2kpsHB5Der7Yeh5R6Vde5bXMHTZCOte27TxAHjd9Q3of58htmMH8N64ByjJRwX7kYcxDIZeQztkCrI8VDnj8kTDcRyQj691YtEhQncD0Yeoav2SaYj6jxe0gsSlaaRdgbAWAZHZeT2BPFmpEc1sTk8kJnYyExmMUQKmYkrHxHONap7XAo9ygs94c+qyPygdZgIzDYp5qGMdl4j7TkRRecZghVlNdoDy7KUr/98Tc/QdsMfyxLQsue5VwCD377Qrr4t66R3YBppYWNHpgfQ27ukYdYDlm4s851Z4wR9x10SFm0pAbMUoKPtE7RNZCQ6gBY+ZrNNFyW0YJMwStQsANegOPGuqBNxJcgaMVREam2rFJ/Xrq1UwDC0rta+jXPDuO53xNojKOoSJfTlqowQ/K9mZm6GNkigyh6EEXCn616ZEoyk9WDGBRGAugXmY5QsGBxzNKE9Ej9OWNaJERi3/fuH2j9 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; SFTY:; SFS:(4636009)(376002)(346002)(136003)(396003)(366004)(39840400004)(6506007)(4744005)(26005)(8676002)(6486002)(52116002)(186003)(16526019)(1076003)(2906002)(86362001)(5660300002)(8936002)(36756003)(66556008)(4326008)(316002)(107886003)(478600001)(2616005)(69590400007)(956004)(6666004)(6512007)(66476007)(6916009)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: dgwAVYyvEguKlANv4be5okoLRmwSRX1ot68j1x5lJ7su9qJy27PCx4aGzCVFUYEDd1+p6gBWyqXnSPKx2GC0bQufQ2X01BfeTNM9w1vUdha6k8N0r0xVnKFt8qPzceXNHULfcUqowLblpx+S1wACic8CX7DlGYfr+ypPiwsoLX1fsc9O/ddO4iO2v95togC9MXsV/eI7l2bBRdz0DyuIcbnorgX4ktWxampNexNgX+RBmS77LckHW5vNF3SLshua5D6KpZ4rzsPJMIUGqW62vlH/Tm1W57CIt/udxiiq5wKu6x+LpxaHnh7LoyO1/knICt04N5Lgq8VzlcPs74quyppE2QgJrFPcTJfCGIzjKg+XflmSWWxyZjNuVqdRoFF7s5iFP777ZKypryqZMKBz/KIO+OHkB0syQtxNz60qJcpdxMqut20mtUiKgQXOg/uZHQL0Y4QsI8JG+duzBE2fVhqkfdRVq729wiS58BZ2hd0qEN6q3i1o5BBi7qzNSi6L X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: bf7e4f99-b408-4aaa-ae10-08d7fc98c9e2 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2020 08:35:44.9903 (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: KX11LwpFI8bgNhvLWYdfPijjLcOy1+nbREfEDXxkKwsbjqP1no8rY3rUbRRpMQLkY7eB9Jn6F+l+DNAv2SFG5sr0ZA7zqCxraqMoq1X2164= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5448 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.8.90; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-VI1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/20 04:35:42 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] 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, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, fam@euphon.net, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, den@openvz.org 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 reuse bdrv_common_block_status_above in bdrv_is_allocated_above. bdrv_is_allocated_above may be called with include_base =3D=3D false and still bs =3D=3D base (for ex. from img_rebase= ()). So, support this corner case. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf Reviewed-by: Eric Blake --- block/io.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/block/io.c b/block/io.c index ae1c806720..6f90b322f4 100644 --- a/block/io.c +++ b/block/io.c @@ -2458,7 +2458,11 @@ static int coroutine_fn bdrv_co_block_status_above(B= lockDriverState *bs, int ret =3D 0; bool first =3D true; =20 - assert(include_base || bs !=3D base); + if (!include_base && bs =3D=3D base) { + *pnum =3D bytes; + return 0; + } + for (p =3D bs; include_base || p !=3D base; p =3D backing_bs(p)) { ret =3D bdrv_co_block_status(p, want_zero, offset, bytes, pnum, ma= p, file); --=20 2.21.0 From nobody Fri Nov 14 19:25:40 2025 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=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1589963821; cv=pass; d=zohomail.com; s=zohoarc; b=cVviTgaZZ7TVhZ0dYLZadmJkwlo+OCL7QSdrK6cG3GOuDkaMcINdmQ2OLsFb61VUnbbAx0dgGgNYYWXcYCFaU0CV9UusjTp1jqnlEFJUC6HdO71S5r1HZw5zZNX756lRyG+cVf7wlLlSjKGE9Ka3I38agQzeNYQShACgV6E1UtY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589963821; 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=E9gzINp7bqZ5NqBQUDAf0iYtbS3M04Xmq9DZDuxjk9Q=; b=EHNsSYBavEJEq/d0d54zShZSZXwHT37qPra1m/uLYmimKfQutx/KhERnMgjmUqpZQTvGz7D789x/sAJePi6mIcqwQZHJNpMmonkugFtg/ryvVueVmds++0k4cj8j5B2FZ1Gxngc4KcCAKP4VinDpuID3Kc6Mt45h3+SCFDfVyQ0= 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=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589963821285632.0106944787118; Wed, 20 May 2020 01:37:01 -0700 (PDT) Received: from localhost ([::1]:47258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jbKDk-0003RB-1e for importer@patchew.org; Wed, 20 May 2020 04:37:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43324) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbKCg-0000r1-3o; Wed, 20 May 2020 04:35:54 -0400 Received: from mail-eopbgr80090.outbound.protection.outlook.com ([40.107.8.90]:21573 helo=EUR04-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 1jbKCf-0005RQ-3c; Wed, 20 May 2020 04:35:53 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5448.eurprd08.prod.outlook.com (2603:10a6:20b:106::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.26; Wed, 20 May 2020 08:35:45 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312%3]) with mapi id 15.20.3021.020; Wed, 20 May 2020 08:35:45 +0000 Received: from localhost.localdomain (185.215.60.147) by AM0PR02CA0092.eurprd02.prod.outlook.com (2603:10a6:208:154::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.23 via Frontend Transport; Wed, 20 May 2020 08:35:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FKNOeNkuAKtGAPU40a3THsCJNSR6Miyy6eapgToJc8X+bnpDUjOTgNUx3WDu9Wk9LnwFEz4vnwe1xf4VIuRY6sk/gRTOnOnCgiIRwopTNJxnQ13bpNjRiF9nQjx5gMZVAM2xfRlb1cwdotNQmBXsDoN3OWIaY1GDgXyqVcDfmrpHMLtGg9q/ryor9GpR2HAUHGZL0o/h4EwH7mz/chqxcIW88bY0uZwuuH67dOfMSEf2aTAOXlBoHJvpQpQi+HIBwSXfL8u5sWa1oPeJE4aO4s+pYKPdALP+Q/yUT8UJ9LsQE7MvWhxb7PWNyHpOs4WINV+by79hzESPkFAuBTPcOg== 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=E9gzINp7bqZ5NqBQUDAf0iYtbS3M04Xmq9DZDuxjk9Q=; b=TH5rSIIOE2d9mq1FWTVdsZPEPqi8NLjPwljySD6MVR85zrlYrBKeZihU0CA9pySwzxlOWTWtFnAAjqwnIn3rCGJONJBCd4r5l6XlSI1sy5f5KUjdOr2F6kX7bgT8mCndtxF1I16pTw6rI6bshI4ga+kEvGRqXcZqmBsSnTSUkIpqRsNY9f6cnPZM4k2MlbjtrjT9YMuo2jjjUv3EEHT29/HcJrPgsHfdG8JF/trpEEO+ZpqWa1yLbM6U1OK+iyHuy+pFh3J0CLBD29ZypdbaEF23iquChLjeudTJ6+sw65hwrC/YBw/dU7TaIDfdc0Bc6HEgGy8G/xggL95bAqskBQ== 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=E9gzINp7bqZ5NqBQUDAf0iYtbS3M04Xmq9DZDuxjk9Q=; b=NfAUO7YdhgHT/U2oe18ADjJ2r2KMfQn2+IxgDQv11UPVjpKqmUhpsW/9k0diPbAoR6lmLtJx/+wHwt/Mj6GaB/QF9qhSqUNkn29PvWrnHpAVrA3jgemaM2z9WYeJnM791I5+wnskgXfAa2gMuwHl1EJK70fNc6VBpDwRbNE/omU= 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 Subject: [PATCH v3 4/5] block/io: fix bdrv_is_allocated_above Date: Wed, 20 May 2020 11:35:19 +0300 Message-Id: <20200520083520.25793-5-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200520083520.25793-1-vsementsov@virtuozzo.com> References: <20200520083520.25793-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR02CA0092.eurprd02.prod.outlook.com (2603:10a6:208:154::33) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.147] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4e96f360-c347-4c72-0a08-08d7fc98ca5e X-MS-TrafficTypeDiagnostic: AM7PR08MB5448: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-Forefront-PRVS: 04097B7F7F X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9qCQtYaKJ/+LGFSzdbbG/OiUpz4326f/r8qzLWmEVDzo+9gzUZLDzBHDKzsXUViIwe061pAB6xAoF/hoq9qdKFivOFM62SQjuKkvTfGJP6S5/SoSb7g4peUoqfM9oz1WlXQU/2d5JdW/DgbAldDRDiWSjeH1X4V3yvdxMluUlqpGCEQwQk3Q67cgNI/cJnzR5D7ny8xvCcjIzmGUEEkPLlSfvHoP6mHFyW/ggw8vnEYKygjKVoT9HdGZGTGnre/dWYJPs10JUES4zDKGu4I4YySJgfxfJQDz6dmVuxo5aBsWnrJAi0k35fcI/maLVc1yNIJ6d8tmp4KZJGxoNd96MuKG+AfzWnfIH+ErbnlbRH7M5B+MhuuK3jC8+DI/3dQV1NI8BkVUJmJlam0JOTcuH5wa8Y4bC7FRarZW4fncyvGJ/ZuhpLbISmnyUiFXaqqmDNQ8mTIg9vb9zcr7PUYOZBmKlXaLoghje7bxbju6128FnvrZLHDwuDirnqXu7Kbw 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; SFTY:; SFS:(4636009)(376002)(346002)(136003)(396003)(366004)(39840400004)(6506007)(26005)(8676002)(6486002)(52116002)(186003)(16526019)(1076003)(2906002)(86362001)(5660300002)(8936002)(36756003)(66556008)(4326008)(316002)(107886003)(478600001)(2616005)(69590400007)(956004)(6666004)(6512007)(66476007)(6916009)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: edy8vfA2W47xUly9bnsrBQ+TPGKdXiZkqkwv61oermkFtgO3a1mafde7x1mKcS7Wz75NX6LH3MdD8S/tfYB2GK7KL+1Xw6ZUqN21UV0a58YWkuAJfCBzWcwfHK8sRFtEZokx4gnldMz8nz+ex96lPjxj9Rk3VKdRn5CUwXkXBSr+K/knzONxP5H/IRfyQyqQYROrEhjT9H/tTVQeS7BZpk6eigxstKwHgBG3x0KAPVMQ35FTOhgo0P1g5xpEE1kvCWkZkJZXqwoNKRcrmPHxr6GBzloXABbUPqWXTmH/D57lD40erFV8uz48vl3QSg0HmpxVW1+JJySGxzm+C1cslLmQuNxHvLclAdINyjEW8wHp4lgLanmapD4Wxk7sQhKw2O73qjzmdNhhsiXJzCp+unssu8DS5xVo/ptSApD6CJX7o4MOcaS5mXkDrxjYsR/L/ubURtlvMpMV/9QDclxaDMTWYgX3pYOvtM2CLQ783gG1cOIc9Fmq1wIRDzCwYdTI X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e96f360-c347-4c72-0a08-08d7fc98ca5e X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2020 08:35:45.7997 (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: ZH+kc9c2kfvPASovBHhLx7xUcixXBsckWjPnt+uugTxKYgd15ZhyDhvyQo3JXmgdlzfWNBQdsdnDvfw5JkEsrKphFkI6VQk1/evxBlIpQNg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5448 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.8.90; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-VI1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/20 04:35:42 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] 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, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, fam@euphon.net, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, den@openvz.org 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_is_allocated_above wrongly handles short backing files: it reports after-EOF space as UNALLOCATED which is wrong, as on read the data is generated on the level of short backing file (if all overlays has unallocated area at that place). Reusing bdrv_common_block_status_above fixes the issue and unifies code path. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/io.c | 43 +++++-------------------------------------- 1 file changed, 5 insertions(+), 38 deletions(-) diff --git a/block/io.c b/block/io.c index 6f90b322f4..e952f3d9a5 100644 --- a/block/io.c +++ b/block/io.c @@ -2611,52 +2611,19 @@ int coroutine_fn bdrv_is_allocated(BlockDriverState= *bs, int64_t offset, * at 'offset + *pnum' may return the same allocation status (in other * words, the result is not necessarily the maximum possible range); * but 'pnum' will only be 0 when end of file is reached. - * */ int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base, bool include_base, int64_t offset, int64_t bytes, int64_t *pnum) { - BlockDriverState *intermediate; - int ret; - int64_t n =3D bytes; - - assert(base || !include_base); - - intermediate =3D top; - while (include_base || intermediate !=3D base) { - int64_t pnum_inter; - int64_t size_inter; - - assert(intermediate); - ret =3D bdrv_is_allocated(intermediate, offset, bytes, &pnum_inter= ); - if (ret < 0) { - return ret; - } - if (ret) { - *pnum =3D pnum_inter; - return 1; - } - - size_inter =3D bdrv_getlength(intermediate); - if (size_inter < 0) { - return size_inter; - } - if (n > pnum_inter && - (intermediate =3D=3D top || offset + pnum_inter < size_inter))= { - n =3D pnum_inter; - } - - if (intermediate =3D=3D base) { - break; - } - - intermediate =3D backing_bs(intermediate); + int ret =3D bdrv_common_block_status_above(top, base, include_base, fa= lse, + offset, bytes, pnum, NULL, NU= LL); + if (ret < 0) { + return ret; } =20 - *pnum =3D n; - return 0; + return !!(ret & BDRV_BLOCK_ALLOCATED); } =20 typedef struct BdrvVmstateCo { --=20 2.21.0 From nobody Fri Nov 14 19:25:40 2025 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=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1589963984; cv=pass; d=zohomail.com; s=zohoarc; b=KLZaGDjxyvgOFTEtSo2/XKGaKh8X2UWnN918drbktBclAW2lohRjAf/GJIfmx7jiPhJ8/HlKTe2ZeYJmznBy6kA34Si20krxGjVBatmXEsvH+ouRi9bbM0PjfnCW9VffyltMkTeYEwmw1fOu+XxCDnNeOt9yEWnkSTev03teByA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589963984; 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=kQym2BNoGvV2r5jCdfntouMCdRWQKde3tw3sbB+xzkg=; b=ZkOqZ2ih5v0XvVA2Bd/LBmoNxxX/Rans/mCHpizVAGlBHLMPyClS8C1ZNDFsB49EtwkXyvtqKwb51utpIzIf8KbovTpWL2e6hAvlfxPp0PL97v3Lyi6sA2e7Jbznv07ULcmiHw52ZXcKtkGyLrZFQXAawwM8uX1aRsVCXQSHwDs= 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=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589963984967714.1865603475032; Wed, 20 May 2020 01:39:44 -0700 (PDT) Received: from localhost ([::1]:56770 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jbKGN-0007q6-IC for importer@patchew.org; Wed, 20 May 2020 04:39:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbKCi-0000xn-Ma; Wed, 20 May 2020 04:35:56 -0400 Received: from mail-eopbgr80090.outbound.protection.outlook.com ([40.107.8.90]:21573 helo=EUR04-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 1jbKCh-0005RQ-JL; Wed, 20 May 2020 04:35:56 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5448.eurprd08.prod.outlook.com (2603:10a6:20b:106::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.26; Wed, 20 May 2020 08:35:46 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312%3]) with mapi id 15.20.3021.020; Wed, 20 May 2020 08:35:46 +0000 Received: from localhost.localdomain (185.215.60.147) by AM0PR02CA0092.eurprd02.prod.outlook.com (2603:10a6:208:154::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.23 via Frontend Transport; Wed, 20 May 2020 08:35:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BKLwES4eVID+nrV1h5YaNVLORzVvnkWi6lEV07y15CIzgWnfYdocaagidB90j9Yab0DP1RoJkqEqJnFaEqNZwN2CmhBt6QxrgA75oJq+P9vmahi8f8JNdNojVXVuL/B6gdeVFfpT8qMAe7GqRsySZz9Nj7nLOAEtMvlNTjkBNqu3tkIN0eqNZI0J92PGYX2adzg1o+TutmzVghciLDnI1xpZVsP9zN9qUnDwZz86DR1UWmjveP8sZ8Q+sD1mYOSXXVaVJUwFRcc3YAId6hksp5aX+0RAgY5Mi3n5XOpsYXxOwmVcZSJ+1ZgdzBn1igLf/HJQJhOlqSdgRgwAubcm8g== 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=kQym2BNoGvV2r5jCdfntouMCdRWQKde3tw3sbB+xzkg=; b=ewOl6ls+/8olG4ywnUBC5CX+w6ia8kIKHs4704VnEHyyXa58Mgn2WCLiLNNAKMUVhl1oeXYyDK+d5iHJgS9O76btlzGu/Mqi/xF59dT3oEesDaRvob4nnGWkPRnXv1KxUHhPu3FvvUo4U410VJJ6DQrhvAbF/ONib/AHpb4JgGFX9u2bxiPjf0W2dnozWZls+ilmZ+7Ik6ALpkgLjKEGX4C6/Es2xTFODRjUgl3+HfzjgFiq+V4nVZmNZl1C7D2xK/W3hXTR7OKYyrWB0YFiCWligxYnbGHFHe9IG0/dgFh1IdPumtzFF53nRqpMmDbkoBmdKO6Tt/HWVUUHDvCwZQ== 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=kQym2BNoGvV2r5jCdfntouMCdRWQKde3tw3sbB+xzkg=; b=I73MLOJRyDlT5A09mRxnzxvZt9Pp+cNGXKGYM6S/XrEscfAsQI3i42XynVh5b+mNXFUPfwJP1EG2yQ74HVoTCdy4Qm1BHkVr1zCZofaFc2VT+hYlSCBmNGsse5okM6BI1kvYzSMeVcvk8fIjf/Pr4EsChxVVzEiAEXPYWgmZE2c= 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 Subject: [PATCH v3 5/5] iotests: add commit top->base cases to 274 Date: Wed, 20 May 2020 11:35:20 +0300 Message-Id: <20200520083520.25793-6-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200520083520.25793-1-vsementsov@virtuozzo.com> References: <20200520083520.25793-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR02CA0092.eurprd02.prod.outlook.com (2603:10a6:208:154::33) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.147] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 280a214b-13fa-46ee-3f21-08d7fc98cad9 X-MS-TrafficTypeDiagnostic: AM7PR08MB5448: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:61; X-Forefront-PRVS: 04097B7F7F X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D3BZtHNOBIlmmoMwUOHU0rRRNW0lYN1ZLrzpofb0JeSzR3M5BAIwI7W8tSmrVwrokqG8eD/HCejoKXVsqs+XyiA+VwuTg/rSGUr+PupQCO0FI78rBPKAthNbLiMQgcAxEAY9t5oKNtIxLhAdvat7UoUHSXF++tKIsXIXfig0/k9Trzwh54wdLiKhP3QIjz0//xn0gRv2tlzoAkI41XUqYkiqYC6nhw5rXSRaTvrXGJCTiYCyOkNoiYd1XH9jWWjNlvl5pFDwxgjLsqcgnlXej1TyHEHeC1TmRT4WOPF9V3kFKxFuRm+cSludN/lfbsDD6qH4OU4bo4WLHF2++W4+QYBxlYBxzwQxJw6vgmqV2XPkHowjv8DcVyfwICp/35adFf+UTauhvwxrr5T7HFmrlI3qXT8B9ifeCkQpteUxDT6F3ZN/Lob4f/H32bvupQ5tg95l48GpqRlbDCvrGNEhcYHCqBcAo9iPvNF5uzRtAkMgL26O6BFZ9RB7REm50kN27c+YnmzaoufqzS4lerYRGw== 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; SFTY:; SFS:(4636009)(376002)(346002)(136003)(396003)(366004)(39840400004)(6506007)(26005)(8676002)(6486002)(52116002)(186003)(16526019)(1076003)(2906002)(86362001)(5660300002)(8936002)(36756003)(66556008)(4326008)(316002)(107886003)(478600001)(2616005)(69590400007)(956004)(6666004)(6512007)(66476007)(6916009)(66946007)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: qvEUpNYjmK+louL4PXFfBbITK720XZGTmAVnrh1QOwpf3VlBu2sPk20ykDqx0Nv6EUBRNNx0orNval83ZO/NUZH7V7SjsX18sornCyMkl0/5Kgbh6nLYkSF4JB4/gUzp1ejjS/YpDg/92u6oXS7eBSbl8ClyLGuh47pgu5BG8uClIoEM2YbqAULr2JEfJ8/HCbGqEEUSdOenE+JbiK2pJlSl8IeFAGXvrImv0Oq99WWJyetLWYfEurZv+zTilZCKdPZYsGPmiHg3QGhk5aupNrsKPo3W4mpW+T8ANY8iGSfFeHqoXANh/ksH4d80MS2BgMW7Vb09zNYJQPvgVC+OqliOTpos1lqOJJJIaxsroKC/usA3OevPZKouNLMO3gt70Y+IcBpCMUSKDJPIc83Lyjob9idJ89FjEMQz/FHNIVSuzUprEiIYIo3CrHBReYm8RbSKHG0qauaiq9w/Qy3WvF2H6eeiG3tgiBEOFXWccms= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 280a214b-13fa-46ee-3f21-08d7fc98cad9 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2020 08:35:46.6201 (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: IND4/GVHNd/KjWL89Tpk/criDDnmugUWlDeS7su0NrHoAFEzr5vN7rm5gvUNnfbUOJiFiqKWjpehfOwdJwooJUQWekVa/Rj3s8n0vtVpn1A= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5448 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.8.90; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-VI1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/20 04:35:42 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] 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, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, fam@euphon.net, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, den@openvz.org 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" These cases are fixed by previous patches around block_status and is_allocated. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- tests/qemu-iotests/274 | 20 ++++++++++++ tests/qemu-iotests/274.out | 65 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) diff --git a/tests/qemu-iotests/274 b/tests/qemu-iotests/274 index 5d1bf34dff..e910455f13 100755 --- a/tests/qemu-iotests/274 +++ b/tests/qemu-iotests/274 @@ -115,6 +115,26 @@ with iotests.FilePath('base') as base, \ iotests.qemu_io_log('-c', 'read -P 1 0 %d' % size_short, mid) iotests.qemu_io_log('-c', 'read -P 0 %d %d' % (size_short, size_diff),= mid) =20 + iotests.log('=3D=3D=3D Testing qemu-img commit (top -> base) =3D=3D=3D= ') + + create_chain() + iotests.qemu_img_log('commit', '-b', base, top) + iotests.img_info_log(base) + iotests.qemu_io_log('-c', 'read -P 1 0 %d' % size_short, base) + iotests.qemu_io_log('-c', 'read -P 0 %d %d' % (size_short, size_diff),= base) + + iotests.log('=3D=3D=3D Testing QMP active commit (top -> base) =3D=3D= =3D') + + create_chain() + with create_vm() as vm: + vm.launch() + vm.qmp_log('block-commit', device=3D'top', base_node=3D'base', + job_id=3D'job0', auto_dismiss=3DFalse) + vm.run_job('job0', wait=3D5) + + iotests.img_info_log(mid) + iotests.qemu_io_log('-c', 'read -P 1 0 %d' % size_short, base) + iotests.qemu_io_log('-c', 'read -P 0 %d %d' % (size_short, size_diff),= base) =20 iotests.log('=3D=3D Resize tests =3D=3D') =20 diff --git a/tests/qemu-iotests/274.out b/tests/qemu-iotests/274.out index d24ff681af..9806dea8b6 100644 --- a/tests/qemu-iotests/274.out +++ b/tests/qemu-iotests/274.out @@ -129,6 +129,71 @@ read 1048576/1048576 bytes at offset 0 read 1048576/1048576 bytes at offset 1048576 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 +=3D=3D=3D Testing qemu-img commit (top -> base) =3D=3D=3D +Formatting 'TEST_DIR/PID-base', fmt=3Dqcow2 size=3D2097152 cluster_size=3D= 65536 lazy_refcounts=3Doff refcount_bits=3D16 compression_type=3Dzlib + +Formatting 'TEST_DIR/PID-mid', fmt=3Dqcow2 size=3D1048576 backing_file=3DT= EST_DIR/PID-base cluster_size=3D65536 lazy_refcounts=3Doff refcount_bits=3D= 16 compression_type=3Dzlib + +Formatting 'TEST_DIR/PID-top', fmt=3Dqcow2 size=3D2097152 backing_file=3DT= EST_DIR/PID-mid cluster_size=3D65536 lazy_refcounts=3Doff refcount_bits=3D1= 6 compression_type=3Dzlib + +wrote 2097152/2097152 bytes at offset 0 +2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +Image committed. + +image: TEST_IMG +file format: IMGFMT +virtual size: 2 MiB (2097152 bytes) +cluster_size: 65536 +Format specific information: + compat: 1.1 + compression type: zlib + lazy refcounts: false + refcount bits: 16 + corrupt: false + +read 1048576/1048576 bytes at offset 0 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +read 1048576/1048576 bytes at offset 1048576 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +=3D=3D=3D Testing QMP active commit (top -> base) =3D=3D=3D +Formatting 'TEST_DIR/PID-base', fmt=3Dqcow2 size=3D2097152 cluster_size=3D= 65536 lazy_refcounts=3Doff refcount_bits=3D16 compression_type=3Dzlib + +Formatting 'TEST_DIR/PID-mid', fmt=3Dqcow2 size=3D1048576 backing_file=3DT= EST_DIR/PID-base cluster_size=3D65536 lazy_refcounts=3Doff refcount_bits=3D= 16 compression_type=3Dzlib + +Formatting 'TEST_DIR/PID-top', fmt=3Dqcow2 size=3D2097152 backing_file=3DT= EST_DIR/PID-mid cluster_size=3D65536 lazy_refcounts=3Doff refcount_bits=3D1= 6 compression_type=3Dzlib + +wrote 2097152/2097152 bytes at offset 0 +2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +{"execute": "block-commit", "arguments": {"auto-dismiss": false, "base-nod= e": "base", "device": "top", "job-id": "job0"}} +{"return": {}} +{"execute": "job-complete", "arguments": {"id": "job0"}} +{"return": {}} +{"data": {"device": "job0", "len": 1048576, "offset": 1048576, "speed": 0,= "type": "commit"}, "event": "BLOCK_JOB_READY", "timestamp": {"microseconds= ": "USECS", "seconds": "SECS"}} +{"data": {"device": "job0", "len": 1048576, "offset": 1048576, "speed": 0,= "type": "commit"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microsec= onds": "USECS", "seconds": "SECS"}} +{"execute": "job-dismiss", "arguments": {"id": "job0"}} +{"return": {}} +image: TEST_IMG +file format: IMGFMT +virtual size: 1 MiB (1048576 bytes) +cluster_size: 65536 +backing file: TEST_DIR/PID-base +Format specific information: + compat: 1.1 + compression type: zlib + lazy refcounts: false + refcount bits: 16 + corrupt: false + +read 1048576/1048576 bytes at offset 0 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +read 1048576/1048576 bytes at offset 1048576 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + =3D=3D Resize tests =3D=3D =3D=3D=3D preallocation=3Doff =3D=3D=3D Formatting 'TEST_DIR/PID-base', fmt=3Dqcow2 size=3D6442450944 cluster_size= =3D65536 lazy_refcounts=3Doff refcount_bits=3D16 compression_type=3Dzlib --=20 2.21.0