From nobody Mon Feb 9 23:42:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1573828219; cv=none; d=zoho.com; s=zohoarc; b=ZuQVXLGIIf6omNrTS6HlMs9BE8FeSaWEnD3J5IDJYcY23A38oOLlCYAsf9GN+eKYBN+faSDi3XX/SX47RxfdVER2YpJKEV2FPdBrJfhlR6Z7L9iQNi9uaPeFNDggpUNNIvegPNTGSKsegbY1ZZazU3wcEjRZZ9gxnvw2RPuLIT4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573828219; h=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=AZv4KA6OooB05BQKGz/ro7a73hQrwf+O7MR2s0gAUCs=; b=JOcSpiOJZxfGW3rS8pseXouen5lOSkZ6X/hnKvYn5g92h2+bcMslB7FGtcQRibthFMNBUNVlEoszDK4Oct43EO1qQUEHkjmXwNHC5A6arIYDW6T1vG99yibJpCX1ymB7lDjSOAGLkgQOkQkVenGGVew0hA55MrALZac3gB6k+K4= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1573828219133654.7066632539074; Fri, 15 Nov 2019 06:30:19 -0800 (PST) Received: from localhost ([::1]:39928 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVcc5-0004Gv-GJ for importer@patchew.org; Fri, 15 Nov 2019 09:30:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59027) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVcNL-0004e0-9O for qemu-devel@nongnu.org; Fri, 15 Nov 2019 09:15:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iVcNJ-0001y1-T9 for qemu-devel@nongnu.org; Fri, 15 Nov 2019 09:15:03 -0500 Received: from relay.sw.ru ([185.231.240.75]:47418) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iVcNG-0001rz-GR; Fri, 15 Nov 2019 09:14:58 -0500 Received: from vovaso.qa.sw.ru ([10.94.3.0] helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1iVcNB-0006WW-8E; Fri, 15 Nov 2019 17:14:53 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [RFC 15/24] block/block-copy: implement block_copy_async Date: Fri, 15 Nov 2019 17:14:35 +0300 Message-Id: <20191115141444.24155-16-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191115141444.24155-1-vsementsov@virtuozzo.com> References: <20191115141444.24155-1-vsementsov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 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, vsementsov@virtuozzo.com, ehabkost@redhat.com, wencongyang2@huawei.com, xiechanglong.d@gmail.com, armbru@redhat.com, qemu-devel@nongnu.org, jsnow@redhat.com, crosa@redhat.com, den@openvz.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" We'll need async block-copy invocation to use in backup directly. Signed-off-by: Vladimir Sementsov-Ogievskiy --- include/block/block-copy.h | 13 +++++++++++ block/block-copy.c | 48 +++++++++++++++++++++++++++++++++++--- 2 files changed, 58 insertions(+), 3 deletions(-) diff --git a/include/block/block-copy.h b/include/block/block-copy.h index 753fa663ac..407de7e520 100644 --- a/include/block/block-copy.h +++ b/include/block/block-copy.h @@ -20,7 +20,10 @@ =20 typedef void (*ProgressBytesCallbackFunc)(int64_t bytes, void *opaque); typedef void (*ProgressResetCallbackFunc)(void *opaque); +typedef void (*BlockCopyAsyncCallbackFunc)(int ret, bool error_is_read, + void *opaque); typedef struct BlockCopyState BlockCopyState; +typedef struct BlockCopyCallState BlockCopyCallState; =20 BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target, int64_t cluster_size, @@ -41,6 +44,16 @@ int64_t block_copy_reset_unallocated(BlockCopyState *s, int coroutine_fn block_copy(BlockCopyState *s, int64_t start, uint64_t byt= es, bool *error_is_read); =20 +/* + * Run block-copy in a coroutine, return state pointer. If finished early + * returns NULL (@cb is called anyway). + */ +BlockCopyCallState *block_copy_async(BlockCopyState *s, + int64_t offset, int64_t bytes, + bool ratelimit, int max_workers, + int64_t max_chunk, + BlockCopyAsyncCallbackFunc cb); + BdrvDirtyBitmap *block_copy_dirty_bitmap(BlockCopyState *s); void block_copy_set_skip_unallocated(BlockCopyState *s, bool skip); =20 diff --git a/block/block-copy.c b/block/block-copy.c index 4b1a0cecbd..0b41afd30d 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -32,9 +32,11 @@ typedef struct BlockCopyCallState { BlockCopyState *s; int64_t offset; int64_t bytes; + BlockCopyAsyncCallbackFunc cb; =20 /* State */ bool failed; + bool finished; =20 /* OUT parameters */ bool error_is_read; @@ -602,15 +604,17 @@ out: =20 static int coroutine_fn block_copy_common(BlockCopyCallState *call_state) { + int ret =3D 0; + while (true) { - int ret =3D block_copy_dirty_clusters(call_state); + ret =3D block_copy_dirty_clusters(call_state); =20 if (ret < 0) { /* * IO operation failed, which means the whole block_copy reque= st * failed. */ - return ret; + break; } if (ret) { /* @@ -634,7 +638,14 @@ static int coroutine_fn block_copy_common(BlockCopyCal= lState *call_state) } } =20 - return 0; + if (call_state->cb) { + call_state->cb(ret, call_state->error_is_read, + call_state->s->progress_opaque); + } + + call_state->finished =3D true; + + return ret; } =20 int coroutine_fn block_copy(BlockCopyState *s, int64_t start, uint64_t byt= es, @@ -655,6 +666,37 @@ int coroutine_fn block_copy(BlockCopyState *s, int64_t= start, uint64_t bytes, return ret; } =20 +static void coroutine_fn block_copy_async_co_entry(void *opaque) +{ + block_copy_common(opaque); +} + +BlockCopyCallState *block_copy_async(BlockCopyState *s, + int64_t offset, int64_t bytes, + bool ratelimit, int max_workers, + int64_t max_chunk, + BlockCopyAsyncCallbackFunc cb) +{ + BlockCopyCallState *call_state =3D g_new(BlockCopyCallState, 1); + Coroutine *co =3D qemu_coroutine_create(block_copy_async_co_entry, + call_state); + + *call_state =3D (BlockCopyCallState) { + .s =3D s, + .offset =3D offset, + .bytes =3D bytes, + .cb =3D cb, + }; + + qemu_coroutine_enter(co); + + if (call_state->finished) { + g_free(call_state); + return NULL; + } + + return call_state; +} BdrvDirtyBitmap *block_copy_dirty_bitmap(BlockCopyState *s) { return s->copy_bitmap; --=20 2.21.0