From nobody Fri Nov 14 20:41:17 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