From nobody Mon Feb 9 06:49:02 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=1571743323; cv=none; d=zoho.com; s=zohoarc; b=kAuSPi2x2I+mo7x5m6aEnoryu3UhiIh7cRBjFGQlR8xqNhB6eQB7+F6TxWWK1GkKSdXAPqRNgNN7mZRSQkWMZ6xMMs7Yurn0VQ42UlU0vZxkBdn9JpyBhZuX13NlrxXHdWk1fvk0fvhJS0newTEGOjRyCBWB8FMcGEVxNS+CO9w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571743323; 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=b1FMmiBtdLAKwAnQpGMm+otLZ98yyUadWSRshwmIlPc=; b=DzAp40F9STUc21LsYp7kDcEqLU6TMzif0Tdno1n1qPRP8pCDV1R0D12twTXoDm8dlI70xuJdBIIVsAeleStuAYAo5GwDUtwYTQZTQkhyLo5QmkG63mm9YCjk/O4pc1dKaaFCql9R0D5sU8A01IrmAgabRu4QwypTxgac9Se0dv4= 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 1571743323370863.371411809454; Tue, 22 Oct 2019 04:22:03 -0700 (PDT) Received: from localhost ([::1]:53480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMsEk-0000MG-8L for importer@patchew.org; Tue, 22 Oct 2019 07:22:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44018) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMsB3-0004AU-Sx for qemu-devel@nongnu.org; Tue, 22 Oct 2019 07:18:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMsB2-0007h7-Rg for qemu-devel@nongnu.org; Tue, 22 Oct 2019 07:18:13 -0400 Received: from relay.sw.ru ([185.231.240.75]:51920) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iMsB0-0007dn-2x; Tue, 22 Oct 2019 07:18:10 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.2) (envelope-from ) id 1iMsAw-0003JX-TA; Tue, 22 Oct 2019 14:18:06 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v3 5/6] block/block-copy: add memory limit Date: Tue, 22 Oct 2019 14:18:04 +0300 Message-Id: <20191022111805.3432-6-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191022111805.3432-1-vsementsov@virtuozzo.com> References: <20191022111805.3432-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, qemu-devel@nongnu.org, mreitz@redhat.com, den@openvz.org, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Currently total allocation for parallel requests to block-copy instance is unlimited. Let's limit it to 128 MiB. For now block-copy is used only in backup, so actually we limit total allocation for backup job. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- include/block/block-copy.h | 3 +++ block/block-copy.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/include/block/block-copy.h b/include/block/block-copy.h index e2e135ff1b..edcdf0072d 100644 --- a/include/block/block-copy.h +++ b/include/block/block-copy.h @@ -16,6 +16,7 @@ #define BLOCK_COPY_H =20 #include "block/block.h" +#include "qemu/co-shared-resource.h" =20 typedef struct BlockCopyInFlightReq { int64_t start_byte; @@ -69,6 +70,8 @@ typedef struct BlockCopyState { */ ProgressResetCallbackFunc progress_reset_callback; void *progress_opaque; + + SharedResource *mem; } BlockCopyState; =20 BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target, diff --git a/block/block-copy.c b/block/block-copy.c index 845b2423dc..7f0ebb58f8 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -21,6 +21,7 @@ #include "qemu/units.h" =20 #define BLOCK_COPY_MAX_COPY_RANGE (16 * MiB) +#define BLOCK_COPY_MAX_MEM (128 * MiB) =20 static void coroutine_fn block_copy_wait_inflight_reqs(BlockCopyState *s, int64_t start, @@ -64,6 +65,7 @@ void block_copy_state_free(BlockCopyState *s) } =20 bdrv_release_dirty_bitmap(s->copy_bitmap); + shres_destroy(s->mem); g_free(s); } =20 @@ -95,6 +97,7 @@ BlockCopyState *block_copy_state_new(BdrvChild *source, B= drvChild *target, .cluster_size =3D cluster_size, .len =3D bdrv_dirty_bitmap_size(copy_bitmap), .write_flags =3D write_flags, + .mem =3D shres_create(BLOCK_COPY_MAX_MEM), }; =20 s->copy_range_size =3D QEMU_ALIGN_DOWN(max_transfer, cluster_size), @@ -313,7 +316,9 @@ int coroutine_fn block_copy(BlockCopyState *s, =20 bdrv_reset_dirty_bitmap(s->copy_bitmap, start, chunk_end - start); =20 + co_get_from_shres(s->mem, chunk_end - start); ret =3D block_copy_do_copy(s, start, chunk_end, error_is_read); + co_put_to_shres(s->mem, chunk_end - start); if (ret < 0) { bdrv_set_dirty_bitmap(s->copy_bitmap, start, chunk_end - start= ); break; --=20 2.21.0