From nobody Thu Dec 18 17:53:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611672820; cv=none; d=zohomail.com; s=zohoarc; b=UeWDxV/LZasUVtMY+1mMtrx1Qtmityueusa5ruiZy8CW52PHb+NpDTBZOsNMNtU+szda3VuYT2XAxYpcogBByh46CfWlHQq+lqldHrDuDJjQVyiveiHahNBsCH0pAc6wj/xGGPPf0t/LulOx6WK/Y+/ZpS90LFQrc0LR9wH3k5s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611672820; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nRqC4s10jkycvPt4J93XiUzxO7GZtvCvUaejSY6/48k=; b=DqJmwhpXaGnx2bTf+LO2wTUkTny5hfNSq0XGXNMonbf/NDL8t9K+gwzpOlHzLAa8iTZEnc5jOO1+1LOQ5a271WXBEvbFCWWZOjs8Qhb7rhPeS53kMOrj/lwy9hGAGy/CdGXT3j3fWxjrpwcGFL+etrmkrsFbdaDzbMpwCpsxwBs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1611672820189598.349985489807; Tue, 26 Jan 2021 06:53:40 -0800 (PST) Received: from localhost ([::1]:35144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4Pit-00042F-1k for importer@patchew.org; Tue, 26 Jan 2021 09:53:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46942) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4PDs-0000cD-ET for qemu-devel@nongnu.org; Tue, 26 Jan 2021 09:21:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:45440) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l4PDk-0006Hl-RZ for qemu-devel@nongnu.org; Tue, 26 Jan 2021 09:21:36 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-406-HpxqmpmXNb2m_BTA2km1Jg-1; Tue, 26 Jan 2021 09:21:25 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C48F1180E46E; Tue, 26 Jan 2021 14:21:24 +0000 (UTC) Received: from localhost (ovpn-114-175.ams2.redhat.com [10.36.114.175]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 60A0960871; Tue, 26 Jan 2021 14:21:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611670888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nRqC4s10jkycvPt4J93XiUzxO7GZtvCvUaejSY6/48k=; b=cRs1z0KliDySPR5ZWCt3cdeBToKpepEvHswA58QfHJbkJBxOiXjCv43QWN7i0gaqI8GNCp pR73zODU1k4gOnDmIHUss8Q8IwzsmwGSYoym6X7y5Gph5T6h4vjuigsd4pUix2vMkAJ8Sc +ku2CNddHy0KZJW/OYQL0K9pCMpOtXM= X-MC-Unique: HpxqmpmXNb2m_BTA2km1Jg-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 29/53] block/block-copy: add max_chunk and max_workers parameters Date: Tue, 26 Jan 2021 15:19:52 +0100 Message-Id: <20210126142016.806073-30-mreitz@redhat.com> In-Reply-To: <20210126142016.806073-1-mreitz@redhat.com> References: <20210126142016.806073-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.255, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Maydell , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy They will be used for backup. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz Message-Id: <20210116214705.822267-5-vsementsov@virtuozzo.com> Signed-off-by: Max Reitz --- include/block/block-copy.h | 6 ++++++ block/block-copy.c | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/include/block/block-copy.h b/include/block/block-copy.h index 8c225ebf81..22372aa375 100644 --- a/include/block/block-copy.h +++ b/include/block/block-copy.h @@ -49,9 +49,15 @@ int coroutine_fn block_copy(BlockCopyState *s, int64_t o= ffset, int64_t bytes, * * Caller is responsible to call block_copy_call_free() to free * BlockCopyCallState object. + * + * @max_workers means maximum of parallel coroutines to execute sub-reques= ts, + * must be > 0. + * + * @max_chunk means maximum length for one IO operation. Zero means unlimi= ted. */ BlockCopyCallState *block_copy_async(BlockCopyState *s, int64_t offset, int64_t bytes, + int max_workers, int64_t max_chunk, BlockCopyAsyncCallbackFunc cb, void *cb_opaque); =20 diff --git a/block/block-copy.c b/block/block-copy.c index 74655b86f8..35213bd832 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -34,6 +34,8 @@ typedef struct BlockCopyCallState { BlockCopyState *s; int64_t offset; int64_t bytes; + int max_workers; + int64_t max_chunk; BlockCopyAsyncCallbackFunc cb; void *cb_opaque; =20 @@ -148,10 +150,11 @@ static BlockCopyTask *block_copy_task_create(BlockCop= yState *s, int64_t offset, int64_t bytes) { BlockCopyTask *task; + int64_t max_chunk =3D MIN_NON_ZERO(s->copy_size, call_state->max_chunk= ); =20 if (!bdrv_dirty_bitmap_next_dirty_area(s->copy_bitmap, offset, offset + bytes, - s->copy_size, &offset, &bytes)) + max_chunk, &offset, &bytes)) { return NULL; } @@ -623,7 +626,7 @@ block_copy_dirty_clusters(BlockCopyCallState *call_stat= e) bytes =3D end - offset; =20 if (!aio && bytes) { - aio =3D aio_task_pool_new(BLOCK_COPY_MAX_WORKERS); + aio =3D aio_task_pool_new(call_state->max_workers); } =20 ret =3D block_copy_task_run(aio, task); @@ -701,6 +704,7 @@ int coroutine_fn block_copy(BlockCopyState *s, int64_t = start, int64_t bytes, .s =3D s, .offset =3D start, .bytes =3D bytes, + .max_workers =3D BLOCK_COPY_MAX_WORKERS, }; =20 int ret =3D block_copy_common(&call_state); @@ -719,6 +723,7 @@ static void coroutine_fn block_copy_async_co_entry(void= *opaque) =20 BlockCopyCallState *block_copy_async(BlockCopyState *s, int64_t offset, int64_t bytes, + int max_workers, int64_t max_chunk, BlockCopyAsyncCallbackFunc cb, void *cb_opaque) { @@ -728,6 +733,8 @@ BlockCopyCallState *block_copy_async(BlockCopyState *s, .s =3D s, .offset =3D offset, .bytes =3D bytes, + .max_workers =3D max_workers, + .max_chunk =3D max_chunk, .cb =3D cb, .cb_opaque =3D cb_opaque, =20 --=20 2.29.2