From patchwork Wed Apr 29 13:08:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 283793 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12736C83003 for ; Wed, 29 Apr 2020 13:13:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D31E72184D for ; Wed, 29 Apr 2020 13:13:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="sEMytH3t" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D31E72184D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTmWc-0001xg-UB for qemu-devel@archiver.kernel.org; Wed, 29 Apr 2020 09:13:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34764) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTmV9-0007zT-5x for qemu-devel@nongnu.org; Wed, 29 Apr 2020 09:11:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTmV0-00085Q-Oe for qemu-devel@nongnu.org; Wed, 29 Apr 2020 09:11:46 -0400 Received: from mail-eopbgr80118.outbound.protection.outlook.com ([40.107.8.118]:18917 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 1jTmSn-0007bZ-6x; Wed, 29 Apr 2020 09:09:21 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lr1mqp7i6oDIS8WIPp9Dro1daO8uH48jISoD5cWLVIm7OmUOJ8guaO5qCpoOgZOLgXXi74auAeoZ+xG/lH2Nyc1NSPs3BLHBbUDDWndIBsCLSdyent4Xi+Vpnsdx8XwtXN011jrjT/POZfpjpwEoObX0R9yih0GIFD1snP574aWcELI9y58RqzPMWkDa6Nlq+qCJMsD/o2a03b1vr2CgzmCHh/QVTta836hC+hSKWyKu4KAhhSHamBPbwbGFMFGwavwLuaL4oYlH4H31GUsIpoKpHTBLBb1ZfwCyHabGWAgOgDBaFOydgRmShllCQ57w+2gbkYR660YqkKfNSJrRtw== 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=mgPIKJS1Nj84TRyLIqrCQMcjtCA58zHyfXGZytmy9lQZCU+BvJkAZu1xcyImAq1igPGNFa3JKqD8YShN21iLEFG8vMK8+TjLbI33lBUg7LmxJnSZkqbeO8QQRTEspwu0es0fU4YQtJ2OCunipfmZFOiw+k4ZVUW8VZLzr8ZodUMpufjQBaVZsI/u1HlaDpOVmsC93di2LgtGqIByrIRS9/7aDX8ZWxbqo89UPId4pZ/JXgsDKxEpqqQ+PGpXy8jYYfFR3ofymq4Kc7XHTa6xA0j84Yi83zMnaCUeYFYAHl3b7F9r77SiNA8kHS2xHkegiy7Leml4z1O5klEQvUiQ1A== 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=sEMytH3tRMq0iCGiT3GZHjaLLoujx9C+zZWc+GJ7BrC6WyXSXpaqDx+D6W8PfgK9Grpv9DhmlofUW1dXTK5GMdrtVFagMLMYagWI7WRB2P6hUr4SCLNMLkB50Q4CBIqkoLRDOOjQ96/zgshnnZEhLy3VtiPvMz4dernHNrG1/es= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none; nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5446.eurprd08.prod.outlook.com (2603:10a6:20b:107::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Wed, 29 Apr 2020 13:09:16 +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 13:09:16 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v4 3/5] block/block-copy: add state pointer to BlockCopyTask Date: Wed, 29 Apr 2020 16:08:45 +0300 Message-Id: <20200429130847.28124-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200429130847.28124-1-vsementsov@virtuozzo.com> References: <20200429130847.28124-1-vsementsov@virtuozzo.com> X-ClientProxiedBy: AM0PR04CA0031.eurprd04.prod.outlook.com (2603:10a6:208:122::44) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.184) by AM0PR04CA0031.eurprd04.prod.outlook.com (2603:10a6:208:122::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Wed, 29 Apr 2020 13:09:15 +0000 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: 8a721c68-2416-48a6-8d47-08d7ec3e850f X-MS-TrafficTypeDiagnostic: AM7PR08MB5446: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:206; 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)(136003)(376002)(346002)(39840400004)(366004)(396003)(8936002)(16526019)(2616005)(107886003)(6512007)(66946007)(66556008)(66476007)(316002)(36756003)(6486002)(52116002)(5660300002)(186003)(6506007)(26005)(4326008)(956004)(1076003)(69590400007)(478600001)(6666004)(86362001)(2906002)(6916009)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: N2xiVl1IbhPFZGWYP/QxpoSg+9ZUoiUG/nj6WjzdzuFUPgEX2S5B0QNwXR8AhxDGEThBo6CkULjJNRWCDw7WwtZOSf+rglBY1+hBoP7KNfcwMpTUH3GfntgF3XIySOklHfo5atBJAO4158rG+uvj4ERWqbByEFxaiXpAcXqPbX9sgj5As4oIKyaWRcZ6cEoOaiDV98L/1GVIusN9Aesj8S4h39by8bH+ul7Dok20NumSad8lhCsfpp3UiKW5dNS7n8yK1hbhJRDiINCpioIpVNLceT25A6DZCH6+qEyNr50eWmtiX3FbGhGBr0haOzA8d5e2TXQlvFxuqRttfXeLKqwj8DKzfUaDqzRyJhjCCsb4i2FioqCWlCejqZ9ffpn/1e2gvBDth9HjvO6E3Jnwr7XxiumM9PdZk1fFWlfNMIMQfTIhvY8XPGT81HFBtSw0vCx2/gree9eCxrTFNwyGfjm4JOd0rEVsZtlJ3byKIyzdIjN0/c7q6NMPlaEEB/d7 X-MS-Exchange-AntiSpam-MessageData: ZzfW4dJDWKn2bPuyw1r5f7m6pvW9qJqdGXM/ktRJK6084F0t196rt06JZP0VHmSA/dTWAB+T7YzA0xdvnK+pQSvw2wxwBeBdosgfWnFJ2dwb1ieat9h7RYNWJBWFQYALf1qUh+MNhXcXDdSJ14LEgZ2hmK7e1O8jUZasSLQ3m+h+r3LsEReYpTh93Cu/+1zlOuBShj1deW4MIwacaAp1fh2PZgaA1jx5kmU22DMAhRSI5GhTpPFZlX89H2UDoledyuz7QiNeXS3ZL+EPdnEjAdCCD1yz05VOCUNwL7QCp4NdPCml89aAt0e7fZttQ9ryHzsJuHLouqEeSYQv/S3YgaS9HW4wdlv4FeuzVuofSrjyah7C0qfPHzjSLhzia16VcdfWxq5LVABpneUpfiDY2dutd7lV1e3LoNah4AJSw+QCEbJ1NPy5xTmuGWfegj+hhi7UBETMv5crXlB636wKSsDAOcyuuZkY1pmi+8RcUtW34D/dJN7PGPXba0hn0y/LRmJIC6sjgEPYGyT/qgCK08myOCcMoSCwiWZ0qJhoeuLhYb63IYyqMWUawJ8/METw1qAaAguQSwoWCgKcUqhW9Ptv1QyLuDHd8CXrBwdrjIMBUHLk5P/TAiTid03UhZI8eww5UF+4obJx+2ugxqxFynmMtptGcihGEc/xEQRKPfGobdTGck16TYXahp1P7iJJEbY1dVn2C/LRHq8FfU/E6MaB6vmVFlptU6BMp5GPouO3089oXEZDs7fbOCus6vVbsn71KTAv5QwU4mbmBAmHuQo10zpAHn+VahZiyA2jBUE= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a721c68-2416-48a6-8d47-08d7ec3e850f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2020 13:09:16.2333 (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: 4ZrxqNaBPxMFnVQygttj5tRxvwMMWELfQgpyEXYPE6xMl8weufS/pko+WaXpsOB2uPRP0Tf08nHrvUIIXBE7XAoxEW8oDJks9bdGEwzS8rw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5446 Received-SPF: pass client-ip=40.107.8.118; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-VI1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 09:09:15 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Received-From: 40.107.8.118 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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) 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(BlockCopyState *s, bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes); s->in_flight_bytes += bytes; - task->offset = offset; - task->bytes = bytes; + *task = (BlockCopyTask) { + .s = s, + .offset = offset, + .bytes = bytes, + }; qemu_co_queue_init(&task->wait_queue); QLIST_INSERT_HEAD(&s->tasks, task, list); @@ -131,8 +135,7 @@ static BlockCopyTask *block_copy_task_create(BlockCopyState *s, * wake up all tasks waiting for us (may be some of them are not intersecting * 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 == task->bytes) { @@ -141,20 +144,19 @@ static void coroutine_fn block_copy_task_shrink(BlockCopyState *s, assert(new_bytes > 0 && new_bytes < task->bytes); - s->in_flight_bytes -= task->bytes - new_bytes; - bdrv_set_dirty_bitmap(s->copy_bitmap, + task->s->in_flight_bytes -= task->bytes - new_bytes; + bdrv_set_dirty_bitmap(task->s->copy_bitmap, task->offset + new_bytes, task->bytes - new_bytes); task->bytes = new_bytes; qemu_co_queue_restart_all(&task->wait_queue); } -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 -= task->bytes; + task->s->in_flight_bytes -= 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->bytes); } QLIST_REMOVE(task, list); qemu_co_queue_restart_all(&task->wait_queue); @@ -502,9 +504,9 @@ static int coroutine_fn block_copy_dirty_clusters(BlockCopyState *s, ret = block_copy_block_status(s, offset, cur_bytes, &status_bytes); assert(ret >= 0); /* never fail */ cur_bytes = 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(BlockCopyState *s, ret = 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; } From patchwork Wed Apr 29 13:08:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 283792 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F223C83003 for ; Wed, 29 Apr 2020 13:14:54 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CA92921974 for ; Wed, 29 Apr 2020 13:14:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="fsB8QxoN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CA92921974 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTmY8-0004xQ-Uy for qemu-devel@archiver.kernel.org; Wed, 29 Apr 2020 09:14:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34774) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTmV9-000813-SF for qemu-devel@nongnu.org; Wed, 29 Apr 2020 09:11:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTmV1-00085a-DL for qemu-devel@nongnu.org; Wed, 29 Apr 2020 09:11:47 -0400 Received: from mail-eopbgr80118.outbound.protection.outlook.com ([40.107.8.118]:18917 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 1jTmSo-0007bZ-6u; Wed, 29 Apr 2020 09:09:22 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jX5etUp9JqAE/BTofr7QWltG9fbDasmUw59bwPGt7S2Usvkl3kMVyXgNJlrvPXdjgBOEmxY+YPiT2PY6+16PqryEezBAbLxSZ+kPfyz0+f+gkekk/HEN8NNZWmQbp/hVBLhAETWlCRf4dAMOij6VfJ95q0iNKyjoPJeE3xRiH2wVn3n/RoCr7WKoKzCn0D3PH0giRcL1Zs0cRAhSF0+3zpJmvLYw7sbuRilDgsUK2mMBayBo91SnPAZfbgJv7c9OyeE2SHJfo3U08JF1HU3+JZhXUheI3ClLKBGBDs4fzBCTWC12AJRW+6ZOP7R0a7uVc+tVd05ZvOGVi+5Fi4Vaqw== 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=Gw89ul5DChI1jdaCSD5v/qnlhmxpIx9EKk3XxHDGSvo=; b=a1MsAe0gJI4KWID0jgdBT5CXrMcb69AAoNFZihsxaww0BkU2MiQBca+eeSfK5XpPuGdlRLCxaE7WbaWQL3knMNI+RgQr0Vr2gTQuZDcoihPj0CvO/msI3zHmei4ZiErAXPLNLjxS7Thre21X2MpKwdfLFEXGI3aX8eUSkYON20K0Z8Eqb3CG51knkEzR5fZJOPkc8sph+z7GPnPaqhwR8a1cVc9l2655mG+Jmqsj/AGCTQB9FnCX3/cOpT3XjcavUcGJvd/1x5tPiflAmlu27YBh0JDtI3aQlZaHbzXYQQnDYtUkSVWUIUITKfUu+8pjB4FG5aOzOOvWOV6ptdUeDA== 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=Gw89ul5DChI1jdaCSD5v/qnlhmxpIx9EKk3XxHDGSvo=; b=fsB8QxoNwVoFTVAH4hmYRJcFdHiZZgbpInrFQ63yHrQ9VqBAZ2OiBJ5QwR7owXwr/zypHzB67BEcwZwK6wqoo2qJJZIbfmpfRHLvSFpsJ5RxOczHAUBpSR7hbifgdabJ7tAabHHX2zNbDkMMx9omaDs7+cPT74Uef5mkx7qbYvI= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none; nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5446.eurprd08.prod.outlook.com (2603:10a6:20b:107::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Wed, 29 Apr 2020 13:09:17 +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 13:09:17 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v4 4/5] block/block-copy: refactor task creation Date: Wed, 29 Apr 2020 16:08:46 +0300 Message-Id: <20200429130847.28124-5-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200429130847.28124-1-vsementsov@virtuozzo.com> References: <20200429130847.28124-1-vsementsov@virtuozzo.com> X-ClientProxiedBy: AM0PR04CA0031.eurprd04.prod.outlook.com (2603:10a6:208:122::44) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.184) by AM0PR04CA0031.eurprd04.prod.outlook.com (2603:10a6:208:122::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Wed, 29 Apr 2020 13:09:16 +0000 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: 9df23ff8-1f26-48cc-56a4-08d7ec3e8575 X-MS-TrafficTypeDiagnostic: AM7PR08MB5446: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:800; 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)(136003)(376002)(346002)(39840400004)(366004)(396003)(8936002)(16526019)(2616005)(107886003)(6512007)(66946007)(66556008)(66476007)(316002)(36756003)(6486002)(52116002)(5660300002)(186003)(6506007)(26005)(4326008)(956004)(1076003)(69590400007)(478600001)(6666004)(86362001)(2906002)(6916009)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NuiCMbxPxcwUxlJnwqKx33F2j44QFHHcwStUeyJ8IDs262fNIf99v31k+c4eEcPV8U00ILjX6CsIZcAHP3zv8U8ZK7NJDK44RYkIP3I8BKP8R9fETEc9xgRCobBluzeR2SPayuR87jFQ4eS2beJdgJhjt1CldcjvAG9XpOEWe/1Lqrb7LElIXTJFGw1kMDDrPKVKNQxQlST0rCILJ2YVdQZt7W5hTR6Xs5eS57bcWS4F30Xtgi2tisZMysc4NhtCnsQZXvH6Scu1ZERKeXmb4w6aYZgbfbBFgVE4VBL+/cK1+b+VpUd0RHIkiho91tkeMmxcN2gYnR7fHRVPnND8fJB69ecKCHxH8PABd/eWPoV2cYA2wSFxL00ca0l6xlJf/qwLceqK69sbSD4wnmJMQv+OeUSKtC3v2dOli46ezSEw4gAqwG3Z5Vj5Qh1ulbM08Hfx73Ya0+CEvdb7JXOxl2PUunLRQNFlhH7+lsRfB2VfEmBp36ss9Sbrh4YRb/zj X-MS-Exchange-AntiSpam-MessageData: B+EWsO+HlYLmwayR8SS/1GqS7FUsrNWqwywbKUEBMDMcldZiwtm92wsptttc7TUsKjASGbt8UD7YL7b97DKlAVSW3isEl0jVQdX1U+ZHkK0iZNqQTOS5JZl0HaKkM+ZJWTKa8znTJZHUWhr0a2wl7iz1qW3qFYf0nDihl7wIzvc9Sm4HaDJSWQBFD+9ZkDMwfrQsZkF5Y/CcQgntPJ3qvIIwv8NfU4wblz+hrb9JwJkfNDoXj5Tb92IJQa7hsaBQVoIrbLLLAV4TkCZfVP4vYJKfobqHVD27K6vXvDT+zLT+4qP8zd5vdswsdR2kV0haEYn32ntvJMMtvNBy4O6zSDX/m0l/WB2sb73laRLtoL0aOrzxgYpcgE0sjB1Z6QGh+T7wHEW7ZGGZPm114OGagxMRrr4iZTqkwJjlPuXKwEjSRIkgzbITsOPdtZfyzp9MqhLvXn3CaQwBQqCfLmFaXb9VGf3/qB867UzvQ3vDyErGIvdVB7GuXIM0UxxpGUq9dE2bHzg/xhvFtc3Twb1LSnLrZYFG+JiT23LwSp8zAb+S4ysUoaejDGRwYoJINR0/QYOzAYdoP1llxOWbuoJb6XIIuhzyXeLKAicYJdwHlQAE4t6tlIxrjz/1wHAUvmnjbpThLaPvhIogmI6y36EQ6T8bwHMT5fqDUYsg0AG+tGh+gTJHk0cNZ+jnXsfjEexdf4onjF/M5nAS78v3x5FmqnmoEgR2qzGAh8PHa+SMOSLi2e/4OBR+jlW7QQWGC9jqHz1gGHmKA7fNl9v25z0WCKNtcmslRHJBHn06dWKkEf0= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9df23ff8-1f26-48cc-56a4-08d7ec3e8575 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2020 13:09:16.9412 (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: jhvHZvL7zkQRsZYxDg8B4+aeVexg+Bn+G3H6WhyHbQ4LWsRgYz2J1BoMIhoErTMCpMBpX8uldfLt8egFYxD1YGByqtDGcyOmk8SuNlgHrVE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5446 Received-SPF: pass client-ip=40.107.8.118; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-VI1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 09:09:15 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Received-From: 40.107.8.118 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 | 80 ++++++++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 34 deletions(-) diff --git a/block/block-copy.c b/block/block-copy.c index 35ff9cc3ef..f560338647 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; +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,29 @@ static bool coroutine_fn block_copy_wait_one(BlockCopyState *s, int64_t offset, return true; } -/* 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 = g_new(BlockCopyTask, 1); + BlockCopyTask *task; + if (!bdrv_dirty_bitmap_next_dirty_area(s->copy_bitmap, + offset, offset + bytes, + s->copy_size, &offset, &bytes)) + { + return NULL; + } + + /* region is dirty, so no existent tasks possible in it */ assert(!find_conflicting_task(s, offset, bytes)); bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes); s->in_flight_bytes += bytes; + task = g_new(BlockCopyTask, 1); *task = (BlockCopyTask) { .s = s, .offset = offset, @@ -466,6 +483,7 @@ static int coroutine_fn block_copy_dirty_clusters(BlockCopyState *s, { int ret = 0; bool found_dirty = false; + int64_t end = offset + bytes; /* * block_copy() user is responsible for keeping source and target in same @@ -479,58 +497,52 @@ static int coroutine_fn block_copy_dirty_clusters(BlockCopyState *s, while (bytes) { g_autofree BlockCopyTask *task = NULL; - int64_t next_zero, cur_bytes, status_bytes; + int64_t status_bytes; - if (!bdrv_dirty_bitmap_get(s->copy_bitmap, offset)) { - trace_block_copy_skip(s, offset); - offset += s->cluster_size; - bytes -= s->cluster_size; - continue; /* already copied */ + task = 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); } found_dirty = true; - cur_bytes = MIN(bytes, s->copy_size); - - next_zero = bdrv_dirty_bitmap_next_zero(s->copy_bitmap, offset, - cur_bytes); - if (next_zero >= 0) { - assert(next_zero > offset); /* offset is dirty */ - assert(next_zero < offset + cur_bytes); /* no need to do MIN() */ - cur_bytes = next_zero - offset; - } - task = block_copy_task_create(s, offset, cur_bytes); - - ret = block_copy_block_status(s, offset, cur_bytes, &status_bytes); + ret = block_copy_block_status(s, task->offset, task->bytes, + &status_bytes); assert(ret >= 0); /* never fail */ - cur_bytes = 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 += status_bytes; - bytes -= status_bytes; + trace_block_copy_skip_range(s, task->offset, task->bytes); + offset = task_end(task); + bytes = end - offset; continue; } - trace_block_copy_process(s, offset); + trace_block_copy_process(s, task->offset); - co_get_from_shres(s->mem, cur_bytes); - ret = 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 = 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; } - progress_work_done(s->progress, cur_bytes); - s->progress_bytes_callback(cur_bytes, s->progress_opaque); - offset += cur_bytes; - bytes -= cur_bytes; + progress_work_done(s->progress, task->bytes); + s->progress_bytes_callback(task->bytes, s->progress_opaque); + offset = task_end(task); + bytes = end - offset; } return found_dirty; From patchwork Wed Apr 29 13:08:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 283791 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A6FFC83003 for ; Wed, 29 Apr 2020 13:16:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B807321775 for ; Wed, 29 Apr 2020 13:16:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="fK8a2ZwA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B807321775 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTma6-0007GR-Tb for qemu-devel@archiver.kernel.org; Wed, 29 Apr 2020 09:16:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34792) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTmVB-00083j-Sg for qemu-devel@nongnu.org; Wed, 29 Apr 2020 09:11:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTmV2-000865-VU for qemu-devel@nongnu.org; Wed, 29 Apr 2020 09:11:49 -0400 Received: from mail-eopbgr80118.outbound.protection.outlook.com ([40.107.8.118]:18917 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 1jTmSp-0007bZ-5L; Wed, 29 Apr 2020 09:09:23 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NvZ7KQbbg8nJGGxKPNVyBtnkvDFlcssYLi6m+A85dQHjfffuwrVp3iQnsojUOYJ9tO7TniyNKQtWrqUFvO2Q/RVsOVRG/8NLY3ZQuBFPXZucdjJvI45u982sGrgG8DetiGppa1vvt2l7vzfDt+9M/HLogZPlsuXtOHZLEYzgUauCeQKg1OGw7JL6zJC63fAFn9WP+wZShTq6v0k9WQr7lNtuuSX1hD4V2cBcL2dn/EnPU4/nGAXFe114viyYg+aib8T+lKGA+DAnhhZbKbbQQ+laoY+4ZIeCl8kx4+ZgThqabYw6PaU6phPNppXMCtIiFsa9arB5mZDLIA3GIMHzAA== 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=wQlosi03mxhactT/54a4+buxoex9q2Jrlj5nqM3FiOA=; b=AxnA7/JwrzhPLLciHUtzFKwkXwpBR/ImxHiueq35jgC1n2qLcxnq5rWG2ONPpErP2wZyGR5GH66wiQCh6fKVysk9o+tXz7c/0XprDCqlWfp/7YiyEuaH65g3qCvwa0igPWqWdbNpo1QbfuUMx3YDB2lgb22oJ1JNqJtqADcAWp6ZgQNPGBshniOttTZPF4SgW6cFQKXnkaJrZllXf/IEesstWdwGk9mUzMYOW0+wT4ti5Wou1w2V9xQRqfmzV7IYpgAfK1DTPTm3DwjT4V67i54VAf6qG+zYfo5kY8SXJweRcIIj+oAiY1X9B0EPVKPdtiCZ8XA5iiJKUM1en4vTvg== 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=wQlosi03mxhactT/54a4+buxoex9q2Jrlj5nqM3FiOA=; b=fK8a2ZwArSH43utvGaI4Vqt4l6bmwCkusqN+7IspV2EVJohD3jOQGC2GWcP6N5PefVFTHRJSB/vZtVKQIa+JX/bqY7gsfGnFqjjPptF0l/QZm1XRpjYFl/IzgSKiok+td08Jy9oGXpxm9MaIfJQ3/w6QM8bPh+1y22lC4zjSox8= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none; nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5446.eurprd08.prod.outlook.com (2603:10a6:20b:107::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Wed, 29 Apr 2020 13:09:17 +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 13:09:17 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v4 5/5] block/block-copy: use aio-task-pool API Date: Wed, 29 Apr 2020 16:08:47 +0300 Message-Id: <20200429130847.28124-6-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200429130847.28124-1-vsementsov@virtuozzo.com> References: <20200429130847.28124-1-vsementsov@virtuozzo.com> X-ClientProxiedBy: AM0PR04CA0031.eurprd04.prod.outlook.com (2603:10a6:208:122::44) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.184) by AM0PR04CA0031.eurprd04.prod.outlook.com (2603:10a6:208:122::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Wed, 29 Apr 2020 13:09:17 +0000 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: 8bc081e7-9fb6-4227-91ae-08d7ec3e85e2 X-MS-TrafficTypeDiagnostic: AM7PR08MB5446: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:393; 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)(136003)(376002)(346002)(39840400004)(366004)(396003)(8936002)(16526019)(2616005)(107886003)(6512007)(66946007)(66556008)(66476007)(316002)(36756003)(6486002)(52116002)(5660300002)(186003)(6506007)(26005)(4326008)(956004)(1076003)(69590400007)(478600001)(6666004)(86362001)(2906002)(6916009)(8676002)(334744003); DIR:OUT; SFP:1102; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 25pV9yH80vJDsvuEHYbreTJCaFLfXGUnpAknOnLPxgGQIsdUNIIA6eMdHtBk8aVq0skFchJpRBt0ZXeXCw+zYidpHGAysYwCg+AGyMqTsaKsuFYr5DSdnOGdDZWuNW0RTBoN5IUZFikQB1Dlbo3ZXJccAuJHvZzdlEpde/NKco9E/Z3uzGq+mVfOtz7jIujWe1pCF1WhF/0c2iko+LE3F9+nMN7bMgyYSRVmB1TBa/2bGRgh/NOKZvY0KeK9VVdkvHmwyLduQA85vyUwYVHb986p5qxUzIB6Pzx0E5zah2JMcrFI9oBwY2ol9dBVuznXpwzL3bT5Btu1MuJmZFjWjjBeva+riePikI2xCrkafidN9KPhhpVEUZC3xKROVfzvJ6E7LjJwF1DzPB46nbXnMIMc9n/1hsPqDGFf7aoJCTsneJbI41ZI2TmtwfGCkOoP7HsZxkmfCgvp+13vykJjmvZHpCs8L212u7HCXYZR+PwupOxRY5mFqbrpJamhGi3H5GSXi4o++du0j43Ga0oAiQ== X-MS-Exchange-AntiSpam-MessageData: hsbiu3TBmw80CSHjCruFWquyC1ld1rK0IHeI4C6SgcTSdNmc1TP34DnBiCzm1yEN8/Xb3M+fGiClHGmoE2+Bx+TVRNb09wnRQ9gVJIP590ecY57+N1oB0Dfd2kp6bGRfJUGDp8ihmqDiz/msy+9zKoSoznNyXaS+a5FI/lXAxrimYgFueZYyfECENX6ZA33antqqAwOrpZUMXvS5eUTlv1yA7b4XCbyGAgt11KjUZ0uDEHwgFqQZqsQ/NlFDv0ZJ2L1ygFZrOFYB32uAXtE+fivvFA4A+TIcF60u1iOq3fHvkGiwBLjcCoddJcRIZwqvK6QxRH2ynEoku19sdABVPnqUxFj2ndg1/fPyCBqdvfLhXaf3NnVe5mrq9spYd75j2QR51gZvqp9KZ/d9rftEaQe7eTgMGsPUcex5vaxTIYmoNPcaat0w2bfJbq1rNcMdPMVkmFmY3pskpC7+2HsHWNGzg+1DzkNT6NdBPXwNwbWX5P+cu1p2pzdGdnfLryRkRIiyQL6rjaPjmoprNxhI7WSc98/U21CzGk6sMeunVDVnBUrOgkp3A8Ss5NgUtuX3VxtSBuFGXAnVXJ6UUTxeUMUxAAqIu+2OFm4jk2Y/wdoHcCTAmx21VFmg3xH5CrT+PIRM6FfbCTdCGW8K4SaLH/WCdHT6PWBDBU7O0DsRYw33h574jaV4XJKLsXmRDec/whO0AQIayfh4J7Bli2oJ9llA1xHBCtZuwe3sIVOeKb/mQVsoujkWv0+cFZkeEvct9S91OMZcCRsRhI+7eI/KpbhAvA1eoc5Y2vQu4cNu3GA= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8bc081e7-9fb6-4227-91ae-08d7ec3e85e2 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2020 13:09:17.6412 (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: eU5BFj+66ANdn2v7ZDGk4hOlH/wgGMZE845ja15EShNhACI4gSlE7F5NExZoKSkmMfYY8H/AK7BXSnoVaFq9nEgX1/GKxWtMtkLnZOQpRGU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5446 Received-SPF: pass client-ip=40.107.8.118; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-VI1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 09:09:15 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Received-From: 40.107.8.118 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 | 119 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 106 insertions(+), 13 deletions(-) diff --git a/block/block-copy.c b/block/block-copy.c index f560338647..03500680f7 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" #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; 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(BlockCopyState *s, int64_t offset, * the beginning of it. */ static BlockCopyTask *block_copy_task_create(BlockCopyState *s, + BlockCopyCallState *call_state, int64_t offset, int64_t bytes) { BlockCopyTask *task; @@ -135,7 +150,9 @@ static BlockCopyTask *block_copy_task_create(BlockCopyState *s, task = g_new(BlockCopyTask, 1); *task = (BlockCopyTask) { + .task.func = block_copy_task_entry, .s = s, + .call_state = call_state, .offset = offset, .bytes = bytes, }; @@ -263,6 +280,38 @@ void block_copy_set_progress_meter(BlockCopyState *s, ProgressMeter *pm) s->progress = pm; } +/* + * Takes ownership of @task + * + * If pool is NULL directly run the task, otherwise schedule it into the pool. + * + * Returns: task.func return code if pool is NULL + * otherwise -ECANCELED if pool status is bad + * otherwise 0 (successfully scheduled) + */ +static coroutine_fn int block_copy_task_run(AioTaskPool *pool, + BlockCopyTask *task) +{ + if (!pool) { + int ret = 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, -ECANCELED); + g_free(task); + return -ECANCELED; + } + + aio_task_pool_start_task(pool, &task->task); + + return 0; +} + /* * block_copy_do_copy * @@ -366,6 +415,27 @@ out: return ret; } +static coroutine_fn int block_copy_task_entry(AioTask *task) +{ + BlockCopyTask *t = container_of(task, BlockCopyTask, task); + bool error_is_read; + int ret; + + ret = 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 = true; + t->call_state->error_is_read = 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) { @@ -484,6 +554,8 @@ static int coroutine_fn block_copy_dirty_clusters(BlockCopyState *s, int ret = 0; bool found_dirty = false; int64_t end = offset + bytes; + AioTaskPool *aio = NULL; + BlockCopyCallState call_state = {false, false}; /* * block_copy() user is responsible for keeping source and target in same @@ -495,11 +567,11 @@ static int coroutine_fn block_copy_dirty_clusters(BlockCopyState *s, assert(QEMU_IS_ALIGNED(offset, s->cluster_size)); assert(QEMU_IS_ALIGNED(bytes, s->cluster_size)); - while (bytes) { - g_autofree BlockCopyTask *task = NULL; + while (bytes && aio_task_pool_status(aio) == 0) { + BlockCopyTask *task; int64_t status_bytes; - task = block_copy_task_create(s, offset, bytes); + task = 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); @@ -519,6 +591,7 @@ static int coroutine_fn block_copy_dirty_clusters(BlockCopyState *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); @@ -527,25 +600,45 @@ static int coroutine_fn block_copy_dirty_clusters(BlockCopyState *s, bytes = end - offset; continue; } + task->zeroes = ret & BDRV_BLOCK_ZERO; trace_block_copy_process(s, task->offset); co_get_from_shres(s->mem, task->bytes); - ret = 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; - } - progress_work_done(s->progress, task->bytes); - s->progress_bytes_callback(task->bytes, s->progress_opaque); offset = task_end(task); bytes = end - offset; + + if (!aio && bytes) { + aio = aio_task_pool_new(BLOCK_COPY_MAX_WORKERS); + } + + ret = block_copy_task_run(aio, task); + if (ret < 0) { + goto out; + } + } + +out: + if (aio) { + aio_task_pool_wait_all(aio); + + /* + * We are not really interested in -ECANCELED returned from + * block_copy_task_run. If it fails, it means some task already failed + * for real reason, let's return first failure. + * Still, assert that we don't rewrite failure by success. + */ + assert(ret == 0 || aio_task_pool_status(aio) < 0); + ret = aio_task_pool_status(aio); + + aio_task_pool_free(aio); + } + if (error_is_read && ret < 0) { + *error_is_read = call_state.error_is_read; } - return found_dirty; + return ret < 0 ? ret : found_dirty; } /*