From patchwork Wed Mar 25 13:46:34 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: 1261402 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.a=rsa-sha256 header.s=selector2 header.b=qa3fvqyR; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48nTy02dk0z9sQx for ; Thu, 26 Mar 2020 00:49:44 +1100 (AEDT) Received: from localhost ([::1]:36640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH6Pe-0006Di-8x for incoming@patchwork.ozlabs.org; Wed, 25 Mar 2020 09:49:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57300) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH6NL-0002MB-Of for qemu-devel@nongnu.org; Wed, 25 Mar 2020 09:47:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jH6NJ-0005ZW-W8 for qemu-devel@nongnu.org; Wed, 25 Mar 2020 09:47:19 -0400 Received: from mail-eopbgr70094.outbound.protection.outlook.com ([40.107.7.94]:37990 helo=EUR04-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jH6NG-0005TM-5Y; Wed, 25 Mar 2020 09:47:14 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I40VxSN+pGS66KlaRdRBd0fpeWg0Zucvashhn56h59H3aaLD5VIFHJzqhWUP4LkOLxlqss9qOLHAxAXY6yykbfFkmhwnqAeXZXtQAyh+0mtuqTX37RukdLI3HWQZQMDITgf6x0LUX5sKt9PK2OmaVL6INVxCSOlwph/Zuubsb7tss30hOnWDLjqVjx+s46oOMv2r8y4aUTkSqobqVkGAQ7pMe2C9pahqEo+5D8t0hECldJvY0abGLLqp/qoajGUx+O80VfojQ2QkSyol/5XAs6igij+5nUhQH/fQGQNqFeaeHmnFlQVnJQjSpnlf9sbyyqTWwAtaqiDRnxYxPOEhlg== 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=Ce3j9fN/QlzRmBxIfPz52+AON1QSZAfKuFbaQRS1lAI=; b=SROAkn4iL57w+stoZK/sWYZT2bFTQ00mWDlg3RMMHE0Q7gKY+M0WG+GgJyaJ0qIqNExesGVhWiq4rQL3lOwe17UaAuLwmfj/9AsUZPEH0JDwMxI00IEakXiI5/3akSWFm+NRWvMXZ31GBbtjQXvyd4MUY2LPE+uvmFoMASNkNKRsEZ7sp20rKPB3XEA1puAk/RkikW0mVrZbE2J8ETdy3qyxozhmouWPzX4Q/tEEX25uHQG1WykHlcx94D4aeJqz3Q51gz3TpY9LM9SZ7njEZtzamHoIXf2/iEN7X8Hpo4DeNaL/eRpIPF0BzHaPgBiNC6H20D2cgEicEC14ZDLtRA== 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=Ce3j9fN/QlzRmBxIfPz52+AON1QSZAfKuFbaQRS1lAI=; b=qa3fvqyR+Hd31ogKLl1qhzuYUXemReZRzy4LvwsxL9QE9daploN3VN1TPA3cfjLrV6WOgf2NupqXTc5gX2uujtlTlW+J/2CTwmZLt1TeuPggjTSIt9QYymfa2+/Z6xzyddwWUjN7wwcOz6Wt/qOdEP/tUckCZ/xB4fCKa2ba1ZI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=vsementsov@virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (10.141.175.15) by AM7PR08MB5480.eurprd08.prod.outlook.com (10.141.175.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2835.23; Wed, 25 Mar 2020 13:47:10 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::9057:6f5a:378c:7533]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::9057:6f5a:378c:7533%6]) with mapi id 15.20.2835.023; Wed, 25 Mar 2020 13:47:10 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 1/6] block/block-copy: rename in-flight requests to tasks Date: Wed, 25 Mar 2020 16:46:34 +0300 Message-ID: <20200325134639.16337-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200325134639.16337-1-vsementsov@virtuozzo.com> References: <20200325134639.16337-1-vsementsov@virtuozzo.com> X-ClientProxiedBy: AM0PR02CA0085.eurprd02.prod.outlook.com (2603:10a6:208:154::26) 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.35) by AM0PR02CA0085.eurprd02.prod.outlook.com (2603:10a6:208:154::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2835.18 via Frontend Transport; Wed, 25 Mar 2020 13:47:09 +0000 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.35] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 450e42df-d59c-473c-2995-08d7d0c3040c X-MS-TrafficTypeDiagnostic: AM7PR08MB5480: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:345; X-Forefront-PRVS: 0353563E2B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4636009)(39850400004)(396003)(346002)(366004)(136003)(376002)(6512007)(478600001)(1076003)(69590400007)(6666004)(36756003)(2906002)(4326008)(6486002)(16526019)(81166006)(66556008)(6916009)(107886003)(66476007)(66946007)(26005)(86362001)(316002)(52116002)(186003)(956004)(2616005)(6506007)(8936002)(8676002)(81156014)(5660300002)(334744003); DIR:OUT; SFP:1102; SCL:1; SRVR:AM7PR08MB5480; H:AM7PR08MB5494.eurprd08.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gncADpIz/1R/we3MSSpPZ8bR746MFv2S8FcFGI+8HnmAV/hSEKdbQNQddzckiOxvHJw5vKtRZYrlScQnNJDPJJOkHqgsE92EDLILnEqZ8b2wgDkCj64VY2P6lYtMZ+1NZAeohC0Q1WQusWcFxqYK0YLodoLlAzmhj2UudfDhPVOCQI/svHn+F2fRM9eF7ifnvQ8JnEMbpPZ5jWH0OntsaF4E1pfoBHwM52WWoTdx0Ts11zUkUkilrsThmxv9Q/W1IfhuEAg0k/KHo4hBrF+jUcxwypyY7DWBdyl0g+g+rjRkmTdhNg3LF8l8oBt0vPv29raaQkDitK32ZGkdJvn/1hLb5GegriPUimq36lIIOC2X1cwW3QPp4idhQHuudvpOu092B23ueNbrR74QjbU7M/9dOVcM9mqZnRO31gCnn6lNEsitnVIdYb5XD7nu01siNzgSF0z5EVl8VY9lH9WSoe7cb0GxSVFchip1GS4drOxQKzxZ5cJwDjqNWSEAmWYPKikRjr09cNdZ5wYAc2F8iw== X-MS-Exchange-AntiSpam-MessageData: cymT5D9k4yvEmMQ2O5dToir1W/UO6uvO0xq8G+AjxWdFNNDb2TSSqrd83RCfQGoVJc8v30xehsRKQ8cNagSG8HymWJ9D/2cvLv4B86ivEAad8u8c7YuUKTnte/GfiukERKHdQhTzEgrZHhBohsf7vQ== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 450e42df-d59c-473c-2995-08d7d0c3040c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Mar 2020 13:47:10.2405 (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: Dv4upIP6Q2BT0DPPTdoSpvKXCfecGeNmTl4fbiWv7ISMVllubb95hv+D5gc8D59ICsLdQuc04PxAi7fbifEjvYB0npwDguIPgcsaBMtTePE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5480 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.7.94 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 --- block/block-copy.c | 99 +++++++++++++++++++++++----------------------- 1 file changed, 49 insertions(+), 50 deletions(-) diff --git a/block/block-copy.c b/block/block-copy.c index 05227e18bf..61d1d26991 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) -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; 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; BdrvRequestFlags write_flags; @@ -73,15 +73,14 @@ typedef struct BlockCopyState { SharedResource *mem; } BlockCopyState; -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; - QLIST_FOREACH(req, &s->inflight_reqs, list) { - if (offset + bytes > req->offset && offset < req->offset + req->bytes) { - return req; + QLIST_FOREACH(t, &s->tasks, list) { + if (offset + bytes > t->offset && offset < t->offset + t->bytes) { + return t; } } @@ -89,73 +88,73 @@ static BlockCopyInFlightReq *find_conflicting_inflight_req(BlockCopyState *s, } /* - * 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 offset, int64_t bytes) { - BlockCopyInFlightReq *req = find_conflicting_inflight_req(s, offset, bytes); + BlockCopyTask *task = find_conflicting_task(s, offset, bytes); - if (!req) { + if (!task) { return false; } - qemu_co_queue_wait(&req->wait_queue, NULL); + qemu_co_queue_wait(&task->wait_queue, NULL); return true; } /* 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)); bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes); s->in_flight_bytes += bytes; - req->offset = offset; - req->bytes = bytes; - qemu_co_queue_init(&req->wait_queue); - QLIST_INSERT_HEAD(&s->inflight_reqs, req, list); + task->offset = offset; + task->bytes = bytes; + qemu_co_queue_init(&task->wait_queue); + QLIST_INSERT_HEAD(&s->tasks, task, list); } /* - * block_copy_inflight_req_shrink + * block_copy_task_shrink * - * Drop the tail of the request to be handled later. Set dirty bits back and - * wake up all requests waiting for us (may be some of them are not intersecting - * 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 intersecting + * 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 == req->bytes) { + if (new_bytes == task->bytes) { return; } - assert(new_bytes > 0 && new_bytes < req->bytes); + assert(new_bytes > 0 && new_bytes < task->bytes); - s->in_flight_bytes -= req->bytes - new_bytes; + s->in_flight_bytes -= 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_bytes); + s->in_flight_bytes -= task->bytes - new_bytes; - req->bytes = new_bytes; - qemu_co_queue_restart_all(&req->wait_queue); + task->bytes = new_bytes; + qemu_co_queue_restart_all(&task->wait_queue); } -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 -= req->bytes; + s->in_flight_bytes -= 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); } void block_copy_state_free(BlockCopyState *s) @@ -223,7 +222,7 @@ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target, s->copy_size = MAX(s->cluster_size, BLOCK_COPY_MAX_BUFFER); } - QLIST_INIT(&s->inflight_reqs); + QLIST_INIT(&s->tasks); return s; } @@ -474,7 +473,7 @@ static int coroutine_fn block_copy_dirty_clusters(BlockCopyState *s, assert(QEMU_IS_ALIGNED(bytes, s->cluster_size)); while (bytes) { - BlockCopyInFlightReq req; + BlockCopyTask task; int64_t next_zero, cur_bytes, status_bytes; if (!bdrv_dirty_bitmap_get(s->copy_bitmap, offset)) { @@ -495,14 +494,14 @@ static int coroutine_fn block_copy_dirty_clusters(BlockCopyState *s, assert(next_zero < offset + cur_bytes); /* no need to do MIN() */ cur_bytes = next_zero - offset; } - block_copy_inflight_req_begin(s, &req, offset, cur_bytes); + block_copy_task_begin(s, &task, offset, cur_bytes); 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_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 +517,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_inflight_req_end(s, &req, ret); + block_copy_task_end(s, &task, ret); if (ret < 0) { return ret; } From patchwork Wed Mar 25 13:46:35 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: 1261399 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.a=rsa-sha256 header.s=selector2 header.b=UmC7M62N; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48nTw62RHmz9sQx for ; Thu, 26 Mar 2020 00:48:04 +1100 (AEDT) Received: from localhost ([::1]:36608 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH6O0-0002d5-Vr for incoming@patchwork.ozlabs.org; Wed, 25 Mar 2020 09:48:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57273) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH6NK-0002K3-Ku for qemu-devel@nongnu.org; Wed, 25 Mar 2020 09:47:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jH6NJ-0005Yl-Et for qemu-devel@nongnu.org; Wed, 25 Mar 2020 09:47:18 -0400 Received: from mail-eopbgr70094.outbound.protection.outlook.com ([40.107.7.94]:37990 helo=EUR04-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jH6NG-0005TM-NR; Wed, 25 Mar 2020 09:47:14 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gRsUtnjx/oSqCMypxv18yMPXY4Ca7vjJXJck70iJNwF/vMMG0HTLziSi2b0qVPk9w+EUXuPCHnRDvvGeoroVsueSgKlOGiokGql0EIBM6xePZ7TUZzDVqjr4UMiBCIYVz0XyEjjcRXVPU5d2qfP1mdGI/2evB/J1qTkFpmq+WhRiFzX4u4weyzAt7V1KHZxL3gFUQucIQujB/N9nqHJMDhY/h4TKS055QEkmKzxWCJ2s8jID+I1D/5KdUopo8V8qpe6VASBGEIGw4a7x5bnKZEmQLpQZAgJb6dAt+y3rOXRQ245kGv1wASIlcV66+oZEAWzlqna8M839o29T3nMd3g== 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=ElWzpEhKWXMGNJLbAxCKN3Gla546WZjpvdHMAqNJqhA=; b=XrNim9LVbFdOXRubRAruOHGzytKeY0q0+cYp3P+ReabmfHZx7H01CpWbvYRbW3UwwfxsvUMfsgbE1ZqWGAD7ZPXto1hvw2yccCD5LfIMf79Ex0rEGGjzohwxE70rGUJNzD28KCcpgx2QvYsrGBMaptw1wNuRi6S+YyFNsGHKywXThOkgIotWN16BdhvTwT/BXtyS4v5FyDnrVnSndwWbABbVWXKcrJ7dVdOEHbGYBaT3KiiMzJLi9wP+Tq4Jqqr8mPuevA0wJZpl6GAaq4m6knH9d76JfubrAp7CgRkFo1F6XNm2fo3BqmnDtLfQSHsfx+7OWEQMh7+UwuiKwXixWg== 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=ElWzpEhKWXMGNJLbAxCKN3Gla546WZjpvdHMAqNJqhA=; b=UmC7M62Nli0jD9KoIG9leUssb6N1Ov9izbUaXLNFw20fk//xp10eb5i3jEf4EmmG5/T48WY4uNunxJBdsDyrzB7v2UHC4vjbJUk81DauvjEGoUf0GZJsoFsJDFcjtRjgBUizfyXxawYE3r1jm7Gw0g1lFsa/SvQMwMmnB4YcOds= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=vsementsov@virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (10.141.175.15) by AM7PR08MB5480.eurprd08.prod.outlook.com (10.141.175.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2835.23; Wed, 25 Mar 2020 13:47:10 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::9057:6f5a:378c:7533]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::9057:6f5a:378c:7533%6]) with mapi id 15.20.2835.023; Wed, 25 Mar 2020 13:47:10 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 2/6] block/block-copy: alloc task on each iteration Date: Wed, 25 Mar 2020 16:46:35 +0300 Message-ID: <20200325134639.16337-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200325134639.16337-1-vsementsov@virtuozzo.com> References: <20200325134639.16337-1-vsementsov@virtuozzo.com> X-ClientProxiedBy: AM0PR02CA0085.eurprd02.prod.outlook.com (2603:10a6:208:154::26) 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.35) by AM0PR02CA0085.eurprd02.prod.outlook.com (2603:10a6:208:154::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2835.18 via Frontend Transport; Wed, 25 Mar 2020 13:47:10 +0000 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.35] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 863aa387-de84-42f0-5078-08d7d0c30467 X-MS-TrafficTypeDiagnostic: AM7PR08MB5480: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:69; X-Forefront-PRVS: 0353563E2B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4636009)(39850400004)(396003)(346002)(366004)(136003)(376002)(6512007)(478600001)(1076003)(69590400007)(6666004)(36756003)(2906002)(4326008)(6486002)(16526019)(81166006)(66556008)(6916009)(107886003)(66476007)(66946007)(26005)(86362001)(316002)(52116002)(186003)(956004)(2616005)(6506007)(8936002)(8676002)(81156014)(5660300002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM7PR08MB5480; H:AM7PR08MB5494.eurprd08.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: N+8jmOMnC8EIXtffCt//Zq+MSCVGhJKI2V2UtD0H86hJ2eoJ23HhjzYayvPVC37AErqYgILyX8iKOFpwn9iQgoz+1bgtWbNla5DheO/eb8xOI9HL6aeG8+Zz7rNEVh9sX51X/JDQMkTVbh+1Mm6eNfJSBub0iEk/SocVh9ap6fWp1g5Nem/UsMvYbTPOeig6Fc/sKOKcccC0rBDrFkvlEh55W08qeaM9vTB8IOBpaKYr0Z4O/LH7qxJD2aDBYmwi+mVVs7Sv2pqqfF4jgCHdqAUMK+8hYvX/FZvEMkI9ik8jhYHn2UukNazemY2RyneAqb7y87QBaDJ6yNxvjLAlUc0WuIqEu1g9QNT2pLU3NTra9MpMwqCBpuFSQHdCLZ5uTCwvuS0LwpB2CM3lh7iIa9C9fjip4c4bHSaJY6tkhpHU7lIqhp3qQJz3S0WBt7pg+wpjisSbrCT/e6OUfaoTMscY2Ry04K4Fipq3o2ZeY2UZ/cLcnqmL3CncmeYPnAFm X-MS-Exchange-AntiSpam-MessageData: 85xKxkc+RnVKnmx4Q2hQgobjcEvNu2no6X/A6kUeF4Jt1GPKiPG6dEOoF+hqIrod3KnBmla/vE+Rmo7hNuutdu+38tahCFX9V0l0NeSg7Eo/nb/tcdL8E9/1EBmwfTIPTzn7bGkMX/QHMFFVi9pQMg== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 863aa387-de84-42f0-5078-08d7d0c30467 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Mar 2020 13:47:10.8449 (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: D1ThkaVTU6BYbnaPGELqOhU7VR4bMkPT7715SGNtHijzcLHgDw3CGuMJ7mCZXZhZXXAQzSJK+NZrvrXTiUaIwd2cKvdIcueOSU/k1n7uyhk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5480 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.7.94 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 61d1d26991..0daaaa9ba0 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -106,9 +106,11 @@ static bool coroutine_fn block_copy_wait_one(BlockCopyState *s, int64_t offset, } /* 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 = g_new(BlockCopyTask, 1); + assert(!find_conflicting_task(s, offset, bytes)); bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes); @@ -118,6 +120,8 @@ static void block_copy_task_begin(BlockCopyState *s, BlockCopyTask *task, task->bytes = bytes; qemu_co_queue_init(&task->wait_queue); QLIST_INSERT_HEAD(&s->tasks, task, list); + + return task; } /* @@ -473,7 +477,7 @@ static int coroutine_fn block_copy_dirty_clusters(BlockCopyState *s, assert(QEMU_IS_ALIGNED(bytes, s->cluster_size)); while (bytes) { - BlockCopyTask task; + g_autofree BlockCopyTask *task = NULL; int64_t next_zero, cur_bytes, status_bytes; if (!bdrv_dirty_bitmap_get(s->copy_bitmap, offset)) { @@ -494,14 +498,14 @@ static int coroutine_fn block_copy_dirty_clusters(BlockCopyState *s, assert(next_zero < offset + cur_bytes); /* no need to do MIN() */ cur_bytes = next_zero - offset; } - block_copy_task_begin(s, &task, offset, cur_bytes); + task = block_copy_task_create(s, offset, cur_bytes); 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(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); @@ -517,7 +521,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(s, task, ret); if (ret < 0) { return ret; } From patchwork Wed Mar 25 13:46:37 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: 1261404 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.a=rsa-sha256 header.s=selector2 header.b=QUt/XrgA; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48nTzN22Pwz9sR4 for ; Thu, 26 Mar 2020 00:50:56 +1100 (AEDT) Received: from localhost ([::1]:36662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH6Qo-0008Cp-7X for incoming@patchwork.ozlabs.org; Wed, 25 Mar 2020 09:50:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57318) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH6NM-0002Nq-GV for qemu-devel@nongnu.org; Wed, 25 Mar 2020 09:47:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jH6NL-0005aL-2x for qemu-devel@nongnu.org; Wed, 25 Mar 2020 09:47:20 -0400 Received: from mail-eopbgr70094.outbound.protection.outlook.com ([40.107.7.94]:37990 helo=EUR04-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jH6NH-0005TM-Qz; Wed, 25 Mar 2020 09:47:16 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JHLc2SDRRwicjyvtJkK8FAtobYX0QEdBjZslvRdDIVTzQGDg6AC+oSh8EPGM730cdGgHgm7YpxcBpCOV6JAeZtNl0MJT1bsbFcaC0XJn7Nwm1MHgfTZPczP8MB+W4dppVCuXJtbl4MztgiCF1l34KokmskJoBTqnTrP4+SQ97co6Mgsm2ktotnb40DypAcW3Yf9/vP7DULR5q6D/UK4AhwOC5xPTYZtjWAhy2utLbLj7PXCSlWP7jZJ7yBOpDbrAdSLHPyerWvfj/Lpo1V4jvdAV0irNT6FH2NS5e+QvRdZL98aE8qvnXAWdH8fmtkjkwGO+Lv9zCeeIePmJmA97bQ== 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=qMdXr6e9838+J6Z05RoJZAFf1S5+vkYnp50v3UaHW7Y=; b=L4Rr4LtBRbsyXiKBNU1LmMMFjE2Z4MucTiIHpUBhDDvCToDYkU57T+jQszwqkIRPUw/B2EaTO1e8TdvANlr9aYnNJkMMUv1d/qpH3UPDCas1AzSAyEqdsvmUcFRG+KvTxNgZ+oo4s6awrNicFwWQfOH08s+PQFLTTD683Qt4D2yPbd7KjJ8UvuefLa2Jdg7D42PeY+YUWbhbpdu01YyYwX/NnXUW6gA8Rp1Rtqj7Ef+ybGDxPHP+833XRGstc3iAeDJUIHXOUcJr0T0r/MPuiMtbDyeKShku9m64R2yja24LYMOf1Nh+t7EE9qqxsXLSIayNv3lIEJ/8GM62WRQUiA== 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=qMdXr6e9838+J6Z05RoJZAFf1S5+vkYnp50v3UaHW7Y=; b=QUt/XrgApJxEq4fc68Ux/IWOPkDsjgHYUf4zfiQc3fPP/rcveFyUNe26SqQ32M8rXu6DKmNqD/kOlRXL7ugbNPImYmHK8MuLxldK5MSIWMdjAJUdiLV8TkJPIcbnIQKX8nWuFImEyj0IdWV20IXRnwoLtycmZWRpqH+wSpH4ijo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=vsementsov@virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (10.141.175.15) by AM7PR08MB5480.eurprd08.prod.outlook.com (10.141.175.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2835.23; Wed, 25 Mar 2020 13:47:12 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::9057:6f5a:378c:7533]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::9057:6f5a:378c:7533%6]) with mapi id 15.20.2835.023; Wed, 25 Mar 2020 13:47:12 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 4/6] block/block-copy: move task size initial calculation to _task_create Date: Wed, 25 Mar 2020 16:46:37 +0300 Message-ID: <20200325134639.16337-5-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200325134639.16337-1-vsementsov@virtuozzo.com> References: <20200325134639.16337-1-vsementsov@virtuozzo.com> X-ClientProxiedBy: AM0PR02CA0085.eurprd02.prod.outlook.com (2603:10a6:208:154::26) 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.35) by AM0PR02CA0085.eurprd02.prod.outlook.com (2603:10a6:208:154::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2835.18 via Frontend Transport; Wed, 25 Mar 2020 13:47:11 +0000 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.35] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 287e94a0-886f-4db3-6af6-08d7d0c3052d X-MS-TrafficTypeDiagnostic: AM7PR08MB5480: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:28; X-Forefront-PRVS: 0353563E2B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4636009)(39850400004)(396003)(346002)(366004)(136003)(376002)(6512007)(478600001)(1076003)(69590400007)(6666004)(36756003)(2906002)(4326008)(6486002)(16526019)(81166006)(66556008)(6916009)(107886003)(66476007)(66946007)(26005)(86362001)(316002)(52116002)(186003)(956004)(2616005)(6506007)(8936002)(8676002)(81156014)(5660300002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM7PR08MB5480; H:AM7PR08MB5494.eurprd08.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hDGxTXCvpkfUYYucI4VjEUhqUkv/3ks1UMyOaOL74SNyYjm4NYOjCibfpRcH8UBFDzE2EJQxn+9BrKfKz6xozGTJ4ZsC7IYdciKFRG/zJTVO9goru0JNwljTUaMw6EipWM6SnOOgRUgLVKI5o2FUfAW0r+R91EgHRS68nox8d0caOsAFUnltFvgBWQPQ7vjOJAnwvMQRTADl8YVGJ8TG0r2xsMauYbqNIrK3OIcKOk1rVhXzS3Tt8+BVag7DCDsd9nK3zQaake+6OtBPyrZNgvp3gW0zqIHMbfNj431zSBWNDHAE9MgSs8F68Np3/dJnc7+VxWlVYt8S5tijvLybIaaKR1DGliHTFjb5HcUY8s8RkAF6sp4YbiZXRd3boq1iNHQUX7+Xe+ugpPqP0yLr0K2dusoxQRAyvkH8RtW2a2DLi5wYSlT43pDtKpYQ6vLDWuG9zKxGQ65f8+DBhBg7rgl4bkGbtmgvmIHsuGkEr5OoXSJbD8/7Bsw4iisCLCsP X-MS-Exchange-AntiSpam-MessageData: lU0jLUh34mRk05iWacael//vrOJUx08v6rd6kV+/oZYkLuFC6XAWN4Xxa7myHqVTzvyrbA8CFJN2gChrzRGp6FGuX6UeQa4U2Q0okyDvMcLgd4CoNykNcvJVqS5F0wVaLtmoYRFC14pKb4MBNxQNBA== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 287e94a0-886f-4db3-6af6-08d7d0c3052d X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Mar 2020 13:47:12.1830 (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: rRJ2TiCUk00CRgPRFVJDKpbTDJR4ixr7T/qZ3szWPn86m55a9K37f2UPbLsc6bJ/aWn6zeYYjTX2C5vRnHG6HcQjV4jt6dGWKEeGyiuCtu8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5480 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.7.94 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Comment "Called only on full-dirty region" without corresponding assertion is a very unsafe thing. Adding assertion means call bdrv_dirty_bitmap_next_zero twice. Instead, let's move bdrv_dirty_bitmap_next_zero call to block_copy_task_create. It also allows to drop cur_bytes variable which partly duplicate task->bytes. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/block-copy.c | 47 ++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/block/block-copy.c b/block/block-copy.c index 63d8468b27..dd406eb4bb 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -106,12 +106,23 @@ static bool coroutine_fn block_copy_wait_one(BlockCopyState *s, int64_t offset, return true; } -/* Called only on full-dirty region */ static BlockCopyTask *block_copy_task_create(BlockCopyState *s, int64_t offset, int64_t bytes) { + int64_t next_zero; BlockCopyTask *task = g_new(BlockCopyTask, 1); + assert(bdrv_dirty_bitmap_get(s->copy_bitmap, offset)); + + bytes = MIN(bytes, s->copy_size); + next_zero = bdrv_dirty_bitmap_next_zero(s->copy_bitmap, offset, bytes); + if (next_zero >= 0) { + assert(next_zero > offset); /* offset is dirty */ + assert(next_zero < offset + bytes); /* no need to do MIN() */ + bytes = next_zero - offset; + } + + /* 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); @@ -480,7 +491,7 @@ 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); @@ -491,21 +502,13 @@ static int coroutine_fn block_copy_dirty_clusters(BlockCopyState *s, found_dirty = true; - cur_bytes = MIN(bytes, s->copy_size); + task = block_copy_task_create(s, offset, bytes); - 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, 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, @@ -519,19 +522,19 @@ static int coroutine_fn block_copy_dirty_clusters(BlockCopyState *s, trace_block_copy_process(s, offset); - co_get_from_shres(s->mem, cur_bytes); - ret = block_copy_do_copy(s, offset, cur_bytes, ret & BDRV_BLOCK_ZERO, + co_get_from_shres(s->mem, task->bytes); + ret = block_copy_do_copy(s, offset, task->bytes, ret & BDRV_BLOCK_ZERO, error_is_read); - co_put_to_shres(s->mem, cur_bytes); + 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->bytes; + bytes -= task->bytes; } return found_dirty; From patchwork Wed Mar 25 13:46:38 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: 1261400 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.a=rsa-sha256 header.s=selector2 header.b=ZeoELWbw; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48nTw965dyz9sRY for ; Thu, 26 Mar 2020 00:48:09 +1100 (AEDT) Received: from localhost ([::1]:36616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH6O7-0002vu-N9 for incoming@patchwork.ozlabs.org; Wed, 25 Mar 2020 09:48:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57322) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH6NM-0002O0-I9 for qemu-devel@nongnu.org; Wed, 25 Mar 2020 09:47:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jH6NL-0005aV-7n for qemu-devel@nongnu.org; Wed, 25 Mar 2020 09:47:20 -0400 Received: from mail-eopbgr70094.outbound.protection.outlook.com ([40.107.7.94]:37990 helo=EUR04-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jH6NI-0005TM-D5; Wed, 25 Mar 2020 09:47:16 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SzjA+GMiKQiHqHdGowq8/Vl8XBwPSXTa2AI9rL871BIWL5Bb0H1bMBkbmlBPPXcNxVWutHk/hXxHYWOhdb0sMqL5FePaqFYwGgNyyJCpokZfVjuFgA8uRuZmw6aZo3vRMGrYNrnMSdmy/byPquYktt2vWqPjXJnLqwHr0NkkdgDmGh0cybZnvipOl78NHUwpowdnYxnQBMaQI2LDGkyqQNJlZez5z54FKbCXhtgz4jNAh7GYTiDop0uEEMNt9de/SKdZv0HICtBAplqnhLoJsQVvAt4Ruf0u8cy+O/ZAUfz2Nu0YMrGGld4qR2B4+CTsvChvARcbPl99BVAQj0uH5w== 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=o7V6Gne0dlW/oat5tDlErUlH9AJ+qNz5juiDf3a/HJo=; b=ivYwpE3fQEDdPTDXv9hooF0QzsIDVfjNB6ywKLNS5O/BykvMArgZ5+1GpoYTQh+h0uhuojnwVzjdRUzhxqonkx0j6qjwAy+Nd5dNcVH27ydhzvPhnwC5Qk+Ek6ZWJEQz8PIPkMqT9T0CWiQ2SwFVya0Y+2+Fbvba+RV6i+3QkavZORBMfpDr87flWLX1ZNY0NAz3SqQwT5DkqWKCiEWYWVjwVbcp/n2GEn2jCPZShk7YE/FGVKvqrVTQQynzfhb7hXJ1rKRkxk43L5GWWNdTM8Qph2HzniZ6BH/uzAKa6PxWzr2+3OVzTpvlF3gb73Qr0vSaS2R7NTGIIzs4T4gP8w== 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=o7V6Gne0dlW/oat5tDlErUlH9AJ+qNz5juiDf3a/HJo=; b=ZeoELWbw1al/6dlqjqq1iUxv8qOPUQC0gLYMaZ10iL3IGI+8cjkDRYu3cDKKqOMDLUsG+mr4H0SykkL6rx+K2DNKF9B/ddkb3dIM98yFJT6ttnXnfhUWEv/oHfxPMrutGpimtUtSGghYE0esNLrsDK/6uAWHWG7S8Y0BwkCCW9w= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=vsementsov@virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (10.141.175.15) by AM7PR08MB5480.eurprd08.prod.outlook.com (10.141.175.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2835.23; Wed, 25 Mar 2020 13:47:12 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::9057:6f5a:378c:7533]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::9057:6f5a:378c:7533%6]) with mapi id 15.20.2835.023; Wed, 25 Mar 2020 13:47:12 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 5/6] block/block-copy: move block_copy_task_create down Date: Wed, 25 Mar 2020 16:46:38 +0300 Message-ID: <20200325134639.16337-6-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200325134639.16337-1-vsementsov@virtuozzo.com> References: <20200325134639.16337-1-vsementsov@virtuozzo.com> X-ClientProxiedBy: AM0PR02CA0085.eurprd02.prod.outlook.com (2603:10a6:208:154::26) 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.35) by AM0PR02CA0085.eurprd02.prod.outlook.com (2603:10a6:208:154::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2835.18 via Frontend Transport; Wed, 25 Mar 2020 13:47:12 +0000 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.35] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3ffa63a4-a646-41a1-4af1-08d7d0c30592 X-MS-TrafficTypeDiagnostic: AM7PR08MB5480: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:67; X-Forefront-PRVS: 0353563E2B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4636009)(39850400004)(396003)(346002)(366004)(136003)(376002)(6512007)(478600001)(1076003)(69590400007)(6666004)(36756003)(2906002)(4326008)(6486002)(16526019)(81166006)(66556008)(6916009)(107886003)(66476007)(66946007)(26005)(86362001)(316002)(52116002)(186003)(956004)(2616005)(6506007)(8936002)(8676002)(81156014)(5660300002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM7PR08MB5480; H:AM7PR08MB5494.eurprd08.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FwUpxILSyqIb3l8sifkKINCbpnYsEP3lyLkNrJpzv4Kxlyl7ABJRALub+Cn9uEycHsDMEwoQidNwc8JsQgE3l3uSWE8DAh89PaqNUOqNJFCBUYBBI9UZI0JelTr1u1oKbJ4bBGZZissUv6riNnPv33hBkAepXiqQCYrWwJIlld3B8LLqsWqIkPGsjJ2Cahx3kexglShcDKWQ6Pn9QWB0XXeYq4cMUMQ7PcmpOgwuCPExS6fexgZ6jINDYrj8vooOTGEl+r9jLBMGp7xzjqVJxNTn5JwSE+10DjjFP+XWvItq/3wQf6OhpxbT4EDAW6AM34THdLE1aqe5OObrB0fNWZoX8WobiSUGCmFBIRuUDVQskfUAozu46eU9p/2XQFg9opD2zknXOjDS1bk6gQsPb8Apd3/amnKC9ilLBlsKuCzEt7tABmhUPR+8GK0TbidzV7pZ5v1zrPFnUlbfqz7OycvKUHGQ4+CfA8obqAPwMYexbhHrQPsYFAzkKTeFgu43 X-MS-Exchange-AntiSpam-MessageData: m4OXgkbfz2wfh5/i7UsCldJ1QylizP5thm1adS8DOs/OJ7VkgTwPQWgenK7Qq9rvQjD4zH4lTGL4Azz7d144nau0t1AZcOe/ejG2TaU04TOIj4YOeW740AKj4QYldEzbL2rN6xIC9QzJizY4WQkx2Q== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ffa63a4-a646-41a1-4af1-08d7d0c30592 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Mar 2020 13:47:12.8152 (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: QChLtcIw5/n4dDZPyTc9onpKFGYPoKAGFpViODqBAK6cThieqgyy9k6FgcPu3hlHjHPWg8uspIuvWuYauj+I9jc4oUFNo7yfZHzeD2CaRwo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5480 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.7.94 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Simple movement without any change. It's needed for the following patch, as this function will need to use some staff which is currently below it. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/block-copy.c | 66 +++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/block/block-copy.c b/block/block-copy.c index dd406eb4bb..910947cb43 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -106,39 +106,6 @@ static bool coroutine_fn block_copy_wait_one(BlockCopyState *s, int64_t offset, return true; } -static BlockCopyTask *block_copy_task_create(BlockCopyState *s, - int64_t offset, int64_t bytes) -{ - int64_t next_zero; - BlockCopyTask *task = g_new(BlockCopyTask, 1); - - assert(bdrv_dirty_bitmap_get(s->copy_bitmap, offset)); - - bytes = MIN(bytes, s->copy_size); - next_zero = bdrv_dirty_bitmap_next_zero(s->copy_bitmap, offset, bytes); - if (next_zero >= 0) { - assert(next_zero > offset); /* offset is dirty */ - assert(next_zero < offset + bytes); /* no need to do MIN() */ - bytes = next_zero - offset; - } - - /* 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 = (BlockCopyTask) { - .s = s, - .offset = offset, - .bytes = bytes, - }; - qemu_co_queue_init(&task->wait_queue); - QLIST_INSERT_HEAD(&s->tasks, task, list); - - return task; -} - /* * block_copy_task_shrink * @@ -361,6 +328,39 @@ out: return ret; } +static BlockCopyTask *block_copy_task_create(BlockCopyState *s, + int64_t offset, int64_t bytes) +{ + int64_t next_zero; + BlockCopyTask *task = g_new(BlockCopyTask, 1); + + assert(bdrv_dirty_bitmap_get(s->copy_bitmap, offset)); + + bytes = MIN(bytes, s->copy_size); + next_zero = bdrv_dirty_bitmap_next_zero(s->copy_bitmap, offset, bytes); + if (next_zero >= 0) { + assert(next_zero > offset); /* offset is dirty */ + assert(next_zero < offset + bytes); /* no need to do MIN() */ + bytes = next_zero - offset; + } + + /* 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 = (BlockCopyTask) { + .s = s, + .offset = offset, + .bytes = bytes, + }; + qemu_co_queue_init(&task->wait_queue); + QLIST_INSERT_HEAD(&s->tasks, task, list); + + return task; +} + static int block_copy_block_status(BlockCopyState *s, int64_t offset, int64_t bytes, int64_t *pnum) { From patchwork Wed Mar 25 13:46:39 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: 1261403 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.a=rsa-sha256 header.s=selector2 header.b=vZQ6Jlmr; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48nTy44vC7z9sQx for ; Thu, 26 Mar 2020 00:49:48 +1100 (AEDT) Received: from localhost ([::1]:36644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH6Pi-0006PA-K1 for incoming@patchwork.ozlabs.org; Wed, 25 Mar 2020 09:49:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57344) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH6NR-0002Qh-MT for qemu-devel@nongnu.org; Wed, 25 Mar 2020 09:47:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jH6NM-0005dB-Og for qemu-devel@nongnu.org; Wed, 25 Mar 2020 09:47:25 -0400 Received: from mail-eopbgr70094.outbound.protection.outlook.com ([40.107.7.94]:37990 helo=EUR04-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jH6NI-0005TM-Uj; Wed, 25 Mar 2020 09:47:17 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LQpSdPbeKKliNkOt8D8ivK61/uZLnJQVl6tuSqJ/Rl0RDXRn+L2iEU/QLgw69XTx2lLCRbgpVDeyCimd5YtC7bA7/4RN+MmpiQCL3duL+K1YxF2ESa2GAqXWZzzUF/6Q1sVuBFRmddJ1AHudfR1oZNC8nsb1AIudG9BZE4hFmJv4mJAyhiaOqarFeSmIXpoJ2+svLXpEjl8OK4LsU04+F1Gf8C/1fAJy7PgYqMj3Z+1LSRkUYrPQfsR0wNRl51/ruu+oK27A2aXjwLRiC51jo10nEJMpfXqTeSIXOhccUuZFZ9V3nfShYb2j6I2hli6zPr4vrAxxz+8jqZk5RKrPwg== 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=g86jk0Mj0v+O5l23CkT7aZhghC0m2hX7utns/EGlHnw=; b=dQuTuqqbN7j5t3BKcXDQk28+KqC6hPF0NFe9NeMnWa53+WoNeiB4jybiHyG+2sBYJwGE1IHZP1P3nLhz55RGUKZC0BN52/1bkUEJON/0+S8E97ovS8RxPdGIlySO4cTM9EcX1kR9Cn3vJTWNMGl77GuPRFg/o4Am0IZZr8kbnFk2iR5nZqAgqDk7D9abRSco6shmevVsp9GLIjUXCtXB8zgqLkIpSBWuKkIe1XUzt1BOIw3sIcO/krda6QZu6ZmCJF2db74zvIcpx1WOTIGTulPF27jG437UiCIBHM/MR/gtuAhHKB4K2H+s+UCkfjSDrm/YfcwfIJ+6BTPrq9UszQ== 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=g86jk0Mj0v+O5l23CkT7aZhghC0m2hX7utns/EGlHnw=; b=vZQ6JlmrDxoNO4/w/CpjAe94sT81WQZVIrkEo146MRrxH8Zno9G1r2uKC3x7t21AoHBZiAphnWy8cNzR24NS4l3kANlxzjJhCaGnEZU/Y8qqX4H9DCikXuquPtu978yLmAN2GsZIZ4q87al6eI08zLG7pHeCwgaus3YAFhh/N9k= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=vsementsov@virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (10.141.175.15) by AM7PR08MB5480.eurprd08.prod.outlook.com (10.141.175.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2835.23; Wed, 25 Mar 2020 13:47:13 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::9057:6f5a:378c:7533]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::9057:6f5a:378c:7533%6]) with mapi id 15.20.2835.023; Wed, 25 Mar 2020 13:47:13 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 6/6] block/block-copy: use aio-task-pool API Date: Wed, 25 Mar 2020 16:46:39 +0300 Message-ID: <20200325134639.16337-7-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200325134639.16337-1-vsementsov@virtuozzo.com> References: <20200325134639.16337-1-vsementsov@virtuozzo.com> X-ClientProxiedBy: AM0PR02CA0085.eurprd02.prod.outlook.com (2603:10a6:208:154::26) 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.35) by AM0PR02CA0085.eurprd02.prod.outlook.com (2603:10a6:208:154::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2835.18 via Frontend Transport; Wed, 25 Mar 2020 13:47:12 +0000 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.35] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e3fdeb99-166b-4097-c9dd-08d7d0c305fc X-MS-TrafficTypeDiagnostic: AM7PR08MB5480: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:59; X-Forefront-PRVS: 0353563E2B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4636009)(39850400004)(396003)(346002)(366004)(136003)(376002)(6512007)(478600001)(1076003)(69590400007)(6666004)(36756003)(2906002)(4326008)(6486002)(16526019)(81166006)(66556008)(6916009)(107886003)(66476007)(66946007)(26005)(86362001)(316002)(52116002)(186003)(956004)(2616005)(6506007)(8936002)(8676002)(81156014)(5660300002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM7PR08MB5480; H:AM7PR08MB5494.eurprd08.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h5i8pTjhNWRYbF/cVf6nW8Lxmahl1/4uD0rl6nY0A06wjjmFyvrj5A0jogM8qtnsGJvKj3eUKQg3Nz990m9jysbNPEFyfaukharwsTNu3zKHMHhiHZx6gyPE7nWpstaovdWopwkiMrtEmhD7QxtFBsrVZNbB2vRm9/FRfYFiI0cLEnBV5ziV5tS/dXJF4F2DRLmjA+kcQEfzeDT5e8xO3lhReXH/YhtMysbydmuxM9a/uuqi5xZVtq1GvS2gwrQgbi7UHlCgPgczMvW2+o/lxYA20GENIo+XQ5X7yLEBLVz3bHtsS5GJPhfYK7aWaC2xYTpwXPo9DsjXGjYoqIS0gY4QxI5GGlRqmzAgIGxg7XukAzu0yFoL+YEEFROStW492g6yalTdTKoQxvrjmNPpnG2xlpmgdf4duVRKb2BXC9DZ8dfZlHFnLzTbnXojFCuC29tYFhqaJSTYcoQOfoPi0m9O2gPDIGUaimwZRhBkk59soIlaqEwiHed3oLOkwhwv X-MS-Exchange-AntiSpam-MessageData: jJG53N1TZssPX6fHDmuzl1EhZddnA0d7c9DheDN61BAtu6LayeoNPTrwOSnbNVJUlNsFUka7PLmg8/r2ni4k7UV6/221t6XO3A9wtaPqm/vGKDk4/p/RCL6p4nmEFB5u/vzV6nqRh96Mlyhwegxrkg== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: e3fdeb99-166b-4097-c9dd-08d7d0c305fc X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Mar 2020 13:47:13.5281 (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: y6pPCOnGGrlOvVotqzmmJPqF9T4TxG2o2jf9uhdN2Cpo2SXcXYxTIyda4zN5RZDm21jaemKBEBwbKtRMTUZRL4gxwxDfh1kawvCbnMtojW8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5480 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.7.94 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+incoming=patchwork.ozlabs.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 | 104 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 91 insertions(+), 13 deletions(-) diff --git a/block/block-copy.c b/block/block-copy.c index 910947cb43..9994598eb7 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -19,15 +19,27 @@ #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 + +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; @@ -225,6 +237,30 @@ void block_copy_set_progress_meter(BlockCopyState *s, ProgressMeter *pm) s->progress = pm; } +/* Takes ownership on @task */ +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, -EAGAIN); + g_free(task); + return aio_task_pool_status(pool); + } + + aio_task_pool_start_task(pool, &task->task); + + return 0; +} + /* * block_copy_do_copy * @@ -328,8 +364,32 @@ 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; +} + +/* Called only on full-dirty region */ static BlockCopyTask *block_copy_task_create(BlockCopyState *s, - int64_t offset, int64_t bytes) + BlockCopyCallState *call_state, + int64_t offset, + int64_t bytes) { int64_t next_zero; BlockCopyTask *task = g_new(BlockCopyTask, 1); @@ -351,7 +411,9 @@ static BlockCopyTask *block_copy_task_create(BlockCopyState *s, s->in_flight_bytes += bytes; *task = (BlockCopyTask) { + .task.func = block_copy_task_entry, .s = s, + .call_state = call_state, .offset = offset, .bytes = bytes, }; @@ -478,6 +540,8 @@ static int coroutine_fn block_copy_dirty_clusters(BlockCopyState *s, { int ret = 0; bool found_dirty = false; + AioTaskPool *aio = NULL; + BlockCopyCallState call_state = {false, false}; /* * block_copy() user is responsible for keeping source and target in same @@ -489,8 +553,8 @@ 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; if (!bdrv_dirty_bitmap_get(s->copy_bitmap, offset)) { @@ -502,7 +566,7 @@ static int coroutine_fn block_copy_dirty_clusters(BlockCopyState *s, found_dirty = true; - task = block_copy_task_create(s, offset, bytes); + task = block_copy_task_create(s, &call_state, offset, bytes); ret = block_copy_block_status(s, offset, task->bytes, &status_bytes); assert(ret >= 0); /* never fail */ @@ -511,6 +575,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); @@ -519,25 +584,38 @@ static int coroutine_fn block_copy_dirty_clusters(BlockCopyState *s, bytes -= status_bytes; continue; } + task->zeroes = ret & BDRV_BLOCK_ZERO; trace_block_copy_process(s, offset); co_get_from_shres(s->mem, task->bytes); - ret = block_copy_do_copy(s, 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; + + if (!aio && task->bytes != bytes) { + aio = aio_task_pool_new(BLOCK_COPY_MAX_WORKERS); } - progress_work_done(s->progress, task->bytes); - s->progress_bytes_callback(task->bytes, s->progress_opaque); offset += task->bytes; bytes -= task->bytes; + + ret = block_copy_task_run(aio, task); + if (ret < 0) { + goto out; + } + } + +out: + if (aio) { + aio_task_pool_wait_all(aio); + if (ret == 0) { + ret = aio_task_pool_status(aio); + } + g_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; } /*