From nobody Sun Feb 8 17:48:03 2026 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=1587998491; cv=pass; d=zohomail.com; s=zohoarc; b=EIPMD/4uGmnmNtgLFjv3r5VfRG+WntyBuCbqJwfl+TAAttFk2KPzbRkc3HyHUaekByNO5ZLClfWIVhSn3tTvtlqH6HdurBAD7z2CqMlrEgJ12U4GCvGje+QlWPU5D2yZGO7uvJrcr5iyVLuQRvRX4QdYmuZitPdEzQUBuUx3uIs= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587998491; 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=ErVBdh1cF9BloFlIPWQR4KJ9no3velI5wxrkcsnsz10=; b=lbe0AuEh+mZqDAcRLqoQcIJHC46DaJiGFwAbap/AIa9d4s7l5SA59qVXCTe8VU2Uk83e2hspABVheoaT/8AscxiYSmqKt1BB/cBU6j9bG/X8IMSLbmI6wCveKjuA+15C5phD+stM9TOc3DRHfI3q06GVU7CNsF5r9V6555BhH+k= 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 1587998491166337.9006616718847; Mon, 27 Apr 2020 07:41:31 -0700 (PDT) Received: from localhost ([::1]:48600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jT4wp-0001zM-8K for importer@patchew.org; Mon, 27 Apr 2020 10:41:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56830) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jT4v3-00088d-T5 for qemu-devel@nongnu.org; Mon, 27 Apr 2020 10:39:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jT4v3-0007kC-7L for qemu-devel@nongnu.org; Mon, 27 Apr 2020 10:39:37 -0400 Received: from mail-am6eur05on2133.outbound.protection.outlook.com ([40.107.22.133]:24288 helo=EUR05-AM6-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 1jT4v1-0007iF-6c; Mon, 27 Apr 2020 10:39:35 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5527.eurprd08.prod.outlook.com (2603:10a6:20b:de::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 14:39:31 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::acfa:5:88c8:b7b9%3]) with mapi id 15.20.2937.020; Mon, 27 Apr 2020 14:39:31 +0000 Received: from localhost.localdomain (185.215.60.182) by FRYP281CA0010.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 14:39:30 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gtmSjwNeZY64L81+1zGxMwdXM60mQLbndKaCAXNcltdIyu4u5OJrtHOaD0YOgUaNg9pciqDcN71/rCcD2qn/pIRA3poZ3MVBtQQEdSD21R1t5plHj1up4mQHUBDnqnpIbziw6d+xAD0cMsVnnlw971+8laZdDEwtrZ01aIOct4wl8W4W8OogWK3Ye5ZhZCoovxwvmKtOp3iLMP9k4w/QwTbpdMCUnY9RTVJdn4YFUU1ruJbC9AKXKGfZVWNzXcMmy16KnxGrmyZy54Y4NJTtnbZ5Z2AV4V2wdHV2FYaNRe5o9Hwt9Po6o3QHPhxw7agFpj3N+SZM/ZHxTD+aeLADqg== 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=ErVBdh1cF9BloFlIPWQR4KJ9no3velI5wxrkcsnsz10=; b=gPfssuudhts8JQZe8K+LqW//JSxB3UuiUNfbAaK2On2hHE7bxhh6UfQ9WKIimRqguEw28AfA/CfRwgu/rrGIbkIqliQtlRIp1xen/uDMRI7n9KyQsJRddAT4WgsodVYWCyDaVdqtkv3VoCWfN3CsmMqrzSdmaFIUTe7YtcI8/x5BK1ss0paYYgISnZXhda4DxHFKyVzSfzyfbl0LVU7XYJHhFAAKUnNzIewwlI9VhqxBbkvReks3trV32wQ134kS0ftWz8nhV2Fo3svaigvynKXipomJl7Qdu8GEfZQLp3R5Sbjo/dCCzJYIE38oTbdcOOj1iTE8F+eNek+jSFM1sg== 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=ErVBdh1cF9BloFlIPWQR4KJ9no3velI5wxrkcsnsz10=; b=PwBQnxwi03Nge20My+bDPshC448qiPpMC7ayEUWMTwYNZ+E8YwqS2IvwrSe3YLqojJU87wW54dCrJSYpBGCmpbi7/LT+3+v29m5Y+u9EY4ith5oXSn9SvCLElXJYEGruFJYQOPNRQMo/jESSn9KJgpElQ2F8bp5dd4f7qyTLaMk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=vsementsov@virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 1/9] block/io: refactor bdrv_is_allocated_above to run only one coroutine Date: Mon, 27 Apr 2020 17:38:59 +0300 Message-Id: <20200427143907.5710-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200427143907.5710-1-vsementsov@virtuozzo.com> References: <20200427143907.5710-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FRYP281CA0010.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10::20) 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.182] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a5f691e0-cb14-4127-3321-08d7eab8cbf5 X-MS-TrafficTypeDiagnostic: AM7PR08MB5527: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-Forefront-PRVS: 0386B406AA 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)(39840400004)(376002)(396003)(366004)(136003)(346002)(5660300002)(107886003)(316002)(2906002)(6512007)(478600001)(6486002)(66946007)(66476007)(66556008)(69590400007)(1076003)(2616005)(956004)(81156014)(16526019)(86362001)(6506007)(52116002)(186003)(36756003)(8676002)(8936002)(6666004)(26005)(6916009)(4326008); DIR:OUT; SFP:1102; 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: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Vr875pw0KFLFfNWddvBO0qpCI++kCvRvdgj293M0gsoygzPrtih9h/XbMyTBPnpO+heylPoYYDO0nGMBeYbzIA25YnT/Tka+RTunUPN7r9vMdUpcBG20QpdwGciOV1EIa3yu85dHmcbTlKCmbZIIaARc7kUjHATNpEfICaGcB4zPqb2g/quRng7nfSzQNXjTse8e4kO7+/uXzShhwddBrdu9FOnhtggedSdOC/bYqZPaf7OFXIm/S2P6QiX2R0N/sG5AH+HVZtabFsM+eztZAOX9QumRzeG7lnPpA1aFzo+Or2HYgmlw5WIoVpAS9D5ckUikXYTkalndYldEZUgTtKOfwkvzDDZBNCwrlMlwV1Bs8xD7eAEXwpJJxUotwMID6quryqZIvmPLqSereP/UXqivI09nBHIaATnyI3QCKnPkKfUPoPEsxa7c1BuWPkkmbQ7x0uB2QrHOXMf7sfOW+AbUVjeXQOcDzLCf/XyH1WK0PAyyOya+H82dtu8YmlFV X-MS-Exchange-AntiSpam-MessageData: Pay+4kQ4H0fJK1e5JriQyZVh6lxRQhMNhMiDEDzliHEpBT3gEHQQEq/i24OhJ0zCvz+CXOhA+0QDXaoOtQBASvDvDW65Oi7s17NIlrJZCShdiFjmkBPpbsG/g9a5t8TqLav3foFotkT/pwQRrtU1GkPwn14T+f82wLSx4zXvlmieXm2eqolhvQJ2y9AeBiCaPIbUZwkTM8u5+EQGtfPEt8PcGL2ubKrGqVwJqxEQoQnI6hn20qaEjrqlL/UIWhhfGkUMjoyiwABY3VEQWgB9CFQaGr9hQz4Ag1IxUxFN6b6GiVTgvGXPxWmzNk7RbN6Oc1F6gr9l57mSeX+jM4ExQs+khbcIVH1OPE16mwVcuGpC5GNkW8tYKG1WKitrM3RrHf/wAcqdoAdL3T1RKe4eHwgAX4OPyqKZPBpvIgKKhpNFhWAOtAM3OqRxBzDXiv1Y64AdcNTuE3MfdRE9iWZ0NQgZB783/Mif2oO4Y2US2cDytsdITmn7yL6t2DjzJnxg5bxwss61EFFD3cGFAjxdCppz3fEViPvIOm8o1xYLKOIpXyBzsRUdig7dkN5/ztrR1sOx8f0rDouG0ekqzdP/uAjfF18M0YXcScNzPbWfzb7KPvTEJZJkcKGAapJ4wJzEGC16gQ5dOR7l/gv+Z0jp/ZwXgG1OQbxPfpyzvKHBgDXSffVC/qniZ/K5EPDuMZ8/KB/qJPOyBvtiVpf4fpoVTE+Xyv88lEa/xQrMGTjcW8A3ZkD5hTvPiUnzMPfmznZLMjxtrXAotYY3cnqMIyjBxDxVQPHOf2euDsSSnqv2eLs= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5f691e0-cb14-4127-3321-08d7eab8cbf5 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 14:39:31.4404 (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: krA8otFK1fQlwC6ubbvbQE6aV94iffzoLCogxvNQQtMk1Z5xJ5Dwtcwf0BxfQfBY83hr6eFoAJGWvJxjlWDLzeOzZUnxtaGdb+36SiGu1W0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5527 Received-SPF: pass client-ip=40.107.22.133; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-AM6-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/27 10:39:31 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Received-From: 40.107.22.133 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 creates new coroutine on each iteration if called from non-coroutine context. To simplify expansion of in_flight inc/dec sections in further patch let's refactor it. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/io.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 71 insertions(+), 5 deletions(-) diff --git a/block/io.c b/block/io.c index aba67f66b9..94ab8eaa0f 100644 --- a/block/io.c +++ b/block/io.c @@ -2482,6 +2482,22 @@ static int coroutine_fn bdrv_co_block_status_above(B= lockDriverState *bs, return ret; } =20 +static int coroutine_fn bdrv_co_is_allocated(BlockDriverState *bs, + int64_t offset, int64_t bytes, + int64_t *pnum) +{ + int ret; + int64_t dummy; + + ret =3D bdrv_co_block_status_above(bs, backing_bs(bs), false, offset, + bytes, pnum ? pnum : &dummy, NULL, + NULL); + if (ret < 0) { + return ret; + } + return !!(ret & BDRV_BLOCK_ALLOCATED); +} + /* Coroutine wrapper for bdrv_block_status_above() */ static void coroutine_fn bdrv_block_status_above_co_entry(void *opaque) { @@ -2578,10 +2594,10 @@ int coroutine_fn bdrv_is_allocated(BlockDriverState= *bs, int64_t offset, * 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) +static int coroutine_fn +bdrv_co_is_allocated_above(BlockDriverState *top, BlockDriverState *base, + bool include_base, int64_t offset, int64_t byte= s, + int64_t *pnum) { BlockDriverState *intermediate; int ret; @@ -2595,7 +2611,7 @@ int bdrv_is_allocated_above(BlockDriverState *top, int64_t size_inter; =20 assert(intermediate); - ret =3D bdrv_is_allocated(intermediate, offset, bytes, &pnum_inter= ); + ret =3D bdrv_co_is_allocated(intermediate, offset, bytes, &pnum_in= ter); if (ret < 0) { return ret; } @@ -2624,6 +2640,56 @@ int bdrv_is_allocated_above(BlockDriverState *top, return 0; } =20 +typedef struct BdrvCoIsAllocatedAboveData { + BlockDriverState *top; + BlockDriverState *base; + bool include_base; + int64_t offset; + int64_t bytes; + int64_t *pnum; + int ret; + bool done; +} BdrvCoIsAllocatedAboveData; + +static void coroutine_fn bdrv_is_allocated_above_co_entry(void *opaque) +{ + BdrvCoIsAllocatedAboveData *data =3D opaque; + + data->ret =3D bdrv_co_is_allocated_above(data->top, data->base, + data->include_base, + data->offset, data->bytes, + data->pnum); + data->done =3D true; + aio_wait_kick(); +} + +int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base, + bool include_base, int64_t offset, int64_t byt= es, + int64_t *pnum) +{ + Coroutine *co; + BdrvCoIsAllocatedAboveData data =3D { + .top =3D top, + .base =3D base, + .include_base =3D include_base, + .offset =3D offset, + .bytes =3D bytes, + .pnum =3D pnum, + .done =3D false, + }; + + if (qemu_in_coroutine()) { + /* Fast-path if already in coroutine context */ + bdrv_is_allocated_above_co_entry(&data); + } else { + co =3D qemu_coroutine_create(bdrv_is_allocated_above_co_entry, &da= ta); + bdrv_coroutine_enter(top, co); + BDRV_POLL_WHILE(top, !data.done); + } + + return data.ret; +} + typedef struct BdrvVmstateCo { BlockDriverState *bs; QEMUIOVector *qiov; --=20 2.21.0