From nobody Sat May 18 14:54:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1588140763; cv=pass; d=zohomail.com; s=zohoarc; b=X8OInlEFuhUA8o0pTkLT4J4EdWqo4TSWo9AFlMuRVbfy2QwHDvPPcjugVOHvGhcAl43iS9h4/Q90ZjPob0Pe2CBqa8di54pinMm7PDp/9B3d0lxEOvycBQWrTXlEjVaz6sQcd4NIizDrro8/6kDfep+CnSPJ5NzEuAy9VflpgaE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588140763; 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=qezvwwFTEgotZqdewgCAh9NUdboi37YOb9djMus6cSs=; b=HoENjj48wtIFapR3KlCiOkcVGhmbCTFmaaP5jLOXAbHvd2P3Yw6L5fLYi0FYIP632riq3qq50hfuB71SqLO07XdcGt78cIx5d4oHxUv9SZU4yI2g+bZXi0/d0KxIzrRnNnCvF8EnDWYsuMxzLQCtMJ62NR+68jxmDLj/yLYnHWU= 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 1588140762518273.53435814234217; Tue, 28 Apr 2020 23:12:42 -0700 (PDT) Received: from localhost ([::1]:50332 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTfxZ-0007oH-0Q for importer@patchew.org; Wed, 29 Apr 2020 02:12:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39320) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTfw8-0005at-6M for qemu-devel@nongnu.org; Wed, 29 Apr 2020 02:11:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTfw7-00026k-H8 for qemu-devel@nongnu.org; Wed, 29 Apr 2020 02:11:11 -0400 Received: from mail-db8eur05on2137.outbound.protection.outlook.com ([40.107.20.137]:43808 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 1jTfw5-00023u-2Q; Wed, 29 Apr 2020 02:11:09 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5382.eurprd08.prod.outlook.com (2603:10a6:20b:108::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13; Wed, 29 Apr 2020 06:11:05 +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.023; Wed, 29 Apr 2020 06:11:05 +0000 Received: from localhost.localdomain (185.215.60.184) by FR2P281CA0023.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Wed, 29 Apr 2020 06:11:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mK31tIKvNWkZyhZRqP3lwVkYPvxypodMKNPGmyXuXoTsu7P3GpXplhxHt2Mefwi+sPOFIDEp1t60A/bzQk8zAegRy97NPs8haJLeKSQU4hHwvHe1By8wp3XAaWCNkIQQ22xdEptdGJsiohetrceqRw/jn0MsdMtvIFvJOy4NWMPoFqFraMfm9PhR6j9HupDwSTjsZQbyxkd81lEEwHsFshvm5tt6E5PFeR2FTkyqguQR/hy0Y9HBpXCm5ex5P1wawGNQ7V08wxSoljh75tgjBz4OmJ8PNkaFX2RIONPz6u6oKVmKdGBV726IucXoE+IHgMLsdpCzVfuCQeYaOonaGw== 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=qezvwwFTEgotZqdewgCAh9NUdboi37YOb9djMus6cSs=; b=m9pdRK2HJMSb9FM3nBJU19VSReGD7Fu4+RchfrZiuBYU7Bk4bjm9ilSbxDhKplLeyckvviJlZ7v1RVUSEuQLOVAOPV9dZaGHpj1zr02iMghTkIOiY3+3laUEe/0P6Ap5gJ0tyspeYmaADfQtwTwYiGbfMxIcYdE9z0NK+waKwQtpAKHbtCYSw+PyHnfE0eL4IGXGhsjb5nLHro2gNrB+FYkhTAjunbWXNgIioVIUmug4yGfw3VNP7vvUrJh96x2p0m/dPsGjQUNjPkMixaNgMBMEbthh81ohd2vMyQHCwyZI0vnbN4pXr9nsvZhtVeIcus6F8j2EHV7lgLFVYZsoXg== 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=qezvwwFTEgotZqdewgCAh9NUdboi37YOb9djMus6cSs=; b=QvEIbzak83Lnltzj306aGemITqqlaZ/4oYfBDy7pUwzr6ijC7aEuA8Ne6ucBhifiNRRkIjubA0pGStzCWscx4UHIe0IMZzxm5/I4D9UMj3NcX4aE1ZwJ/aaGEQPr8qWbMsXOZbLd+Jz4yE0qnIfcXx9oVVN8Lj9xqSBuRxH+mXc= 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/block-copy: rename in-flight requests to tasks Date: Wed, 29 Apr 2020 09:10:35 +0300 Message-Id: <20200429061039.12687-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200429061039.12687-1-vsementsov@virtuozzo.com> References: <20200429061039.12687-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0023.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::10) 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.184] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5c15a9b4-7c7c-4b9e-df36-08d7ec0419d5 X-MS-TrafficTypeDiagnostic: AM7PR08MB5382: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:345; X-Forefront-PRVS: 03883BD916 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)(366004)(346002)(136003)(376002)(39830400003)(396003)(26005)(5660300002)(16526019)(36756003)(316002)(86362001)(6486002)(956004)(6666004)(107886003)(8676002)(1076003)(2616005)(8936002)(186003)(4326008)(6506007)(69590400007)(52116002)(2906002)(478600001)(66946007)(66476007)(6512007)(66556008)(6916009)(334744003); DIR:OUT; SFP:1102; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: G3p48O/l3NldSve6vtPgi9ymOooPb9PTX1XouCl7FW8zWsE+xBO/qcZ6535T2d4PThrgCMkNUGgqZd+Me2SmXshpfN7b4Ta6Rf0NUFHXZ9oZW4UwQ3q+Oe6TCtpj6Va600lSkRvnTIN0qFg3dXmEpwCX91s4QdlJn2c0+F5zAM6CMi8zgG8BqkCo2kwKG+DyVK+tW0OX4EbypDd9uR18ViGr1d2aB+irMTb9T2DzlHmVTisSwj4dAnB44H0wKuSsdJNssTJmVsel9ARjJNM562W5SJSdPz8gm4O0u0ZFyCbVqmYAybcIRnVFLrc6fE8CCALcty4p3UQKfYBFMv4H+kXKHCAe1nClOv9ZKxIlNDKvimshuVNTiunDgLh/MibevRFk5ZdIoX7j+H2h4Ln1Ju7jxl1q9tLlNHzYFzaS3X3xZ9HZRjGPI0UryI/bZKrZ/tnkn4R6vjkR0L8caiyH+6EQy2QgzIuKFB5U4TMsnzuHKD0tH6egVtMtEyOusBQ1EkpeBoK7ETou2A+lg/lOgQ== X-MS-Exchange-AntiSpam-MessageData: yccjeH4vc+/1rvX65Uyo5SqNTArj0fSVYkuApQgtIj9j6CGgfIl+vIntBYe6VjuFNJw7sDyyvHqovgPX6gyQtnPeM2h5KWLibolszJcpvvKI6njRQPLalOyAX7yVSVk7izcCU9MBpenjpVCaoCgIGrrSlr6ntGvDUlAm/wjiDCoEkesBkEAN+dovk1oJOi+FuPUE4S/uYaM+HfIrG4vKl+0LiU43rj5WvcbXfjG6PequT504/rEASpC+xZWSpwOZeaSSzAzC0BLooKwUKKaHxG/HNQO4GVnJnoDCll+ofy/aXh2qwo0vgiD+6kYj280dmsu2Oj8hsvfZ4ggNgdhN1QvbDGhbSG8zng8Bt6A7ZpBrSxz3A+PDrztkw7nuzFOjfP2If2V6+7ezduJyDkzl0jqcXb0zHJmJfWCu6aRFSUYj+DHJgt7lGz1y74+rllB2UPuaDXYXy7Hm5yuICB2PtDpd4yHdAiT0xOYkMciM1pIg+mcXLDgruBzoIztduF+a9KRXBs10D3N0wvV7aBOWRL3Ywu3DqxdoBiUwRCE1CWEztFiYhBJvPpmIS1oKNobjsbXNeoBIh6AmtIFIJdl9KGSGqn0vw8DOIB1sPMY6zv+WeRrAcWlQsBiO5rNSI2dEEo6Q5Jfrky10WT6zkK2Uk7vKONZ8yaLuQpV3e53+SaNa+HJNVUnF/fw+7VpqGqoMSQjAZtlpc+jcXqSu7d+shOdN1zRz64JeswGkMBOqF6p/D4BWM1CVNfl/3TQ/LhVzbPAnGnl5bfON+B41mNfM03htqQ/X0ij5RDHcRJEMJNA= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5c15a9b4-7c7c-4b9e-df36-08d7ec0419d5 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2020 06:11:05.5427 (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: P6VaR8Zp2vwzk5gV4qk/cMh3H/ej3AmLO3w8JuLPdqLnS8lcZ/wvBhOthrl/BLi3NgpBCwYLJivSiXvyAVB4PgPXaPf/JoOyrovE7qJCmM0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5382 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.20.137; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 02:11:05 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Received-From: 40.107.20.137 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, den@openvz.org, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com 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 use aio-task-pool API and extend in-flight request structure to be a successor of AioTask, so rename things appropriately. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/block-copy.c | 98 +++++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 50 deletions(-) diff --git a/block/block-copy.c b/block/block-copy.c index 05227e18bf..bbb29366dc 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -24,12 +24,12 @@ #define BLOCK_COPY_MAX_BUFFER (1 * MiB) #define BLOCK_COPY_MAX_MEM (128 * MiB) =20 -typedef struct BlockCopyInFlightReq { +typedef struct BlockCopyTask { int64_t offset; int64_t bytes; - QLIST_ENTRY(BlockCopyInFlightReq) list; - CoQueue wait_queue; /* coroutines blocked on this request */ -} BlockCopyInFlightReq; + QLIST_ENTRY(BlockCopyTask) list; + CoQueue wait_queue; /* coroutines blocked on this task */ +} BlockCopyTask; =20 typedef struct BlockCopyState { /* @@ -45,7 +45,7 @@ typedef struct BlockCopyState { bool use_copy_range; int64_t copy_size; uint64_t len; - QLIST_HEAD(, BlockCopyInFlightReq) inflight_reqs; + QLIST_HEAD(, BlockCopyTask) tasks; =20 BdrvRequestFlags write_flags; =20 @@ -73,15 +73,14 @@ typedef struct BlockCopyState { SharedResource *mem; } BlockCopyState; =20 -static BlockCopyInFlightReq *find_conflicting_inflight_req(BlockCopyState = *s, - int64_t offset, - int64_t bytes) +static BlockCopyTask *find_conflicting_task(BlockCopyState *s, + int64_t offset, int64_t bytes) { - BlockCopyInFlightReq *req; + BlockCopyTask *t; =20 - QLIST_FOREACH(req, &s->inflight_reqs, list) { - if (offset + bytes > req->offset && offset < req->offset + req->by= tes) { - return req; + QLIST_FOREACH(t, &s->tasks, list) { + if (offset + bytes > t->offset && offset < t->offset + t->bytes) { + return t; } } =20 @@ -89,73 +88,72 @@ static BlockCopyInFlightReq *find_conflicting_inflight_= req(BlockCopyState *s, } =20 /* - * If there are no intersecting requests return false. Otherwise, wait for= the - * first found intersecting request to finish and return true. + * If there are no intersecting tasks return false. Otherwise, wait for the + * first found intersecting tasks to finish and return true. */ static bool coroutine_fn block_copy_wait_one(BlockCopyState *s, int64_t of= fset, int64_t bytes) { - BlockCopyInFlightReq *req =3D find_conflicting_inflight_req(s, offset,= bytes); + BlockCopyTask *task =3D find_conflicting_task(s, offset, bytes); =20 - if (!req) { + if (!task) { return false; } =20 - qemu_co_queue_wait(&req->wait_queue, NULL); + qemu_co_queue_wait(&task->wait_queue, NULL); =20 return true; } =20 /* Called only on full-dirty region */ -static void block_copy_inflight_req_begin(BlockCopyState *s, - BlockCopyInFlightReq *req, - int64_t offset, int64_t bytes) +static void block_copy_task_begin(BlockCopyState *s, BlockCopyTask *task, + int64_t offset, int64_t bytes) { - assert(!find_conflicting_inflight_req(s, offset, bytes)); + assert(!find_conflicting_task(s, offset, bytes)); =20 bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes); s->in_flight_bytes +=3D bytes; =20 - req->offset =3D offset; - req->bytes =3D bytes; - qemu_co_queue_init(&req->wait_queue); - QLIST_INSERT_HEAD(&s->inflight_reqs, req, list); + task->offset =3D offset; + task->bytes =3D bytes; + qemu_co_queue_init(&task->wait_queue); + QLIST_INSERT_HEAD(&s->tasks, task, list); } =20 /* - * block_copy_inflight_req_shrink + * block_copy_task_shrink * - * Drop the tail of the request to be handled later. Set dirty bits back a= nd - * wake up all requests waiting for us (may be some of them are not inters= ecting - * with shrunk request) + * Drop the tail of the task to be handled later. Set dirty bits back and + * wake up all tasks waiting for us (may be some of them are not intersect= ing + * with shrunk task) */ -static void coroutine_fn block_copy_inflight_req_shrink(BlockCopyState *s, - BlockCopyInFlightReq *req, int64_t new_bytes) +static void coroutine_fn block_copy_task_shrink(BlockCopyState *s, + BlockCopyTask *task, + int64_t new_bytes) { - if (new_bytes =3D=3D req->bytes) { + if (new_bytes =3D=3D task->bytes) { return; } =20 - assert(new_bytes > 0 && new_bytes < req->bytes); + assert(new_bytes > 0 && new_bytes < task->bytes); =20 - s->in_flight_bytes -=3D req->bytes - new_bytes; + s->in_flight_bytes -=3D task->bytes - new_bytes; bdrv_set_dirty_bitmap(s->copy_bitmap, - req->offset + new_bytes, req->bytes - new_bytes); + task->offset + new_bytes, task->bytes - new_byte= s); =20 - req->bytes =3D new_bytes; - qemu_co_queue_restart_all(&req->wait_queue); + task->bytes =3D new_bytes; + qemu_co_queue_restart_all(&task->wait_queue); } =20 -static void coroutine_fn block_copy_inflight_req_end(BlockCopyState *s, - BlockCopyInFlightReq = *req, - int ret) +static void coroutine_fn block_copy_task_end(BlockCopyState *s, + BlockCopyTask *task, int ret) { - s->in_flight_bytes -=3D req->bytes; + s->in_flight_bytes -=3D task->bytes; if (ret < 0) { - bdrv_set_dirty_bitmap(s->copy_bitmap, req->offset, req->bytes); + bdrv_set_dirty_bitmap(s->copy_bitmap, task->offset, task->bytes); } - QLIST_REMOVE(req, list); - qemu_co_queue_restart_all(&req->wait_queue); + QLIST_REMOVE(task, list); + qemu_co_queue_restart_all(&task->wait_queue); } =20 void block_copy_state_free(BlockCopyState *s) @@ -223,7 +221,7 @@ BlockCopyState *block_copy_state_new(BdrvChild *source,= BdrvChild *target, s->copy_size =3D MAX(s->cluster_size, BLOCK_COPY_MAX_BUFFER); } =20 - QLIST_INIT(&s->inflight_reqs); + QLIST_INIT(&s->tasks); =20 return s; } @@ -474,7 +472,7 @@ static int coroutine_fn block_copy_dirty_clusters(Block= CopyState *s, assert(QEMU_IS_ALIGNED(bytes, s->cluster_size)); =20 while (bytes) { - BlockCopyInFlightReq req; + BlockCopyTask task; int64_t next_zero, cur_bytes, status_bytes; =20 if (!bdrv_dirty_bitmap_get(s->copy_bitmap, offset)) { @@ -495,14 +493,14 @@ static int coroutine_fn block_copy_dirty_clusters(Blo= ckCopyState *s, assert(next_zero < offset + cur_bytes); /* no need to do MIN()= */ cur_bytes =3D next_zero - offset; } - block_copy_inflight_req_begin(s, &req, offset, cur_bytes); + block_copy_task_begin(s, &task, offset, cur_bytes); =20 ret =3D block_copy_block_status(s, offset, cur_bytes, &status_byte= s); assert(ret >=3D 0); /* never fail */ cur_bytes =3D MIN(cur_bytes, status_bytes); - block_copy_inflight_req_shrink(s, &req, cur_bytes); + block_copy_task_shrink(s, &task, cur_bytes); if (s->skip_unallocated && !(ret & BDRV_BLOCK_ALLOCATED)) { - block_copy_inflight_req_end(s, &req, 0); + block_copy_task_end(s, &task, 0); progress_set_remaining(s->progress, bdrv_get_dirty_count(s->copy_bitmap) + s->in_flight_bytes); @@ -518,7 +516,7 @@ static int coroutine_fn block_copy_dirty_clusters(Block= CopyState *s, ret =3D block_copy_do_copy(s, offset, cur_bytes, ret & BDRV_BLOCK_= ZERO, error_is_read); co_put_to_shres(s->mem, cur_bytes); - block_copy_inflight_req_end(s, &req, ret); + block_copy_task_end(s, &task, ret); if (ret < 0) { return ret; } --=20 2.21.0 From nobody Sat May 18 14:54:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1588140817; cv=pass; d=zohomail.com; s=zohoarc; b=QYq2Lkz41CHvR7eRqJ8DybKisSQ9nFeLjXJPfEFQApZBnN4foLHSZ3Z85qlKyBV7Q3EwR/Y8PecC0iZ2O4Uei+wmQrSiLc6hlPrCXWEwvmigsoQWp4LUvPssdM0nAifo56b6F1z5fSM2CW76mPz5IF1EAupOzGb90rs1/aXRgfk= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588140817; 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=FseS9y9dE4GNUMXB/bqW54x6DCElqlOU+2wOmVvQJdc=; b=S0Yjpy6WdNAw7/TBBCDniNEhYok0iMnZjoCtJ1zmmT8mjpeeb7YO8eAjuF/ESfnELs+NwtkquipxMyHQnqOSdKZTOG0sT4mdyqlZ3hfXD4u4ALl1jMSa7skPNX8RAMTW6y6ZxC/z34cNyc7giDQQH1eFVcaGmck0pElN/rR3fkQ= 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 1588140817037372.9499424301241; Tue, 28 Apr 2020 23:13:37 -0700 (PDT) Received: from localhost ([::1]:55754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTfyR-0001ZP-Rx for importer@patchew.org; Wed, 29 Apr 2020 02:13:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39316) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTfw8-0005ar-4u for qemu-devel@nongnu.org; Wed, 29 Apr 2020 02:11:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTfw7-00026e-FH for qemu-devel@nongnu.org; Wed, 29 Apr 2020 02:11:11 -0400 Received: from mail-vi1eur05on2121.outbound.protection.outlook.com ([40.107.21.121]:61758 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jTfw5-000240-Iq; Wed, 29 Apr 2020 02:11:09 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5301.eurprd08.prod.outlook.com (2603:10a6:20b:dd::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.19; Wed, 29 Apr 2020 06:11:06 +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.023; Wed, 29 Apr 2020 06:11:06 +0000 Received: from localhost.localdomain (185.215.60.184) by FR2P281CA0023.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Wed, 29 Apr 2020 06:11:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F06Wi9s12zUudKkKhNKdlW4DtO+fhvNDLN3N00R9pzZyTYQuNSTeq188YLx7clrE6dwyQI1QkYdTIV+Nq9ACFpkFDUYnEjLqZJIz8V1kAkPp8eEbggXY1056EZUzZg4I6v/o1aA/2+89jEbAmCh8zqj522OY5Ffatzj1PVL0lDQu3xHmHvDYA65qUPlv/7Aejdi+VGU2/OdF4sGwPkHTfSIjTe6Pbr34L8lQlO8LbbU6WHCWpG7gdAsfxexHRW6n298c2D4SPtk2G1wDzSsiASuIK+YfecJu5iQQsfLoVoTYEIv1qYYVj4VL46s4hOfUX8kKjTp6ASKOCLhsAEuY/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FseS9y9dE4GNUMXB/bqW54x6DCElqlOU+2wOmVvQJdc=; b=UenBraikBtLqRUiHcIrtrm5JS89edWpifU5QlvdODxO0eTUWhLph2D0vSaMDKj97OX1eWlcS+24jdLN/1wnxy7LvkI3Ogf9m4Qg7jEsGZsxps60or3yPCISP9trJuUw1jyqSK+Myb/qCVBHtO4titsiPA0qICVjgcFduODV3iMoXXp2ttV8YUa/R+pzBWDppGNWw7SQnhPRbgaTOt2tgcIxb6aesJb93Vq2LNUglm6pz2sQexeIcCVpMquVMc9hG3MDHNYoxBnTodVxI9j+f3Dq38GrbtjEMyFzr1mKtB8roCdFUD7huAVNxzv8oAjqWwtM56Y02wU89dMYSt8B/sw== 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=FseS9y9dE4GNUMXB/bqW54x6DCElqlOU+2wOmVvQJdc=; b=AFCKLEESG0SqL24jNJeAyiGuDV4RZZ3/xGMtqvVpQWBBYDJS0J9iJXVBBuCNuuhsB3GUJJXIWyH/q6vsr2JE/qmQV/hP456zXiZWzy+DH/YDSaivDczVDQ+IlFzemonvmWkYqLKOz2+DXzgGbrOnmYILlh9WYKnAHgfknRUCy18= 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/block-copy: alloc task on each iteration Date: Wed, 29 Apr 2020 09:10:36 +0300 Message-Id: <20200429061039.12687-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200429061039.12687-1-vsementsov@virtuozzo.com> References: <20200429061039.12687-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0023.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::10) 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.184] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 75678ebe-e4a1-41be-4a7f-08d7ec041a3a X-MS-TrafficTypeDiagnostic: AM7PR08MB5301: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:69; X-Forefront-PRVS: 03883BD916 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7gMvTvGWsLP9NH758jncDsou1xDcOZvNOp1DDalFD4FU+FE/5VJMt3pFysvf4fgUKWFjFDai5PQdRJ2i5lpu/hOcekhzHUMvcGIuit+RwrqnUK+S1tQUWU4JS/l0MFToJr2U+YjC4PlPABFujzaqtP9vxsIAeJ4eGnvSkfaTXfzA4N80LC/SgDQlNrZv87EvGBt3lqjp4nXXaLLhnifAXbwllsw+YDle2d04JicZZJpWYDgBHJS00n7zg3IcvoQJ3UoMKbfe3oItB3p9wGkVpo4O7LFF50bTI2Gxv6ff8yUk8yZq96sDM8oYd+IkqCGfKzVWaD+4N01EwEz8xYok0W0fhuih5u5/NWtcyzt+xkZz0S8QRC60lGjRMKUWSOGsIP1Igxs1irqm/V2JK/3l1YrzYP9YUK9xmqyQvP5omI97zOpm6CrHDypinvigrwXy1QVmOBaegsS6xbhcqPAgj6mOxCHhTUjf6AwdX++pOGFDm+ZzjUognSZD/94nU1cr 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)(346002)(39830400003)(136003)(376002)(396003)(366004)(2906002)(1076003)(86362001)(36756003)(186003)(16526019)(26005)(956004)(4326008)(52116002)(5660300002)(6506007)(69590400007)(107886003)(6512007)(6486002)(2616005)(6666004)(478600001)(316002)(6916009)(8676002)(66556008)(66476007)(8936002)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 4nikeuNCKbu8/Fz+XD7fKMhF2BFg3Q4pFW4MBPoHz1++ixfp5Mpoazx9UG735uY87tx+V4dua1O4XH/cy/K3OEI/4wiqffksqXCXP1VdmQvdb0a5KPi0RRvA6G7HE0jpuuMmRUulS4bpnD/SJq0pyr6ntKTz6jKgQiq2iHw6bGcKyPuSqBA20k983dBPsDcohd+WAC0elM8Bp9Rm2tMWiSWY1PXXK4J6kcXPrT+L3wLcjpHZu66NAaeen5dChdzHkMOnWfl0IcIcOGBIsfsEU3K3wmvpJ6cpM6bHH+1fe9np3qorvpxd1zj/GLzcVphqX6OlD3BsXfwT2+fGRp0aNEt3po+MdpxExE3f5fVUweFoIPqUid9//rsf3o75j0f5kWZetfyTG/4Y3FioeQ2LLyOEucI/vEuHnh0gx39j1TOkqQwp7dFDjTO/K5Prf3E7VwH5cwwADtKGuJ7/bV/E3G8JNyZTTUFfonMMGsC0lxuH97bmeeLRpymmYXt1G97cRJ4S4UUseYnXUlvA6i5u0jnWmoWJ/ClAyyiaq0Czq2GV2WWm9CaFmvhSQRYBqa+BrKhC+dtNO62TTBB0an9TMfKPQtAGViqAau8e3fjHlgPg8Vw3XT8T1M1l742f4wKJGwSzSrDsJ+0bA2TZn6gewVLbBGMN/rLyBXxE8VgIJ5hs1UHkkNk4HyStk1zkgnIyoSL9S4B8y1uePfg1x69kUXFv331k/n6nr4GeP/gZ3q7wII3OElMGGIjERgzaNNWTjD/c1zXMQUYdG26XE5JwKiOlHPuXZLWlQD6Z+R/7zBA= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 75678ebe-e4a1-41be-4a7f-08d7ec041a3a X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2020 06:11:06.1600 (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: uLrqu8YI6x0VoT+OQs/vXXSVUfP831sB+lRxBz17PQWuUwdKNtyA87XI1DQ8isxV2S2Wovda61OGNboekM02QKUGM9tLGQPzj8or60OKd0I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5301 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.21.121; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 02:11:07 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Received-From: 40.107.21.121 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, den@openvz.org, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com 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 use aio-task-pool API, so tasks will be handled in parallel. We need therefore separate allocated task on each iteration. Introduce this logic now. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/block-copy.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/block/block-copy.c b/block/block-copy.c index bbb29366dc..8d1b9ab9f0 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -106,9 +106,11 @@ static bool coroutine_fn block_copy_wait_one(BlockCopy= State *s, int64_t offset, } =20 /* Called only on full-dirty region */ -static void block_copy_task_begin(BlockCopyState *s, BlockCopyTask *task, - int64_t offset, int64_t bytes) +static BlockCopyTask *block_copy_task_create(BlockCopyState *s, + int64_t offset, int64_t bytes) { + BlockCopyTask *task =3D g_new(BlockCopyTask, 1); + assert(!find_conflicting_task(s, offset, bytes)); =20 bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes); @@ -118,6 +120,8 @@ static void block_copy_task_begin(BlockCopyState *s, Bl= ockCopyTask *task, task->bytes =3D bytes; qemu_co_queue_init(&task->wait_queue); QLIST_INSERT_HEAD(&s->tasks, task, list); + + return task; } =20 /* @@ -472,7 +476,7 @@ static int coroutine_fn block_copy_dirty_clusters(Block= CopyState *s, assert(QEMU_IS_ALIGNED(bytes, s->cluster_size)); =20 while (bytes) { - BlockCopyTask task; + g_autofree BlockCopyTask *task =3D NULL; int64_t next_zero, cur_bytes, status_bytes; =20 if (!bdrv_dirty_bitmap_get(s->copy_bitmap, offset)) { @@ -493,14 +497,14 @@ static int coroutine_fn block_copy_dirty_clusters(Blo= ckCopyState *s, assert(next_zero < offset + cur_bytes); /* no need to do MIN()= */ cur_bytes =3D next_zero - offset; } - block_copy_task_begin(s, &task, offset, cur_bytes); + task =3D block_copy_task_create(s, offset, cur_bytes); =20 ret =3D block_copy_block_status(s, offset, cur_bytes, &status_byte= s); assert(ret >=3D 0); /* never fail */ cur_bytes =3D MIN(cur_bytes, status_bytes); - block_copy_task_shrink(s, &task, cur_bytes); + block_copy_task_shrink(s, task, cur_bytes); if (s->skip_unallocated && !(ret & BDRV_BLOCK_ALLOCATED)) { - block_copy_task_end(s, &task, 0); + block_copy_task_end(s, task, 0); progress_set_remaining(s->progress, bdrv_get_dirty_count(s->copy_bitmap) + s->in_flight_bytes); @@ -516,7 +520,7 @@ static int coroutine_fn block_copy_dirty_clusters(Block= CopyState *s, ret =3D block_copy_do_copy(s, offset, cur_bytes, ret & BDRV_BLOCK_= ZERO, error_is_read); co_put_to_shres(s->mem, cur_bytes); - block_copy_task_end(s, &task, ret); + block_copy_task_end(s, task, ret); if (ret < 0) { return ret; } --=20 2.21.0 From nobody Sat May 18 14:54:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1588140851; cv=pass; d=zohomail.com; s=zohoarc; b=nN7gvtGNnniQodsfhEQebHCVPMYjp4sQKsBQZejlnNJKMpmND05yk+hPnA6QR/GFxLpkevJ3tyIjddxdVgH8UAOvLp9LhcUqP4dVSx26hP4pw+KcG0qf6zg0mCRVD6EvKkg9kYI9ST2u1eg9tf8Z3tZ7K0j7UcvkMz7S6g3GkYY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588140851; 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=EbDSSgyfAn2eQ3B78rvdS9sD+o3H2ESB4pBZdgcChJU=; b=itSMrX8yrNJ0kLHo75xGP9puxBlKWBvS9lj73oHP7H1VnofV992Kra0/IUAO2olFYaHvDO6+Po3Cdbc0ZKiw9lyvkQznXnhk8SlMthcxJI7a6qI1tgA4emNAnOGRCWXRMconJaMT2dFhr+4WiLA7NKyOm/efMpTQIoGXfDwkZp4= 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 1588140851477593.1387918740455; Tue, 28 Apr 2020 23:14:11 -0700 (PDT) Received: from localhost ([::1]:57788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTfz0-0002Og-5h for importer@patchew.org; Wed, 29 Apr 2020 02:14:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39340) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTfw9-0005eL-VP for qemu-devel@nongnu.org; Wed, 29 Apr 2020 02:11:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTfw9-00027q-E7 for qemu-devel@nongnu.org; Wed, 29 Apr 2020 02:11:13 -0400 Received: from mail-vi1eur05on2121.outbound.protection.outlook.com ([40.107.21.121]:61758 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jTfw6-000240-IU; Wed, 29 Apr 2020 02:11:10 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5301.eurprd08.prod.outlook.com (2603:10a6:20b:dd::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.19; Wed, 29 Apr 2020 06:11:07 +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.023; Wed, 29 Apr 2020 06:11:06 +0000 Received: from localhost.localdomain (185.215.60.184) by FR2P281CA0023.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Wed, 29 Apr 2020 06:11:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ACYW/Qa4yxHrINmUCpiqQaI62oaYcMuR/xPu9Cu0Wci/PD+LQpd/9QZ2rsWdJYwrmkGomKIjHaofEQhKtHkZ3mPnR1a1LhePTp3MLO4+VVVVR/t91rHUr3599oJZcq19NcsyH3zP1AExQmTGScVHHLryyNyY/FUbDlgRhE4khNzmOhN7AxcZ2n0yTT+NWUDO+BvV7/nwYn8twcyf1ReJbrpLqHJ4FI+wiY9JmUWZq7XX5MB2Tn3vJ2+QdrXwonC78vf8+Lv7IoRjt7vcaqIOtS340uCD2fccPloLrnOh9JO72AfWUeA2cDy9qC59NdHj8eXxLTBSrejeehSjkC9E6Q== 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=EbDSSgyfAn2eQ3B78rvdS9sD+o3H2ESB4pBZdgcChJU=; b=AopZMzq2/MDgD4qLaNRzpua6X9hmq9OTfcGW8sesJNZZLk5Quni3Rh5+tninoQL747+0Fb1pdb1q0POny/EbdTAqvWiQbL2fberhRXpgMFdiPuarP3yMp7oUVKpf7gs0lVPhqJ3Keidxo6iIs6wZdPTcTk1vMVOAdF10gVVDsSo9OaOz1iP8cbarzRrK/bj+2ER8pww4hft3oZ22KlUjDlrnHPFsRpS5v1frOWSOoQIIT9nZpf94CYMHaX+ShR9QOe5QhxpBCZ62ZhK7GB40krO9xOt1S4t4+zRotBr0Uy1mkh2RrhPnoQN1GpKP6tjbBGR4SuTf7B8mX92usvvJXw== 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=EbDSSgyfAn2eQ3B78rvdS9sD+o3H2ESB4pBZdgcChJU=; b=BfXCTPtWYTkcORo6byFbY3J+fzQiI20Lr0fhvRnPvl6tH08oMnCsosYnsbUrhufuQVAwLRjYEzPUyxWdla1AxL2kOTeUqmYTYNil2eIy/jkPoFI+0cj0PvyNbq1T6uHDTPFAwQZ2gbjcuwBBauPPhM+O0VHA3ug9rvvf+UGloQA= 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/block-copy: add state pointer to BlockCopyTask Date: Wed, 29 Apr 2020 09:10:37 +0300 Message-Id: <20200429061039.12687-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200429061039.12687-1-vsementsov@virtuozzo.com> References: <20200429061039.12687-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0023.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::10) 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.184] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0acb8996-5843-4c6d-2719-08d7ec041a9a X-MS-TrafficTypeDiagnostic: AM7PR08MB5301: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:206; X-Forefront-PRVS: 03883BD916 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3YNAiDFudxtMTUCBxvbVttwYlZyskga7j8E0n0WSu9JajlFc3ywRl+HT+2zfXDL0DjE53+Em6gGiTzAH9IKImum6fznHvWMXHk3Vu23fKoDiGb9v01W6dO0tx5X83kSjffWWTOmpB2A3icQ6zUcREwNRM64pudREOkTOe9outcL7bnEjI3LjcJ191iPZQP6eWtnz7jT5bsy2TEQQ6pHQOw0of0QSMQXELAlgL/udzyPLVbU+beeiCh3zKMOob0/CCIosAxPmcI5Xt86xZ/dMEwhtyDbH+6CfVGk8g0sXxMYwpzJ6Gtd9zsszbTa1WC4JPH7Z/bUwgOlr8BmQQojRxfa0zScA8DR5GxOou8JaE+mqV2TzKQsIHkOEViZVlbgjKG8RMWama6foTtd71mqiqjCHj4hOLRSx6yOcilztN4TLuSSWiFKmuyklFhAxuepSDbGTvMwWumr1bnZQ18ARsZrmr0Al7dxeGeEHeoc5GUJI7q9g0ooBRW8vtDDA67O8 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)(346002)(39830400003)(136003)(376002)(396003)(366004)(2906002)(1076003)(86362001)(36756003)(186003)(16526019)(26005)(956004)(4326008)(52116002)(5660300002)(6506007)(69590400007)(107886003)(6512007)(6486002)(2616005)(6666004)(478600001)(316002)(6916009)(8676002)(66556008)(66476007)(8936002)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: SPGVjCdZ4rLmlWk3OZvOYGg0er8w6B6rwCwRcOEYVaizD2Zivscmesxqsc6RtCz5EwGdK61/rBZH5E/OwimrnYxH+GkEAJjivj3CV7AuwM4wF8kzQAk+Q99WBetYs1HcyWvPdz0oSJaXWLKV+QKeALT6bQbwzZaDB2EgN7jAyQSnn7r4JPymhG4rrP+6PDkkeoQFeHaIkI6MEEd1n6fCQXGyzMK2Ma+uOybMHjzKy09hcXU7+CXF/flKYmobzzavEMVIMtukK5h7ZLtLFU2+wnjfrtJKdx7l3IdkdGpef+XIhLuvQjFDDvvkIF1II3TDaScR6OJl5jGhptEQ7re3GEaJs0TC8ibk1/TYv3i0Hg2k3aCvT0qBTNb3dzHpCxIQapfRzW3aF9kR7xxq3XyrCWBWJzuhAESpBLcKHjTuXBNmTVL1rgkUzCYDZ4pc/zkii09EslF49cL8pS/7VawdJ89ExZVb4s9sVZVL5FMSfNfJCSo5pIZcskrvmIqw7EwRmDatT+LFU9ahiIGrPnfOuDuw/1YuzSIJ0amJTaYF+GnmRGfvqKlPyIrIW1+Kja2ztKE6a43mmkVdEaNzaH/vv3DgCmxPhw7gFXvaUfetTgT54hyCTcoCiFU4NscYbSxVyKm60KKYKhaXnj8nNBqeL0bGY0Dgmfc0Y4IQsaY4AmvW8YHHTriNQvAxSJpUX7ndJH4cCWQevVkb1T1cNa/lw0dACjIGpk2oKX4kJn+bSdo5+6mAyLhYFytziQYYFuxlEXQWQpcA3LtitbRfd9DcMDvCgPCbNFuPFdpjHEZ02GQ= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0acb8996-5843-4c6d-2719-08d7ec041a9a X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2020 06:11:06.9008 (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: rApIw2+7ts60Kb0wINO1MeP8h4lwYMrKU+LHNUMxZJeHY+dwN9csLEkEsRC22bYPjqHqQGzAOeRmhR+iptlL+7VIJPRR2saYA9+zc513Rj4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5301 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.21.121; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 02:11:07 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Received-From: 40.107.21.121 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, den@openvz.org, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com 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 use aio-task-pool API, so we'll need state pointer in BlockCopyTask anyway. Add it now and use where possible. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/block-copy.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/block/block-copy.c b/block/block-copy.c index 8d1b9ab9f0..35ff9cc3ef 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -25,6 +25,7 @@ #define BLOCK_COPY_MAX_MEM (128 * MiB) =20 typedef struct BlockCopyTask { + BlockCopyState *s; int64_t offset; int64_t bytes; QLIST_ENTRY(BlockCopyTask) list; @@ -116,8 +117,11 @@ static BlockCopyTask *block_copy_task_create(BlockCopy= State *s, bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes); s->in_flight_bytes +=3D bytes; =20 - task->offset =3D offset; - task->bytes =3D bytes; + *task =3D (BlockCopyTask) { + .s =3D s, + .offset =3D offset, + .bytes =3D bytes, + }; qemu_co_queue_init(&task->wait_queue); QLIST_INSERT_HEAD(&s->tasks, task, list); =20 @@ -131,8 +135,7 @@ static BlockCopyTask *block_copy_task_create(BlockCopyS= tate *s, * wake up all tasks waiting for us (may be some of them are not intersect= ing * with shrunk task) */ -static void coroutine_fn block_copy_task_shrink(BlockCopyState *s, - BlockCopyTask *task, +static void coroutine_fn block_copy_task_shrink(BlockCopyTask *task, int64_t new_bytes) { if (new_bytes =3D=3D task->bytes) { @@ -141,20 +144,19 @@ static void coroutine_fn block_copy_task_shrink(Block= CopyState *s, =20 assert(new_bytes > 0 && new_bytes < task->bytes); =20 - s->in_flight_bytes -=3D task->bytes - new_bytes; - bdrv_set_dirty_bitmap(s->copy_bitmap, + task->s->in_flight_bytes -=3D task->bytes - new_bytes; + bdrv_set_dirty_bitmap(task->s->copy_bitmap, task->offset + new_bytes, task->bytes - new_byte= s); =20 task->bytes =3D new_bytes; qemu_co_queue_restart_all(&task->wait_queue); } =20 -static void coroutine_fn block_copy_task_end(BlockCopyState *s, - BlockCopyTask *task, int ret) +static void coroutine_fn block_copy_task_end(BlockCopyTask *task, int ret) { - s->in_flight_bytes -=3D task->bytes; + task->s->in_flight_bytes -=3D task->bytes; if (ret < 0) { - bdrv_set_dirty_bitmap(s->copy_bitmap, task->offset, task->bytes); + bdrv_set_dirty_bitmap(task->s->copy_bitmap, task->offset, task->by= tes); } QLIST_REMOVE(task, list); qemu_co_queue_restart_all(&task->wait_queue); @@ -502,9 +504,9 @@ static int coroutine_fn block_copy_dirty_clusters(Block= CopyState *s, ret =3D block_copy_block_status(s, offset, cur_bytes, &status_byte= s); assert(ret >=3D 0); /* never fail */ cur_bytes =3D MIN(cur_bytes, status_bytes); - block_copy_task_shrink(s, task, cur_bytes); + block_copy_task_shrink(task, cur_bytes); if (s->skip_unallocated && !(ret & BDRV_BLOCK_ALLOCATED)) { - block_copy_task_end(s, task, 0); + block_copy_task_end(task, 0); progress_set_remaining(s->progress, bdrv_get_dirty_count(s->copy_bitmap) + s->in_flight_bytes); @@ -520,7 +522,7 @@ static int coroutine_fn block_copy_dirty_clusters(Block= CopyState *s, ret =3D block_copy_do_copy(s, offset, cur_bytes, ret & BDRV_BLOCK_= ZERO, error_is_read); co_put_to_shres(s->mem, cur_bytes); - block_copy_task_end(s, task, ret); + block_copy_task_end(task, ret); if (ret < 0) { return ret; } --=20 2.21.0 From nobody Sat May 18 14:54:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1588140927; cv=pass; d=zohomail.com; s=zohoarc; b=O2/t2s/rMDytT8WFZyo+1XMsaHHtoQPXqZvkf4MScqpknxsxAV68w2Qs+SgYJEhoRAFzYV/kcaXy4nNBku7tilxRGOIFAB68HtB6GDO03L+MNK47VK239aorL3NjAVJso7AeeWF2wwu4HqUAtzUan3w6Oqr8XwptbIGtIIybk8s= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588140927; 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=ndLM+pDrRi2zXlSAdNs7jK9RIu4e1Dymp/VaFhvDmVg=; b=JnhhkkPTX1QFueAhogm9VwgfF5teFSgOh3A45+FSLFOR68w4tJwIZeM2H2XVpUucEAZmppqsM7tBvS5AVfw+pqXoQeD3YSSXFlGlmR82r23MaAM9DJMI1x1RFIoxnNuFY/b5LieUJ1e5FXC/osac9QZHMPET3n3UO/CwwER1lCg= 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 1588140927913114.07807214292302; Tue, 28 Apr 2020 23:15:27 -0700 (PDT) Received: from localhost ([::1]:34588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTg0D-0004Qg-Ip for importer@patchew.org; Wed, 29 Apr 2020 02:15:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39346) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTfwA-0005fo-Ld for qemu-devel@nongnu.org; Wed, 29 Apr 2020 02:11:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTfwA-0002BD-1q for qemu-devel@nongnu.org; Wed, 29 Apr 2020 02:11:14 -0400 Received: from mail-vi1eur05on2121.outbound.protection.outlook.com ([40.107.21.121]:61758 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jTfw7-000240-Gu; Wed, 29 Apr 2020 02:11:11 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5301.eurprd08.prod.outlook.com (2603:10a6:20b:dd::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.19; Wed, 29 Apr 2020 06:11:07 +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.023; Wed, 29 Apr 2020 06:11:07 +0000 Received: from localhost.localdomain (185.215.60.184) by FR2P281CA0023.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Wed, 29 Apr 2020 06:11:07 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mxggDYziOBwH01rJ9PsGg4GhONW0Gz2z2AinwADu+o1TMwFfl8U4kVKxtM1c6g7SBNp9XDfCLeMqXMIdYNoAeRA8kKMzcSiPgoNXo2vecTVrPWKSMeJhTI68k+m5BCc9nksmqKIoNn1zXLxYHKhSeRDpqh/CSlqir+ItaXHTBvQF7BOIRqg+PEAoz9/I2J2hSQwPHPpmwn0Hn1xBhHA39NxnUocEk5S9GZBK1x32Is3OIGIEjxD/q7hg0d6Hevf2L1IATq+X7DCHiYjdj0LKhpdygJcHkyzSi6lV9jYcx8Zm7x9zWmMirGCRxrdopEYFevw3ofrLL6UYBc1lLJj+vw== 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=ndLM+pDrRi2zXlSAdNs7jK9RIu4e1Dymp/VaFhvDmVg=; b=cTqOeS+SORrIMOqqRP8p1sX4BYYnl+xytOdgm7r1lF/4yZZx3XiuTDPIxmgKxBuK32FtfCIg7+/dbLl3ZihbefwyK9zDFAxckPnhUL6vAZ5yKE0R65+i6C4rTgMf43rKCAXSkrPPQPSdTmluPhSwjkcfo8HnSG4QZM4hmiXl5whn5RaTqgDnujxyVijLLoDYACI9SM8RlY6ikrcD16XjzZ72GAFm85n9VdNHXPP+SaOfXvDv5qCkMMF1FrnF7WWWgVpOFBCOzXVZ16O2zgaT0aTJBMirdEgNjuzaShRymgkf+NUGNgh81Tt2rG72d7P0rF0px8P7MMP2D325xKF5bw== 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=ndLM+pDrRi2zXlSAdNs7jK9RIu4e1Dymp/VaFhvDmVg=; b=GN9POb6Kmi6gLuVPh0J9vtRiZbQZ74J4Ti0hHifdM2t3bt1Wbk7Nsr0/72TtierzzZQCra4oT8d5j3blqR71foZLayjxoMfj+lj4jLOYV2I3vrKfCjofyV98Oqg5ui0er+cNMU2tGw1k3njMr7eaj2DbKwcoMitJJisDKgm0NwA= 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/block-copy: refactor task creation Date: Wed, 29 Apr 2020 09:10:38 +0300 Message-Id: <20200429061039.12687-5-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200429061039.12687-1-vsementsov@virtuozzo.com> References: <20200429061039.12687-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0023.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::10) 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.184] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2f9fc520-e3f1-4cb7-8304-08d7ec041b15 X-MS-TrafficTypeDiagnostic: AM7PR08MB5301: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:800; X-Forefront-PRVS: 03883BD916 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5L247MwYZonMRb6DZEiz83fOBjvRB6emp1N/pzxxq86k7lWGtxkR3Bgy22tRIeSefPbFaPOZAeHLIDNi/DdZnv10dakJrxdirunLQSgXhxqYT/thW4OgPtsB9K1XqSzA8lr9GJseyGndHzwMhP+t6AgNXnumd5W5JUfHGQrsVjQH6Li/wF68tjImeiJWMhbAHnIGtUsDUwSTwFk+Hk8VMaY4kkKni2isGUu4kaRT3IVAaCPY8WfIocy27rbeOOelU1G7n2lPEPnQMwhcGeSX8LouyOcKCad7fCEoD4yAsu2W4vpVeJjYuLWNuQHqFZlvqIopbFl3t/cHC8HfWzZ7Aia5GPF58tA/kFqLGouR605is1zChZN07qq3KJuuzNUatMnNzrf+sVvNUHkXFzpEAhO+L7QLab0M4IhZKNVy/CODrcvvAd3nsPe4L5lrteMvPL3K9i5YCiHI5VVNzGb44+zZTmwFNSLQde4/n+OQ2xitrB1KvmdqliXYFcHrnvgv 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)(346002)(39830400003)(136003)(376002)(396003)(366004)(2906002)(1076003)(86362001)(36756003)(186003)(16526019)(26005)(956004)(4326008)(52116002)(5660300002)(6506007)(69590400007)(107886003)(6512007)(6486002)(2616005)(6666004)(478600001)(316002)(6916009)(8676002)(66556008)(66476007)(8936002)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: hv8yU+bA6oodu9XMeze4BxjZj0sVhQqwDv/kyZiSLUG3jhDMa8ict1ZlAEGw65xXjZENXi8Sq+ylnNN6ai5cXt71ItH85k2tnL1jaRxAlTbWrH/L7tEQuDn2oVDiJHvRDUQjXQ6Qn5nq6vZNPYDrEArqgfaWM158VuOCDlshmcmTL1Y5o1UAJ+ure2Z1xg8CvthcFTltMrpl0lgj9TRFvWuo6JAYLPxY7FzD5AP6mUvjVtzPxFW7Saj2tE1n7w1992XRtz+Ius1gPiDHflLlCjdeQUQnNbRHQZGMw8yTzYJGcWtezsCaFAi1g2/Y1NL2EguPqU3AM94B2gpfCcmvvlGGUIPBusrM3qyG8wU6QAOrTCFrbUBhv74dcUasYqvk3bI52H5p0CeZWIZWHvATMcnkgm0LbU4c4n9meMwYPsXGeAo/VwoX0yMo5xT6K4swDkUyz2P3Op83w2dtMVOdsIIimbzdbqVWhqJACSZUYrJ2WiNpj87pJ3bWXu8KLBsDHb9UJgIE6XjYJSuSGDkQuvHPKYK/7JvrpcTAy62mIuVaqICIPCZzferP7aN5vT3qHSUwnCUh/nxXTuAFD9z67iN8s2upvzCQSs3pzc3/D7y/owUrV3TxEKBJ0xbjer1bz/p8BeyTx/W4G+/IcxMdC6aNSMRzun85DUnszyWZ3aMqOEbXqHjl/c3+so3m3qzEtlFNFEzwRVS6sYwnCdwFz6M4yk4fDzHohvxU6cI8McH9mA86zpv7HZVc7OlynW3cYUEL8+muyZc4hNOYPE1fZAxOmdIu25G1n5lZftTF5/8= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2f9fc520-e3f1-4cb7-8304-08d7ec041b15 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2020 06:11:07.6594 (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: WfnjBD6iPR8WrtYGL6dVievlu6ljyMEDEldC/XAnO9alfo7Ipr5i1vbfXWAkHCA44Mrs9WqIR8a9kmRQaUbz84nIPKtRsnfTXrJzb9vBdjc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5301 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.21.121; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 02:11:07 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Received-From: 40.107.21.121 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, den@openvz.org, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com 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" Instead of just relying on the comment "Called only on full-dirty region" in block_copy_task_create() let's move initial dirty area search directly to block_copy_task_create(). Let's also use effective bdrv_dirty_bitmap_next_dirty_area instead of looping through all non-dirty clusters. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/block-copy.c | 78 ++++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 34 deletions(-) diff --git a/block/block-copy.c b/block/block-copy.c index 35ff9cc3ef..5cf032c4d8 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -32,6 +32,11 @@ typedef struct BlockCopyTask { CoQueue wait_queue; /* coroutines blocked on this task */ } BlockCopyTask; =20 +static int64_t task_end(BlockCopyTask *task) +{ + return task->offset + task->bytes; +} + typedef struct BlockCopyState { /* * BdrvChild objects are not owned or managed by block-copy. They are @@ -106,17 +111,27 @@ static bool coroutine_fn block_copy_wait_one(BlockCop= yState *s, int64_t offset, return true; } =20 -/* Called only on full-dirty region */ +/* + * Search for the first dirty area in offset/bytes range and create task at + * the beginning of it. + */ static BlockCopyTask *block_copy_task_create(BlockCopyState *s, int64_t offset, int64_t bytes) { - BlockCopyTask *task =3D g_new(BlockCopyTask, 1); + if (!bdrv_dirty_bitmap_next_dirty_area(s->copy_bitmap, + offset, offset + bytes, + s->copy_size, &offset, &bytes)) + { + return NULL; + } =20 + /* region is dirty, so no existent tasks possible in it */ assert(!find_conflicting_task(s, offset, bytes)); =20 bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes); s->in_flight_bytes +=3D bytes; =20 + BlockCopyTask *task =3D g_new(BlockCopyTask, 1); *task =3D (BlockCopyTask) { .s =3D s, .offset =3D offset, @@ -466,6 +481,7 @@ static int coroutine_fn block_copy_dirty_clusters(Block= CopyState *s, { int ret =3D 0; bool found_dirty =3D false; + int64_t end =3D offset + bytes; =20 /* * block_copy() user is responsible for keeping source and target in s= ame @@ -479,58 +495,52 @@ static int coroutine_fn block_copy_dirty_clusters(Blo= ckCopyState *s, =20 while (bytes) { g_autofree BlockCopyTask *task =3D NULL; - int64_t next_zero, cur_bytes, status_bytes; + int64_t status_bytes; =20 - if (!bdrv_dirty_bitmap_get(s->copy_bitmap, offset)) { - trace_block_copy_skip(s, offset); - offset +=3D s->cluster_size; - bytes -=3D s->cluster_size; - continue; /* already copied */ + task =3D block_copy_task_create(s, offset, bytes); + if (!task) { + /* No more dirty bits in the bitmap */ + trace_block_copy_skip_range(s, offset, bytes); + break; + } + if (task->offset > offset) { + trace_block_copy_skip_range(s, offset, task->offset - offset); } =20 found_dirty =3D true; =20 - cur_bytes =3D MIN(bytes, s->copy_size); - - next_zero =3D bdrv_dirty_bitmap_next_zero(s->copy_bitmap, offset, - cur_bytes); - if (next_zero >=3D 0) { - assert(next_zero > offset); /* offset is dirty */ - assert(next_zero < offset + cur_bytes); /* no need to do MIN()= */ - cur_bytes =3D next_zero - offset; - } - task =3D block_copy_task_create(s, offset, cur_bytes); - - ret =3D block_copy_block_status(s, offset, cur_bytes, &status_byte= s); + ret =3D block_copy_block_status(s, task->offset, task->bytes, + &status_bytes); assert(ret >=3D 0); /* never fail */ - cur_bytes =3D MIN(cur_bytes, status_bytes); - block_copy_task_shrink(task, cur_bytes); + if (status_bytes < task->bytes) { + block_copy_task_shrink(task, status_bytes); + } if (s->skip_unallocated && !(ret & BDRV_BLOCK_ALLOCATED)) { block_copy_task_end(task, 0); progress_set_remaining(s->progress, bdrv_get_dirty_count(s->copy_bitmap) + s->in_flight_bytes); - trace_block_copy_skip_range(s, offset, status_bytes); - offset +=3D status_bytes; - bytes -=3D status_bytes; + trace_block_copy_skip_range(s, task->offset, task->bytes); + offset =3D task_end(task); + bytes =3D end - offset; continue; } =20 - trace_block_copy_process(s, offset); + trace_block_copy_process(s, task->offset); =20 - co_get_from_shres(s->mem, cur_bytes); - ret =3D block_copy_do_copy(s, offset, cur_bytes, ret & BDRV_BLOCK_= ZERO, - error_is_read); - co_put_to_shres(s->mem, cur_bytes); + co_get_from_shres(s->mem, task->bytes); + ret =3D block_copy_do_copy(s, task->offset, task->bytes, + ret & BDRV_BLOCK_ZERO, error_is_read); + co_put_to_shres(s->mem, task->bytes); block_copy_task_end(task, ret); if (ret < 0) { return ret; } =20 - progress_work_done(s->progress, cur_bytes); - s->progress_bytes_callback(cur_bytes, s->progress_opaque); - offset +=3D cur_bytes; - bytes -=3D cur_bytes; + progress_work_done(s->progress, task->bytes); + s->progress_bytes_callback(task->bytes, s->progress_opaque); + offset =3D task_end(task); + bytes =3D end - offset; } =20 return found_dirty; --=20 2.21.0 From nobody Sat May 18 14:54:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1588140762; cv=pass; d=zohomail.com; s=zohoarc; b=ilHmmnALL3xprpbUz9MzGFTatxggQZbl5o7ttySQp5vqfxRwFis47o3zJJHowd7CL5jkXCDdG86QjnIbrPs7fGtkV3UYVbn2wNZqEiM8lqm8ASIKVA2FNArbdh/ElEfs1kO09PUpV3SsXpE+YMOZGoDLKTDdSRrajv8mBDkXuBk= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588140762; 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=C5D696Yi8Wv5VGGI7YednpN3hUbTU8uj/t9xqrnlOeo=; b=FLH1VWur7AqhaxbmYMMKznrHZzj1IsJaOjDkGpC3+dkLiZrcsOdeTXe152clxVW06nkgphTU1U8wne886HQcoy4DfLfTwa1HqTClJyG+aic8FnkiNnBShW5s2LI2/dhVzcliCyaB7lRg6xV11vDM8VMVGFx8hJsz2RmvRutj3sQ= 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 1588140762072956.9523748113031; Tue, 28 Apr 2020 23:12:42 -0700 (PDT) Received: from localhost ([::1]:50294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTfxY-0007nT-Mi for importer@patchew.org; Wed, 29 Apr 2020 02:12:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39352) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTfwB-0005hR-DX for qemu-devel@nongnu.org; Wed, 29 Apr 2020 02:11:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTfwA-0002De-NB for qemu-devel@nongnu.org; Wed, 29 Apr 2020 02:11:15 -0400 Received: from mail-vi1eur05on2121.outbound.protection.outlook.com ([40.107.21.121]:61758 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jTfw8-000240-Gr; Wed, 29 Apr 2020 02:11:12 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5301.eurprd08.prod.outlook.com (2603:10a6:20b:dd::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.19; Wed, 29 Apr 2020 06:11:08 +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.023; Wed, 29 Apr 2020 06:11:08 +0000 Received: from localhost.localdomain (185.215.60.184) by FR2P281CA0023.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Wed, 29 Apr 2020 06:11:08 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LZgjAy+SdvgfVknH9zvnF7nLY7FeyDyaz3j03SxS4KEtCGuuAkaZ6W2KVPtxzDFhwyBImw5SPRdsLRZ1dzzjautJHltj3FsGi4Oi2qijsl7axFu7tOvVyGWMF2zKTJTJfL6inN/Qmzsbujua18QW4xy4wMtMwQ75DpSb/n8lCisRxjzxef2ElNv5FU6e6gj6uGWY/5Xtnao1LRvKObA3GkEry5oFY685E/AEdVi3eXGJdbUSI88gMIrfL2YGJudyewxpszCat236NzrRwN+QvN3oMFp7Z4tUmS3p4PO5PBamMr23dgXNaOjBkBVRUjGoSTVFhx+a43WP9csveKgGMw== 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=C5D696Yi8Wv5VGGI7YednpN3hUbTU8uj/t9xqrnlOeo=; b=X/o+HOGg6zgWRlaBfJkVZ8++xt4QL/FXMW36pbYNb7IeLoR3jCx5cjqB9c6dfsIhzXCldCCSAj9tZDBumi3pznPYO9e0jvIyROjHoHxYSyESWVFfs0qvyNllL6GFm90OY89sVpBfSP7Snw2m95Fw3/ktcnsl1lsxBpiIc1au7QtU+bxDhhSW85WLpybxmdS3tSQSyymvmp0yict8wlT4qPhU04gWIYIMg0R/hiJqfJs12vE+JAZLWGryQg4yM5bmOrQkX8EwQpCrKdhFzGcWQcv5dPwlZFWVWm/g+u88bqnjjSvXkJ7caZBpHLzovTJtawgz0YpMmXSJSAKrc1ShcQ== 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=C5D696Yi8Wv5VGGI7YednpN3hUbTU8uj/t9xqrnlOeo=; b=R44ChJfu0yd/wWOrAORwIkoV9Cg/YfvAX+KHQI+/2b+TARH7aOlRc+7GH49uybDNqO04RA9uwJfwvoLgdcKEQCrP1abyX3nBSgKDKqch+96b2gsBsCROx1OqBRDbkNclq6Xp8HuUbWu7qHgzWdU25uXK/9A+V7eKtdGtWTRSkc8= 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] block/block-copy: use aio-task-pool API Date: Wed, 29 Apr 2020 09:10:39 +0300 Message-Id: <20200429061039.12687-6-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200429061039.12687-1-vsementsov@virtuozzo.com> References: <20200429061039.12687-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0023.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::10) 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.184] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 34a1f54e-833a-4a14-c62e-08d7ec041bb0 X-MS-TrafficTypeDiagnostic: AM7PR08MB5301: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:304; X-Forefront-PRVS: 03883BD916 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nlqacPEPxclUycu6RZDW4xP1ZMvrtbzj6vC2lT3dk3Z11UvXg/K/yqgZVbt7fhyKYd0SKuYaaSRHrJoXzJSB4Asbwp7IK/PoTV/dUrnyHpmQb4buO0NTCTwWAvOQUESuwGs7VP6L8sDs/9LcpaebPG0arMEeDreklhDo0/fV5J7cbay7dLx/MTul7jn5ffxhmLg9K28LPU/g1twR/8mCZfDX9gAL2uXi7MWhwa0wWXrtxBNP4NJjg8t2VqHkrZNpnli2VvU9Kux+tEJ2MiJqUzRDs6dsnHgiv/on+DJOCI/F7AEiTbVa53f3PW25RueVrIO5dfmKZQHN4naiwF2C+LA0RH8VW11SEV2bkjAGUWQNI3usfh/Xr2U4SMSDItvJsJlLej+b0cuc8nrQnadcUJLKVENgmtUPKRU7CZkjdUJ29noAvY1QahMUQgU8c79EnURl7ppkXtoobjuYdbAn20DMGKDK9PbKsnPj5ZtsJtyNJ4rlOOu8RrJKbGhWb5nW 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)(346002)(39830400003)(136003)(376002)(396003)(366004)(2906002)(1076003)(86362001)(36756003)(186003)(16526019)(26005)(956004)(4326008)(52116002)(5660300002)(6506007)(69590400007)(107886003)(6512007)(6486002)(2616005)(6666004)(478600001)(316002)(6916009)(8676002)(66556008)(66476007)(8936002)(66946007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 4ZkntWOoBAoKoEMyInZsnTmWOZzcHK0dnZUSLXTOFq1Ho+H6wTKnrMIx6lsTonWTJMxzNy5tGJwfd7EAUCYtG2ra52t0SkEHOgCnofC8z74zHhoSf4Z28QWtRJRz5hHNAojVrM5fS0SG1Oy/d95XBePZrZoPJZywjz4clWv2HmxPxcL2gyMLKAHi0FKHNe+PhkMZNvwi7tSszfNalrzZIg6duhTA8qRsF1T5Ru07zBN3J4DqdBl9aQHpVGtC6CeXGH7YcQvHsUKWtcJZy41HA99hXTS1jefWLCoV3RUJddYR1YFdqF3zEtHrR50guvKw6bs1XL4klxf6e89AHi5lwmqFUIQFUI/jogrMWa8hokf2V2OcyFmKGEHOHFCGykAqvBnr1NczMN/qlcscNcib4Kb2iPtNKU5DaWxW2wwG5LX6OuGLWkM5UtQc7v/wkAY3JsaL83dvhMmiU3F8Lpf16DvjniSjLt1xNaZ6YLuqsMoE+khJqOVNZGx4uc7HHvN3QNNWB6qrKT6LQXfjX1o9W5PxzbdNcVonOt9q/XKIql1XnrBb0UA0UzC4TuwYbXIm0+jxUgYSsPzmTBhQkqDzM5jm/9c5sZizxcIcwSM3Z8VswfLyTGdbafsc0+ZeMZudp/j8j/bwyJvT3Qb921IiZUq2sH1W5I2z1Lz3AGRD6QaMh5mtBJZ8yqrbXv9bIvKwDaG3Pusa6sueQ0p6dggpyPCQtg+0Em3Ywmzmwelb1BvGgfXAOkUD6rAJqHsA63oFtQlnLZq25TU9SmCuToUl4MtjrfuNd+PXavcvhdFKAhs= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 34a1f54e-833a-4a14-c62e-08d7ec041bb0 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2020 06:11:08.6262 (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: C4ILRAQ+LhatvXEfDJrBBkScPMEZg1fsW/z7vb92yb4K28sO7ZDlLEnt88BaO7sFX1FZaF8/cKPUwxE9LjznTXhZ7tsAaBYUo2PxdQHYi1E= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5301 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.21.121; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 02:11:07 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Received-From: 40.107.21.121 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, den@openvz.org, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com 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" Run block_copy iterations in parallel in aio tasks. Changes: - BlockCopyTask becomes aio task structure. Add zeroes field to pass it to block_copy_do_copy - add call state - it's a state of one call of block_copy(), shared between parallel tasks. For now used only to keep information about first error: is it read or not. - convert block_copy_dirty_clusters to aio-task loop. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/block-copy.c | 104 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 91 insertions(+), 13 deletions(-) diff --git a/block/block-copy.c b/block/block-copy.c index 5cf032c4d8..f5ef91f292 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -19,15 +19,29 @@ #include "block/block-copy.h" #include "sysemu/block-backend.h" #include "qemu/units.h" +#include "qemu/coroutine.h" +#include "block/aio_task.h" =20 #define BLOCK_COPY_MAX_COPY_RANGE (16 * MiB) #define BLOCK_COPY_MAX_BUFFER (1 * MiB) #define BLOCK_COPY_MAX_MEM (128 * MiB) +#define BLOCK_COPY_MAX_WORKERS 64 + +static coroutine_fn int block_copy_task_entry(AioTask *task); + +typedef struct BlockCopyCallState { + bool failed; + bool error_is_read; +} BlockCopyCallState; =20 typedef struct BlockCopyTask { + AioTask task; + BlockCopyState *s; + BlockCopyCallState *call_state; int64_t offset; int64_t bytes; + bool zeroes; QLIST_ENTRY(BlockCopyTask) list; CoQueue wait_queue; /* coroutines blocked on this task */ } BlockCopyTask; @@ -116,6 +130,7 @@ static bool coroutine_fn block_copy_wait_one(BlockCopyS= tate *s, int64_t offset, * the beginning of it. */ static BlockCopyTask *block_copy_task_create(BlockCopyState *s, + BlockCopyCallState *call_stat= e, int64_t offset, int64_t bytes) { if (!bdrv_dirty_bitmap_next_dirty_area(s->copy_bitmap, @@ -133,7 +148,9 @@ static BlockCopyTask *block_copy_task_create(BlockCopyS= tate *s, =20 BlockCopyTask *task =3D g_new(BlockCopyTask, 1); *task =3D (BlockCopyTask) { + .task.func =3D block_copy_task_entry, .s =3D s, + .call_state =3D call_state, .offset =3D offset, .bytes =3D bytes, }; @@ -261,6 +278,30 @@ void block_copy_set_progress_meter(BlockCopyState *s, = ProgressMeter *pm) s->progress =3D pm; } =20 +/* Takes ownership on @task */ +static coroutine_fn int block_copy_task_run(AioTaskPool *pool, + BlockCopyTask *task) +{ + if (!pool) { + int ret =3D task->task.func(&task->task); + + g_free(task); + return ret; + } + + aio_task_pool_wait_slot(pool); + if (aio_task_pool_status(pool) < 0) { + co_put_to_shres(task->s->mem, task->bytes); + block_copy_task_end(task, -EAGAIN); + g_free(task); + return aio_task_pool_status(pool); + } + + aio_task_pool_start_task(pool, &task->task); + + return 0; +} + /* * block_copy_do_copy * @@ -364,6 +405,27 @@ out: return ret; } =20 +static coroutine_fn int block_copy_task_entry(AioTask *task) +{ + BlockCopyTask *t =3D container_of(task, BlockCopyTask, task); + bool error_is_read; + int ret; + + ret =3D block_copy_do_copy(t->s, t->offset, t->bytes, t->zeroes, + &error_is_read); + if (ret < 0 && !t->call_state->failed) { + t->call_state->failed =3D true; + t->call_state->error_is_read =3D error_is_read; + } else { + progress_work_done(t->s->progress, t->bytes); + t->s->progress_bytes_callback(t->bytes, t->s->progress_opaque); + } + co_put_to_shres(t->s->mem, t->bytes); + block_copy_task_end(t, ret); + + return ret; +} + static int block_copy_block_status(BlockCopyState *s, int64_t offset, int64_t bytes, int64_t *pnum) { @@ -482,6 +544,8 @@ static int coroutine_fn block_copy_dirty_clusters(Block= CopyState *s, int ret =3D 0; bool found_dirty =3D false; int64_t end =3D offset + bytes; + AioTaskPool *aio =3D NULL; + BlockCopyCallState call_state =3D {false, false}; =20 /* * block_copy() user is responsible for keeping source and target in s= ame @@ -493,11 +557,11 @@ static int coroutine_fn block_copy_dirty_clusters(Blo= ckCopyState *s, assert(QEMU_IS_ALIGNED(offset, s->cluster_size)); assert(QEMU_IS_ALIGNED(bytes, s->cluster_size)); =20 - while (bytes) { - g_autofree BlockCopyTask *task =3D NULL; + while (bytes && aio_task_pool_status(aio) =3D=3D 0) { + BlockCopyTask *task; int64_t status_bytes; =20 - task =3D block_copy_task_create(s, offset, bytes); + task =3D block_copy_task_create(s, &call_state, offset, bytes); if (!task) { /* No more dirty bits in the bitmap */ trace_block_copy_skip_range(s, offset, bytes); @@ -517,6 +581,7 @@ static int coroutine_fn block_copy_dirty_clusters(Block= CopyState *s, } if (s->skip_unallocated && !(ret & BDRV_BLOCK_ALLOCATED)) { block_copy_task_end(task, 0); + g_free(task); progress_set_remaining(s->progress, bdrv_get_dirty_count(s->copy_bitmap) + s->in_flight_bytes); @@ -525,25 +590,38 @@ static int coroutine_fn block_copy_dirty_clusters(Blo= ckCopyState *s, bytes =3D end - offset; continue; } + task->zeroes =3D ret & BDRV_BLOCK_ZERO; =20 trace_block_copy_process(s, task->offset); =20 co_get_from_shres(s->mem, task->bytes); - ret =3D block_copy_do_copy(s, task->offset, task->bytes, - ret & BDRV_BLOCK_ZERO, error_is_read); - co_put_to_shres(s->mem, task->bytes); - block_copy_task_end(task, ret); - if (ret < 0) { - return ret; - } =20 - progress_work_done(s->progress, task->bytes); - s->progress_bytes_callback(task->bytes, s->progress_opaque); offset =3D task_end(task); bytes =3D end - offset; + + if (!aio && bytes) { + aio =3D aio_task_pool_new(BLOCK_COPY_MAX_WORKERS); + } + + ret =3D block_copy_task_run(aio, task); + if (ret < 0) { + goto out; + } + } + +out: + if (aio) { + aio_task_pool_wait_all(aio); + if (ret =3D=3D 0) { + ret =3D aio_task_pool_status(aio); + } + g_free(aio); + } + if (error_is_read && ret < 0) { + *error_is_read =3D call_state.error_is_read; } =20 - return found_dirty; + return ret < 0 ? ret : found_dirty; } =20 /* --=20 2.21.0